193051
need ability to "retest" from CruiseControl
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 2a5783b..b315061 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -1,17 +1,17 @@
<project name="checkout" default="checkout" basedir=".">
<!-- = = = standard properties pattern = = = -->
- <!--
- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
- <!--
- Let users override standard properties, if desired.
- If directory, file, or some properties do not exist,
- then standard properties will be used.
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
-->
<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
@@ -32,7 +32,7 @@
- <echo message="checkoutprojectname: ${checkoutprojectname}" />
+ <echo message="checkoutprojectname: ${checkoutprojectname}" />
<target name="checkout" if="checkoutprojectname">
<!-- we always check and init the builder -->
<antcall target="getwtpbuilder" />
@@ -42,13 +42,16 @@
<target name="wtp-R2.0-N">
- <!--
- do not need, since we do nightly builds "on demand" only
+ <!--
+ do not need, since we do nightly builds "on demand" only
<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
<cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
-->
</target>
+ <target name="retest-wtp-R2.0-N">
+ <antcall target="wtp-wtp-R2.0-N" />
+ </target>
<target name="wtp-R2.0-S">
<cvs quiet="true"
@@ -62,7 +65,10 @@
dest="${codir}"
tag="HEAD" />
</target>
-
+ <target name="retest-wtp-R2.0-S">
+ <antcall target="wtp-R2.0-S" />
+ </target>
+
<target name="wtp-R2.0-I">
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"
@@ -75,7 +81,10 @@
dest="${codir}"
tag="HEAD" />
</target>
-
+ <target name="retest-wtp-R2.0-I">
+ <antcall target="wtp-R2.0-I" />
+ </target>
+
<target name="wtp-R2.0-R">
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"
@@ -88,6 +97,10 @@
dest="${codir}"
tag="HEAD" />
</target>
+ <target name="retest-wtp-R2.0-R">
+ <antcall target="wtp-R2.0-R" />
+ </target>
+
<target name="wtp-R1.5-M">
<cvs quiet="true"
@@ -96,6 +109,10 @@
dest="${codir}"
tag="R1_5_maintenance" />
</target>
+ <target name="retest-wtp-R1.5-M">
+ <antcall target="wtp-R1.5-M" />
+ </target>
+
<target name="jem-R1.5-M">
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"
@@ -111,13 +128,6 @@
tag="R1_5_maintenance_patches" />
</target>
- <target name="wtp-thirdparty-R2.0-T">
- <cvs quiet="true"
- cvsRoot="${mapCvsRoot}"
- package="releng-thirdparty"
- dest="${codir}"
- tag="HEAD" />
- </target>
<target name="wtp-buildTools-R2.0-T">
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"
@@ -126,6 +136,7 @@
tag="HEAD" />
</target>
+
<target name="wst-R2.0-I">
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"
@@ -134,16 +145,19 @@
tag="HEAD" />
</target>
- <!--
+
+
+
+ <!--
The order of execution of these three worker targets
- is critical, check.clean, initBuilders, and
+ is critical, check.clean, initBuilders, and
then getwtpbuilder.
-->
<target name="getwtpbuilder"
depends="check.clean,initBuilders"
if="doClean">
- <!-- This is a special property file, that contains (only) the
- value of wtpBuilderVersion. Then, that version of the builder
+ <!-- This is a special property file, that contains (only) the
+ value of wtpBuilderVersion. Then, that version of the builder
is fetched to control the rest of the build -->
<property file="${codir}/${releng}/maps/build.cfg" />
<delete dir="${codir}/releng.wtpbuilder"
@@ -166,7 +180,7 @@
</condition>
</target>
- <target name="initBuilders" if="doClean">
+ <target name="initBuilders" depends="check.clean" if="doClean">
<echo message="Version tag for ${releng}: ${mapVersionTag}" />
<cvs quiet="true"
cvsRoot="${mapCvsRoot}"