Changeset 16538
- Timestamp:
- 2008-07-25T08:55:31+12:00 (16 years ago)
- Location:
- release-kits/shared/ant-tasks/orans
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
release-kits/shared/ant-tasks/orans/TreeCallTarget.java
r16537 r16538 117 117 118 118 119 //check that the target should be run given address, resume.mode, rusume.from and resume.to119 //check that the target should be run given address, resume.descend, resume.from and resume.to 120 120 String resumeFrom = this.getProject().getProperty("resume.from"); 121 121 String resumeDescend = this.getProject().getProperty("resume.descend"); … … 126 126 127 127 //given resumeDescend, might we execute? 128 boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf( address,resumeDescend);128 boolean shouldExecuteOnDescend = resumeDescend == null || isDescendantOf(resumeDescend,address) || isDescendantOf(address,resumeDescend); 129 129 130 130 //given resumeTo, might we execute? … … 135 135 136 136 if ( execute ) { 137 137 138 callee.setAntfile(getProject().getProperty("ant.file")); 138 139 callee.setInheritAll(inheritAll); 139 140 callee.setInheritRefs(inheritRefs); 140 141 Target calleeTarget = (Target)callee.getProject().getTargets().get(theTarget); 142 141 143 calleeTarget.setAddress(address); 142 144
Note:
See TracChangeset
for help on using the changeset viewer.