From c1c3df7fb3a63432aacaf2e6d267e1faec322c58 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Sun, 22 Jul 2007 15:31:29 +0000
Subject: [PATCH] formatting
---
releng.control/cc_config.xml | 164 +++++++++++++++--------------------
1 file changed, 72 insertions(+), 92 deletions(-)
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 93661afb5..830a86d7c 100644
--- a/releng.control/cc_config.xml
+++ b/releng.control/cc_config.xml
@@ -17,7 +17,6 @@
name="logDir"
value="${env.LOG_DIR}/${project.name}" />
-
<property
name="time.tenMinutes"
value="600" />
@@ -100,10 +99,10 @@
<!-- need to make this build ID a better variable,
especially for this 'patch' case
- <property
+ <property
name="buildId"
value="B163391" />
- -->
+ -->
<property
name="buildBranch"
value="R1.5" />
@@ -119,13 +118,11 @@
name="build.distribution"
value="patches" />
-
</ant>
</schedule>
</project>
-
<project name="wtp-R1.5-M">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
@@ -164,18 +161,17 @@
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R1_5_maintenance" />
-
</ant>
</schedule>
</project>
<project name="retest-wtp-R1.5-M">
+
<modificationset>
<forceonly />
</modificationset>
@@ -209,12 +205,10 @@
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R1_5_maintenance" />
-
</ant>
</schedule>
@@ -231,7 +225,7 @@
module="releng.dali" />
<cvs
tag="R1_0_maintenance"
- module="releng-jsf" />
+ module="releng-jsf" />
</modificationset>
<schedule interval="${time.oneHour}">
@@ -263,25 +257,24 @@
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R2_0_maintenance" />
<property
name="releng.dali-mapVersionTag"
- value="R1_0_maintenance"/>
+ value="R1_0_maintenance" />
<property
name="releng-jsf-mapVersionTag"
- value="R1_0_maintenance"/>
-
+ value="R1_0_maintenance" />
+
</ant>
</schedule>
</project>
-
<project name="retest-wtp-R2.0-M">
+
<modificationset>
<forceonly />
</modificationset>
@@ -312,17 +305,15 @@
name="checkoutprojectname"
value="${project.name}" />
-
<property
name="mapVersionTag"
value="R2_0_maintenance" />
<property
name="releng.dali-mapVersionTag"
- value="R1_0_maintenance"/>
+ value="R1_0_maintenance" />
<property
name="releng-jsf-mapVersionTag"
- value="R1_0_maintenance"/>
-
+ value="R1_0_maintenance" />
</ant>
@@ -330,8 +321,6 @@
</project>
-
-
<project name="wtp-R3.0-I">
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
<modificationset quietperiod="120">
@@ -366,22 +355,22 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
-
</ant>
</schedule>
</project>
+
<project name="retest-wtp-R3.0-I">
-
- <modificationset >
+
+ <modificationset>
<forceonly />
</modificationset>
@@ -410,20 +399,19 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
-
</ant>
</schedule>
</project>
-
+
<project name="wtp-R3.0-N">
<modificationset>
@@ -452,10 +440,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -463,14 +451,14 @@
name="build.trial"
value="true" />
-
</ant>
</schedule>
</project>
+
<project name="retest-wtp-R3.0-N">
- <modificationset >
+ <modificationset>
<forceonly />
</modificationset>
@@ -496,10 +484,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -507,35 +495,34 @@
name="build.trial"
value="true" />
-
</ant>
</schedule>
</project>
<project name="wtp-R3.0-S">
-
+
<!-- comment out when ready to do release builds -->
- <modificationset >
+ <modificationset>
<forceonly />
</modificationset>
<schedule>
- <!-- end of comment -->
-
-
- <!-- uncomment when ready to do release builds
- <modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
+ <!-- end of comment -->
+
+
+ <!-- uncomment when ready to do release builds
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+
+ </modificationset>
+
+ <schedule interval="${time.oneHour}">
+ -->
- </modificationset>
- <schedule interval="${time.oneHour}">
- -->
-
-
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -563,10 +550,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -577,15 +564,14 @@
</ant>
</schedule>
-
</project>
<project name="retest-wtp-R3.0-S">
- <modificationset >
+
+ <modificationset>
<forceonly />
</modificationset>
-
<schedule>
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
@@ -614,10 +600,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -628,35 +614,31 @@
</ant>
</schedule>
-
</project>
-
-
-
<project name="wtp-R3.0-R">
-
+
<!-- comment out when ready to do release builds -->
- <modificationset >
+ <modificationset>
<forceonly />
</modificationset>
<schedule>
- <!-- end of comment -->
-
- <!-- uncomment when ready to do release builds
- <modificationset quietperiod="120">
- <cvs module="releng" />
- <cvs module="releng-jsf" />
- <cvs module="releng.dali" />
+ <!-- end of comment -->
+
+ <!-- uncomment when ready to do release builds
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+
+ </modificationset>
+
+ <schedule interval="${time.oneHour}">
+ -->
+
- </modificationset>
- <schedule interval="${time.oneHour}">
- -->
-
-
-
<ant
antscript="${env.BUILD_HOME}/releng.control/ant.sh"
buildfile="cc_project_build.xml"
@@ -684,10 +666,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -695,9 +677,10 @@
</schedule>
</project>
- <project name="retest-wtp-R3.0-R">
- <modificationset >
+ <project name="retest-wtp-R3.0-R">
+
+ <modificationset>
<forceonly />
</modificationset>
@@ -729,10 +712,10 @@
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp" />
@@ -743,7 +726,6 @@
</ant>
</schedule>
-
</project>
<project name="wtp-buildTools-R3.0-T">
<modificationset>
@@ -767,29 +749,27 @@
name="checkoutprojectname"
value="${project.name}" />
- <property
- name="buildBranch"
- value="R3.0" />
+ <property
+ name="buildBranch"
+ value="R3.0" />
<property
name="mapVersionTag"
value="HEAD" />
<property
name="releng.dali-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="releng-jsf-mapVersionTag"
- value="HEAD"/>
+ value="HEAD" />
<property
name="build.distribution"
value="wtp-buildTools" />
-
</ant>
</schedule>
</project>
-
</cruisecontrol>
--
GitLab