Changeset 16538

Show
Ignore:
Timestamp:
25.07.2008 08:55:31 (11 years ago)
Author:
oranfry
Message:

fixed a bug in the descend option of TreeCallTarget?

Location:
release-kits/shared/ant-tasks/orans
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/shared/ant-tasks/orans/TreeCallTarget.java

    r16537 r16538  
    117117             
    118118             
    119             //check that the target should be run given address,resume.mode, rusume.from and resume.to 
     119            //check that the target should be run given address, resume.descend, resume.from and resume.to 
    120120            String resumeFrom = this.getProject().getProperty("resume.from"); 
    121121            String resumeDescend = this.getProject().getProperty("resume.descend"); 
     
    126126 
    127127            //given resumeDescend, might we execute? 
    128             boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(address,resumeDescend); 
     128            boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(resumeDescend,address) || isDescendantOf(address,resumeDescend); 
    129129 
    130130            //given resumeTo, might we execute? 
     
    135135 
    136136            if ( execute ) { 
     137 
    137138                callee.setAntfile(getProject().getProperty("ant.file")); 
    138139                callee.setInheritAll(inheritAll); 
    139140                callee.setInheritRefs(inheritRefs); 
    140141                Target calleeTarget = (Target)callee.getProject().getTargets().get(theTarget); 
     142 
    141143                calleeTarget.setAddress(address); 
    142144