streamline build scripts
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 23bc102..fdba437 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -94,8 +94,8 @@
name="cvs"
cvsroot=":${env.BUILD_CVS_READ_PROTOCOL}:${env.BUILD_CVS_READ_USER}@${env.BUILD_CVS_SERVER}:${env.BUILD_CVS_ROOT}" />
- <!--
-
+ <!--
+
Note: projects should be named in the form
${build.distribution}-${buildBranch}-${buildType}
-->
@@ -124,52 +124,52 @@
</schedule>
</project>
- <!--
+ <!--
<property
name="skipCleanBuild"
value="yes" />
-->
- <!--
+ <!--
<property
name="skipUnitTests"
value="yes" />
-->
- <!--
+ <!--
<project name="wtp-R1.5-M">
-
+
<modificationset quietperiod="120">
<cvs
tag="R1_5_maintenance"
module="${env.RELENGMAPS}"
reallyQuiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
-
+
<schedule interval="${time.oneHour}">
<ant>
-
+
<property
name="buildType"
value="R" />
-
+
<property
name="buildId"
value="1.5.5" />
<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-M">
@@ -217,7 +217,7 @@
</project>
<!-- remove 'forceOnly' once we move into "release" phase -->
- <!--
+ <!--
<project
name="wtp-R2.0-R"
forceOnly="true">
@@ -235,14 +235,14 @@
module="${env.RELENGJSF}"
reallyquiet="${env.CVS_REALLY_QUIET}"/>
</modificationset>
-
+
<schedule interval="${time.VeryVeryLongTime}">
<ant>
-
+
<property
name="buildType"
value="R" />
-
+
<property
name="buildId"
value="2.0.1" />
@@ -390,11 +390,11 @@
<!-- remove 'forceOnly' once we move into this phase of building -->
- <!--
+ <!--
<project
name="wtp-R3.0-R"
forceOnly="true">
-
+
<modificationset quietperiod="120">
<cvs
module="${env.RELENGMAPS}"
@@ -406,7 +406,7 @@
module="${env.RELENGDALI}"
reallyquiet="${env.CVS_REALLY_QUIET}" />
</modificationset>
-
+
<schedule interval="${time.oneHour}">
<ant>
<property
@@ -436,7 +436,7 @@
</ant>
</schedule>
</project>
-
+
-->
<project
name="wtp-buildTools-R3.0-T"
@@ -478,7 +478,7 @@
</exec>
</schedule>
<!-- need to prevent, or override, default publishers,
- especially since the ant default antpublisher will
+ especially since the ant default antpublisher will
result in error, if an ant build hasn't ran -->
<publishers>
</publishers>