peterreilly 2004/09/30 10:34:05 Modified: . Tag: ANT_16_BRANCH WHATSNEW src/main/org/apache/tools/ant/helper Tag: ANT_16_BRANCH ProjectHelper2.java Log: sync (minus the unit tests) Revision Changes Path No revision No revision 1.503.2.139 +3 -0 ant/WHATSNEW Index: WHATSNEW =================================================================== RCS file: /home/cvs/ant/WHATSNEW,v retrieving revision 1.503.2.138 retrieving revision 1.503.2.139 diff -u -r1.503.2.138 -r1.503.2.139 --- WHATSNEW 24 Sep 2004 22:29:09 -0000 1.503.2.138 +++ WHATSNEW 30 Sep 2004 17:34:05 -0000 1.503.2.139 @@ -51,6 +51,9 @@ * Typo in definition of <cvsversion> task causing it not to be defined. Bugzilla 31403. +* Execution of top level tasks in imported files get delayed by targets. + Bugzilla report 31487. + Changes from Ant 1.6.1 to Ant 1.6.2 =================================== No revision No revision 1.33.2.15 +3 -0 ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java Index: ProjectHelper2.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/helper/ProjectHelper2.java,v retrieving revision 1.33.2.14 retrieving revision 1.33.2.15 diff -u -r1.33.2.14 -r1.33.2.15 --- ProjectHelper2.java 19 Jul 2004 18:22:36 -0000 1.33.2.14 +++ ProjectHelper2.java 30 Sep 2004 17:34:05 -0000 1.33.2.15 @@ -116,15 +116,18 @@ // we are in an imported file. context.setIgnoreProjectTag(true); Target currentTarget = context.getCurrentTarget(); + Target currentImplicit = context.getImplicitTarget(); try { Target newCurrent = new Target(); newCurrent.setProject(project); newCurrent.setName(""); context.setCurrentTarget(newCurrent); + context.setImplicitTarget(newCurrent); parse(project, source, new RootHandler(context, mainHandler)); newCurrent.execute(); } finally { context.setCurrentTarget(currentTarget); + context.setImplicitTarget(currentImplicit); } } else { // top level file
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]