Changeset 16538 for release-kits/shared

Timestamp:

2008-07-25T08:55:31+12:00 (16 years ago)

Author:

oranfry

Message:

fixed a bug in the descend option of TreeCallTarget

Location:

release-kits/shared/ant-tasks/orans

Files:

• TreeCallTarget.class (modified) ( previous)
• TreeCallTarget.java (modified) (3 diffs)

release-kits/shared/ant-tasks/orans/TreeCallTarget.java

@@ -117 +117 @@
             
             
-            //check that the target should be run given address,resume.mode, rusume.from and resume.to
+            //check that the target should be run given address, resume.descend, resume.from and resume.to
             String resumeFrom = this.getProject().getProperty("resume.from");
             String resumeDescend = this.getProject().getProperty("resume.descend");
@@ -126 +126 @@
 
             //given resumeDescend, might we execute?
-            boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(address,resumeDescend);
+            boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(resumeDescend,address) || isDescendantOf(address,resumeDescend);
 
             //given resumeTo, might we execute?
@@ -135 +135 @@
 
             if ( execute ) {
+
                 callee.setAntfile(getProject().getProperty("ant.file"));
                 callee.setInheritAll(inheritAll);
                 callee.setInheritRefs(inheritRefs);
                 Target calleeTarget = (Target)callee.getProject().getTargets().get(theTarget);
+
                 calleeTarget.setAddress(address);