prep for 3.0 builds
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index a344d3e..7b848c6 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -123,10 +123,6 @@
</project>
-
- <!-- ++++++++++++++++ -->
- <!-- R1.5 MAINTENANCE -->
- <!-- ++++++++++++++++ -->
<project name="wtp-R1.5-M">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
@@ -225,8 +221,66 @@
</project>
+ <project name="wtp-R2.0-M">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ tag="R2_0_maintenance"
+ module="releng" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng.dali" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng-jsf" />
+ </modificationset>
- <project name="wtp-R2.0-I">
+ <schedule interval="${time.oneHour}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ <!-- this "M" label should be changed to "R" once maintenance release
+ is warming up for its "R"elease.
+ -->
+ <property
+ name="buildType"
+ value="M" />
+
+ <property
+ name="buildId"
+ value="2.0.1" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+
+ <property
+ name="mapVersionTag"
+ value="R2_0_maintenance" />
+ <property
+ name="releng.dali-mapVersionTag"
+ value="R1_0_maintenance"/>
+ <property
+ name="releng-jsf-mapVersionTag"
+ value="R1_0_maintenance"/>
+
+
+ </ant>
+ </schedule>
+
+ </project>
+ <project name="wtp-R3.0-I">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
<cvs module="releng" />
@@ -250,7 +304,7 @@
value="I" />
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="checkoutprojectname"
value="${project.name}" />
@@ -267,7 +321,7 @@
</schedule>
</project>
- <project name="retest-wtp-R2.0-I">
+ <project name="retest-wtp-R3.0-I">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
<cvs module="releng" />
@@ -291,7 +345,7 @@
value="I" />
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="checkoutprojectname"
value="${project.name}" />
@@ -310,7 +364,7 @@
</project>
- <project name="wtp-R2.0-N">
+ <project name="wtp-R3.0-N">
<schedule interval="${time.VeryVeryLongTime}">
<ant
@@ -328,7 +382,7 @@
<!-- in this context, buildBranch is simply a label -->
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="mapVersionTag"
value="HEAD" />
@@ -344,7 +398,7 @@
</schedule>
</project>
- <project name="retest-wtp-R2.0-N">
+ <project name="retest-wtp-R3.0-N">
<schedule interval="${time.VeryVeryLongTime}">
<ant
@@ -362,7 +416,7 @@
<!-- in this context, buildBranch is simply a label -->
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="mapVersionTag"
value="HEAD" />
@@ -379,7 +433,7 @@
</project>
- <project name="wtp-R2.0-S">
+ <project name="wtp-R3.0-S">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
<cvs module="releng" />
@@ -403,10 +457,10 @@
value="S" />
<property
name="buildId"
- value="2.0RC4" />
+ value="3.0M1" />
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="checkoutprojectname"
value="${project.name}" />
@@ -427,7 +481,7 @@
</project>
- <project name="retest-wtp-R2.0-S">
+ <project name="retest-wtp-R3.0-S">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
<cvs module="releng" />
@@ -451,10 +505,10 @@
value="S" />
<property
name="buildId"
- value="2.0RC4" />
+ value="3.0M1" />
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="checkoutprojectname"
value="${project.name}" />
@@ -476,48 +530,9 @@
</project>
- <project name="wtp-buildTools-R2.0-T">
- <!-- Defines where cruise looks for changes, to decide whether to run the build -->
- <modificationset quietperiod="120">
- <cvs module="releng" />
- </modificationset>
-
- <schedule interval="${time.VeryVeryLongTime}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="cc_project_build.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="T" />
- <property
- name="checkoutprojectname"
- value="${project.name}" />
-
- <property
- name="buildBranch"
- value="R2.0" />
-
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp-buildTools" />
- </ant>
- </schedule>
-
- </project>
-
-
- <project name="wtp-R2.0-R">
+ <project name="wtp-R3.0-R">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
<cvs module="releng" />
@@ -541,10 +556,10 @@
value="R" />
<property
name="buildId"
- value="2.0" />
+ value="3.0" />
<property
name="buildBranch"
- value="R2.0" />
+ value="R3.0" />
<property
name="checkoutprojectname"
value="${project.name}" />
@@ -555,6 +570,90 @@
<property
name="build.distribution"
value="wtp" />
+ </ant>
+ </schedule>
+
+ </project>
+ <project name="retest-wtp-R3.0-R">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+
+ </modificationset>
+
+ <schedule interval="${time.VeryVeryLongTime}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_retest.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="R" />
+ <property
+ name="buildId"
+ value="3.0" />
+ <property
+ name="buildBranch"
+ value="R3.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+ <property
+ name="build.pack-all-in-one"
+ value="true" />
+
+ </ant>
+ </schedule>
+
+
+ </project>
+ <project name="wtp-buildTools-R3.0-T">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ </modificationset>
+
+ <schedule interval="${time.VeryVeryLongTime}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="T" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="buildBranch"
+ value="R3.0" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp-buildTools" />
</ant>