try to fix "re-test" path
diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml
index 8632254..671fd9e 100644
--- a/releng.control/cc_project_build.xml
+++ b/releng.control/cc_project_build.xml
@@ -3,6 +3,11 @@
default="Build"
basedir=".">
+ <!-- set main builder file name, based on distribution, buildBranch and build type -->
+ <property
+ name="builder"
+ value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG_BUILDER}/build.xml" />
+
<!-- = = = standard properties pattern = = = -->
<!--
@@ -29,39 +34,39 @@
value="true" />
<!--
- If not set yet, by "caller", then we set checkoutprojectname here.
+ If not set yet, by "caller", then fail fast.
Normally this is literally the project name from CruiseControl, but
- if running "standalone", we make this simplifying assumption.
+ if running "standalone", it would have to be set to something similar
+ to one of the cc_config project name, such as wtp-R3.0-I.
-->
- <property
- name="checkoutprojectname"
- value="${projectname}" />
+ <fail
+ unless="projectname" />
<!-- if not otherwise set, the following are good default values -->
<property
name="mapVersionTag"
value="HEAD" />
-
<target
name="Build">
-
- <!-- set main builder file name, based on distribution, buildBranch and build type -->
- <property
- name="builder"
- value="${env.PROJECT_BUILDERS}/${checkoutprojectname}/${env.RELENG_BUILDER}/build.xml" />
+ <antcall
+ target="doBuildPhase" />
+ <antcall
+ target="doTestPhase" />
+ </target>
+ <target
+ name="doBuildPhase"
+ unless="skipCleanBuild">
<antcall
target="doCleanBuild" />
- <!-- and create preliminary download site files -->
+ <!-- and create preliminary download site files -->
<ant
antfile="${builder}"
target="site" />
- <!-- upload what we have so far -->
+ <!-- upload what we have so far -->
<ant
antfile="${builder}"
target="upload" />
- <antcall
- target="doTestPhase" />
</target>
<target
name="doCleanBuild"
@@ -69,47 +74,47 @@
<!-- clean previous build -->
<antcall
target="clean" />
-
-
-
-
<!-- check out fresh set of appropriate files for the builder -->
<ant
antfile="checkout.xml" />
-
<!-- build and create preliminary download site files -->
<ant
antfile="${builder}"
target="build" />
</target>
+
+ <!-- test phase runs tests, creates test summary files, and uploads results -->
<target
name="doTestPhase"
unless="skipUnitTests">
- <!-- test and create test summary files -->
<ant
antfile="${builder}"
target="test" />
<ant
antfile="${builder}"
target="site" />
- <!-- upload what we have so far -->
<ant
antfile="${builder}"
target="upload" />
</target>
+
+ <!-- clean task -->
<target
name="clean"
depends="check.clean"
if="doClean">
<delete
- dir="${env.PROJECT_PROJECTS}/${checkoutprojectname}"
+ dir="${env.PROJECT_PROJECTS}/${projectname}"
failonerror="false" />
<delete
- dir="${env.PROJECT_TESTS}/${checkoutprojectname}"
+ dir="${env.PROJECT_TESTS}/${projectname}"
+ failonerror="false" />
+ <delete
+ dir="${env.ANT_WORKING}"
failonerror="false" />
</target>
- <!-- if build.clean does not exist, set doClean to true -->
+ <!-- if build.clean if true, or does not exist, set doClean to true -->
<target
name="check.clean">
<condition
@@ -125,4 +130,5 @@
</or>
</condition>
</target>
+
</project>
\ No newline at end of file