← Back to branch summary

~ubuntu-branches/ubuntu/maverick/ant/maverick

« back to all changes in this revision

Viewing changes to src/main/org/apache/tools/ant/taskdefs/Ant.java

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-09-30 14:47:45 UTC
  • mfrom: (1.2.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20080930144745-0x8uzivd9t15dua3
Tags: 1.7.1-0ubuntu1
* New upstream version (bug fix release).
  - mainly a bugfix release.
  - has extended support for Java6 features.
  - <script> now has support for JavaFX.
  - release notes: http://apache.linux-mirror.org/ant/README.html
* Remove debian/patches/05_ant-bug433444.patch. Obsoleted.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/org/apache/tools/ant/taskdefs/Ant.java
199
199
        getProject().copyUserProperties(newProject);
200
200
 
201
201
        if (!inheritAll) {
202
 
           // set Java built-in properties separately,
203
 
           // b/c we won't inherit them.
204
 
           newProject.setSystemProperties();
 
202
           // set Ant's built-in properties separately,
 
203
           // because they are not being inherited.
 
204
           newProject.initProperties();
205
205
 
206
206
        } else {
207
207
            // set all properties from calling project
695
695
        propertySets.addElement(ps);
696
696
    }
697
697
 
698
 
    /*
 
698
    /**
699
699
     * Get the (sub)-Project instance currently in use.
700
700
     * @return Project
701
701
     * @since Ant 1.7