diff --git a/releng.control/committer-dw.properties b/releng.control/committer-dw.properties
index 35807e19a48a8cea0e26bcc7c7926b09ffd9ce8b..6b740cb755b852f289170411f6f72d57472b41f3 100644
--- a/releng.control/committer-dw.properties
+++ b/releng.control/committer-dw.properties
@@ -21,4 +21,3 @@ basearch=x86
build.clean=true
build.pack-all-in-one=false
-java15-home=${build.home}/apps/jdk1.5.0_09
diff --git a/releng.control/committer.properties b/releng.control/committer.properties
index dd197e3ab9d04c96aa6cb3fa46a1e1ea9747fa3c..524ed19134cb3ab302d4343a10a19016768e972e 100644
--- a/releng.control/committer.properties
+++ b/releng.control/committer.properties
@@ -20,5 +20,3 @@ basearch=ppc
build.clean=true
build.pack-all-in-one=false
-
-java15-home=${build.home}/apps/ibm-java2-ppc-50
\ No newline at end of file
diff --git a/releng.control/commonVariations.sh b/releng.control/commonVariations.sh
index 156755a440f8322a1cfec329756023f5592b38b8..f315fc8bf160f104be5e6d78dc70a4ecb72c41b7 100644
--- a/releng.control/commonVariations.sh
+++ b/releng.control/commonVariations.sh
@@ -4,14 +4,20 @@
# the bash "include source" function will find that path version
# first, instead of this "standard" eclipse ppc one.
-export PROJECT_HOME=`dirname "$0"`
export BUILD_HOME=/shared/webtools
+
export DISPLAY=127.0.0.1:1.0
-export JAVA_4_DIR="IBMJava2-ppc-142"
-export JAVA_5_DIR="ibm-java2-ppc-50"
-JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
-JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
+JAVA_4_DIR="IBMJava2-ppc-142"
+JAVA_5_DIR="ibm-java2-ppc-50"
+
+
+########################################################
+
+export PROJECT_HOME=`dirname "$0"`
+
+export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
+export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
# values of the bootclasspath attribute used in ant javac calls.
# the names of these jars are VM vendor specific. the first set
@@ -39,10 +45,10 @@ echo " Project Home: ${PROJECT_HOME}"
echo " Build Home: ${BUILD_HOME}"
echo " DISPLAY: ${DISPLAY}"
echo " "
-echo " JAVA_4_DIR: ${JAVA_4_DIR}"
+echo " JAVA_4_HOME: ${JAVA_4_HOME}"
echo " ${bootclasspath}"
echo " "
-echo " JAVA_5_DIR: ${JAVA_5_DIR}"
+echo " JAVA_5_HOME: ${JAVA_5_HOME}"
echo " ${bootclasspath_15}"
echo " "
echo " ANT_HOME: ${ANT_HOME}"
diff --git a/releng.control/config.xml b/releng.control/config.xml
index 5793355bd3e21cc51b1e142e11ed4ed82badd061..9023a2742c1a3cfdd879ed7a9066b248147ee637 100644
--- a/releng.control/config.xml
+++ b/releng.control/config.xml
@@ -1,13 +1,16 @@
<cruisecontrol>
<property file="cruise.properties" />
-
+ <property environment="env" toupper="true"/>
<property
name="logDir"
- value="${build.home}/cruise-project-logs/${project.name}" />
-
+ value="${env.BUILD_HOME}/cruise-project-logs/${project.name}" />
+ <property
+ name="time.tenMinutes"
+ value="600" />
+
<property
name="time.oneHour"
value="3600" />
@@ -39,14 +42,14 @@
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<property
name="buildType"
@@ -77,7 +80,7 @@
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
@@ -120,22 +123,22 @@
<modificationset quietperiod="120">
<cvs
tag="R1_0_maintenance"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R1.0-M/releng" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng" />
<cvs
tag="R1_0_maintenance"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R1.0-M/releng.wtpbuilder" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng.wtpbuilder" />
</modificationset>
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<!-- this "M" label should be changed to "R" once maintenance release
is warming up for its "R"elease.
@@ -162,7 +165,7 @@
value="wtp" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
@@ -201,22 +204,22 @@
<modificationset quietperiod="120">
<cvs
tag="R1_5_maintenance"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R1.5-M/releng" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng" />
<cvs
tag="R1_5_maintenance"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R1.5-M/releng.wtpbuilder" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng.wtpbuilder" />
</modificationset>
<schedule interval="${time.oneHour}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<!-- this "M" label should be changed to "R" once maintenance release
is warming up for its "R"elease.
@@ -242,7 +245,7 @@
value="wtp" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
@@ -283,23 +286,23 @@
<modificationset quietperiod="120">
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-I/releng" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng" />
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-I/releng.wtpbuilder" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.wtpbuilder" />
</modificationset>
<schedule interval="${time.oneHour}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<property
name="buildType"
value="I" />
@@ -315,7 +318,7 @@
value="wtp" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
value="committers" />
@@ -351,43 +354,19 @@
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
- <!--
- since we do head build only on requests, there's really no sense checking
- jst and wst directories, and doing so adds a bit to build time. So, remember to uncomment
- these the two cvs child elements if this policy changes.
- Note, I've left in releng and releng.wtpbuilder just so it "matches" other builds,
- but, technically, even those would not be needed for "request only" builds.
- -->
- <!--
- <cvs
- tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/jst" />
- <cvs
- tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/wst" />
- -->
- <!--
- <cvs
- tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/releng" />
-
- <cvs
- tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/releng.wtpbuilder" />
- -->
<forceonly/>
</modificationset>
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<property
name="buildType"
value="N" />
@@ -406,7 +385,7 @@
value="true" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
value="committers" />
@@ -424,8 +403,8 @@
returnaddress="${build.buildmaster.email}"
skipusers="true"
subjectprefix="[wtp-R2.0-N-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-N">
+ spamwhilebroken="false"
+ buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-N">
</email>
</publishers>
</project>
@@ -447,23 +426,23 @@
<modificationset quietperiod="120">
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-S/releng" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng" />
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
</modificationset>
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<property
name="buildType"
value="S" />
@@ -482,7 +461,7 @@
value="wtp" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
value="committers" />
@@ -504,6 +483,81 @@
</publishers>
</project>
+
+ <project
+ name="wtp-thirdparty"
+ buildafterfailed="true">
+
+ <dateformat format="yyyyMMdd-HHmm z" />
+ <listeners>
+ <currentbuildstatuslistener />
+ </listeners>
+ <log
+ dir="${logDir}"
+ encoding="ISO-8859-1" />
+
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ tag="HEAD"
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng-thirdparty" />
+
+ <cvs
+ tag="HEAD"
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.tenMinutes}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="committer.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="S" />
+ <property
+ name="buildId"
+ value="2.0thirdparty" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp-thirdparty" />
+ <property
+ name="build.home"
+ value="${env.BUILD_HOME}" />
+ <property
+ name="sub-home"
+ value="committers" />
+
+ </ant>
+ </schedule>
+
+
+ <!-- Publishers are run *after* a build completes -->
+ <publishers>
+ <email
+ mailhost="localhost"
+ returnaddress="${build.buildmaster.email}"
+ skipusers="false"
+ subjectprefix="[wtp-R2.0-S-build]"
+ spamwhilebroken="false"
+ buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-S">
+ </email>
+ </publishers>
+ </project>
+
+
<project
name="wtp-R2.0-R"
buildafterfailed="true">
@@ -520,22 +574,22 @@
<modificationset quietperiod="120">
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-R/releng" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng" />
<cvs
tag="HEAD"
- localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-R/releng.wtpbuilder" />
+ localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng.wtpbuilder" />
</modificationset>
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="committer.xml"
target="Build"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
<property
name="buildType"
value="R" />
@@ -554,7 +608,7 @@
value="wtp" />
<property
name="build.home"
- value="${build.home}" />
+ value="${env.BUILD_HOME}" />
<property
name="sub-home"
value="committers" />
@@ -591,14 +645,14 @@
<schedule interval="${time.OnRequestOnly}">
<ant
- antscript="${build.home}/releng.control/ant.sh"
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="whatisfixed.xml"
target="whatisfixed"
useQuiet="false"
useLogger="false"
savelogdir="${logDir}"
usedebug="false"
- antworkingdir="${build.home}/releng.control">
+ antworkingdir="${env.BUILD_HOME}/releng.control">
</ant>
</schedule>