prep for M4 builds
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 8346021..7e52344 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -1,15 +1,15 @@
<cruisecontrol>
- <!--
- 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"
toupper="true" />
- <!-- Note: can not quite use "standard properites" pattern, as in ant files,
+ <!-- Note: can not quite use "standard properites" pattern, as in ant files,
since for CC, it is an error if a property file does not exist. -->
<!-- remember, our logDir must be same as logdir specified in CC's web.xml file -->
@@ -73,8 +73,8 @@
name="cvs"
cvsroot="${env.CVS_MAIN_REPO}" />
- <!--
- Note: projects should normally be named in the form
+ <!--
+ Note: projects should normally be named in the form
${build.distribution}-${buildBranch}-${buildType}
-->
@@ -95,8 +95,8 @@
name="buildType"
value="P" />
- <!-- need to make this build ID a better variable,
- especially for this 'patch' case
+ <!-- need to make this build ID a better variable,
+ especially for this 'patch' case
<property
name="buildId"
value="B163391" />
@@ -135,7 +135,7 @@
module="releng" />
<cvs
tag="R1_0_maintenance"
- module="releng.wtpbuilder" />
+
</modificationset>
<schedule interval="${time.VeryVeryLongTime}">
@@ -190,9 +190,7 @@
<cvs
tag="R1_5_maintenance"
module="releng" />
- <cvs
- tag="R1_5_maintenance"
- module="releng.wtpbuilder" />
+
</modificationset>
<schedule interval="${time.oneHour}">
@@ -242,7 +240,7 @@
<cvs module="releng" />
<cvs module="releng-jsf" />
<cvs module="releng.dali" />
- <cvs module="releng.wtpbuilder" />
+
</modificationset>
<schedule interval="${time.oneHour}">
@@ -321,10 +319,10 @@
<cvs module="releng" />
<cvs module="releng-jsf" />
<cvs module="releng.dali" />
- <cvs module="releng.wtpbuilder" />
+
</modificationset>
- <schedule interval="${time.VeryVeryLongTime}">
+ <schedule interval="${time.oneHour}">
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -339,7 +337,7 @@
value="S" />
<property
name="buildId"
- value="2.0M3" />
+ value="2.0M4" />
<property
name="buildBranch"
value="R2.0" />
@@ -409,7 +407,7 @@
<cvs module="releng" />
<cvs module="releng-jsf" />
<cvs module="releng.dali" />
- <cvs module="releng.wtpbuilder" />
+
</modificationset>
<schedule interval="${time.VeryVeryLongTime}">