re-write for less variables
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
new file mode 100644
index 0000000..901ce54
--- /dev/null
+++ b/releng.control/cc_config.xml
@@ -0,0 +1,464 @@
+<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
+ 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,
+ 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 -->
+ <property
+ name="logDir"
+ value="${env.LOG_DIR}/${project.name}" />
+
+
+ <property
+ name="time.tenMinutes"
+ value="600" />
+
+ <property
+ name="time.oneHour"
+ value="3600" />
+
+ <property
+ name="time.VeryVeryLongTime"
+ value="31536000" />
+
+ <plugin
+ name="log"
+ dir="${logDir}"
+ encoding="ISO-8859-1" />
+
+ <plugin
+ name="currentbuildstatuslistener"
+ file="${logDir}/buildstatus.html" />
+
+ <plugin
+ name="project"
+ buildafterfailed="true">
+ <dateformat format="yyyyMMdd-HHmm z" />
+ <log
+ dir="${logDir}"
+ encoding="ISO-8859-1" />
+ <schedule interval="${time.VeryVeryLongTime}" />
+ <listeners>
+ <currentbuildstatuslistener />
+ </listeners>
+ <modificationset>
+ <forceonly />
+ </modificationset>
+ <publishers>
+ <email
+ mailhost="localhost"
+ returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+ skipusers="false"
+ subjectprefix="[${project.name}]"
+ spamwhilebroken="false"
+ buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
+ <always address="${env.BUILD_TOADDRESS}" />
+ </email>
+ </publishers>
+ </plugin>
+
+ <plugin
+ name="cvs"
+ cvsroot="${env.CVS_MAIN_REPO}" />
+
+ <!--
+ Note: projects should normally be named in the form
+ ${build.distribution}-${buildBranch}-${buildType}
+ -->
+
+ <project name="wtp-R1.5-P">
+
+ <schedule>
+ <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="P" />
+
+ <!-- need to make this build ID a better variable,
+ especially for this 'patch' case -->
+ <property
+ name="buildId"
+ value="B163391" />
+ <property
+ name="buildBranch"
+ value="R1.5" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="R1_5_maintenance_patches" />
+
+ <property
+ name="build.distribution"
+ value="patches" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <!-- ++++++++++++++++ -->
+ <!-- R1.0 MAINTENANCE -->
+ <!-- ++++++++++++++++ -->
+ <project name="wtp-R1.0-M">
+
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng.wtpbuilder" />
+ </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">
+
+ <!-- this "M" label should be changed to "R" once maintenance release
+ is warming up for its "R"elease.
+ -->
+ <property
+ name="buildType"
+ value="R" />
+ <!-- should comment out pre-spec'd coded buildId, once R-1.0.2 is declared -->
+
+ <property
+ name="buildId"
+ value="1.0.3" />
+ <property
+ name="buildBranch"
+ value="R1.0" />
+
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="R1_0_maintenance" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </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">
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng.wtpbuilder" />
+ </modificationset>
+
+ <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="1.5.3" />
+ <property
+ name="buildBranch"
+ value="R1.5" />
+
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+
+ <property
+ name="mapVersionTag"
+ value="R1_5_maintenance" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-I">
+ <!-- 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" />
+ <cvs module="releng.wtpbuilder" />
+ </modificationset>
+
+ <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">
+ <property
+ name="buildType"
+ value="I" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-N">
+
+ <schedule>
+ <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="N" />
+ <!-- in this context, buildBranch is simply a label -->
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+ <property
+ name="build.trial"
+ value="true" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-S">
+ <!-- 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" />
+ <cvs module="releng.wtpbuilder" />
+ </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="S" />
+ <property
+ name="buildId"
+ value="2.0M3" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+
+ </project>
+
+
+ <project name="wtp-thirdparty-R2.0-T">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng-thirdparty" />
+ </modificationset>
+
+ <schedule interval="${time.tenMinutes}">
+ <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-thirdparty" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.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" />
+ <cvs module="releng.wtpbuilder" />
+ </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="R" />
+ <property
+ name="buildId"
+ value="2.0" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+ <project name="wtp-whatisfixed">
+ <schedule>
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="whatisfixed.xml"
+ target="whatisfixed"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+</cruisecontrol>
+