From 53f9de13238b2aaf05d3396aef6dbb6a8d4749bd Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Wed, 2 Jan 2008 19:31:06 +0000
Subject: [PATCH] streamline build scripts
---
.../.settings/org.eclipse.core.runtime.prefs | 3 ++
releng.control/ant.sh | 8 ++--
releng.control/cc_config.xml | 42 +++++++++----------
releng.control/cleanupArtifacts.sh | 16 +++----
releng.control/getFromCVS-relengControl.sh | 16 +++----
releng.control/killcc.sh | 6 +--
releng.control/restoreStateSnapshot.sh | 14 -------
7 files changed, 47 insertions(+), 58 deletions(-)
create mode 100644 releng.control/.settings/org.eclipse.core.runtime.prefs
delete mode 100644 releng.control/restoreStateSnapshot.sh
diff --git a/releng.control/.settings/org.eclipse.core.runtime.prefs b/releng.control/.settings/org.eclipse.core.runtime.prefs
new file mode 100644
index 000000000..6d0e043a5
--- /dev/null
+++ b/releng.control/.settings/org.eclipse.core.runtime.prefs
@@ -0,0 +1,3 @@
+#Wed Jan 02 14:24:51 EST 2008
+eclipse.preferences.version=1
+line.separator=\n
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index bff5317d7..4390e4ad2 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -1,11 +1,11 @@
#!/bin/sh
-# remember to leave no slashes on commonVariations in source command,
-# so that users path is used to find it (first). But, path on
-# commonComputedVariables means we expect to execute only our
+# remember to leave no slashes on commonVariations in source command,
+# so that users path is used to find it (first). But, path on
+# commonComputedVariables means we expect to execute only our
# version
-if [ -n $BUILD_INITIALIZED ]
+if [ -n $BUILD_INITIALIZED ]
then
pushd .
cd ${RELENG_CONTROL}
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
index 23bc10280..fdba437e1 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>
diff --git a/releng.control/cleanupArtifacts.sh b/releng.control/cleanupArtifacts.sh
index 3602403d5..495977f78 100644
--- a/releng.control/cleanupArtifacts.sh
+++ b/releng.control/cleanupArtifacts.sh
@@ -1,24 +1,24 @@
#!/bin/sh
-# remember to leave no slashes on filename in source command,
+# remember to leave no slashes on filename in source command,
# (the commonVariations.shsource file, that is)
# so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED ]
+if [ -n $BUILD_INITIALIZED ]
then
- source commonVariations.shsource
- source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
+ source commonVariations.shsource
+ source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
fi
# remove artifacts over n days old
-# (where hours = 24 + (n * 24), basically, so that
+# (where hours = 24 + (n * 24), basically, so that
# even n=0 means "1 day")
-# set at 10 days, under assumption that before that time,
+# set at 10 days, under assumption that before that time,
# artifacts will be "saved" elsewhere, if needed.
-# if more cleanup is needed, we should take time, and
+# if more cleanup is needed, we should take time, and
# existence of more recent builds into account, so we never
-# delete the last existing build (even if "old").
+# delete the last existing build (even if "old").
n=10;
artifactsDir=${BUILD_HOME}/artifacts;
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/getFromCVS-relengControl.sh
index 6606e98ad..63590e474 100644
--- a/releng.control/getFromCVS-relengControl.sh
+++ b/releng.control/getFromCVS-relengControl.sh
@@ -1,22 +1,22 @@
#!/bin/sh
-# it is assumed we are executing this in RELENG_CONTROL or the parent of RELENG_CONTROL
+# it is assumed we are executing this in RELENG_CONTROL or the parent of RELENG_CONTROL
RELENG_CONTROL=releng.control
-# This script file is to help get builds started "fresh", when
+# This script file is to help get builds started "fresh", when
# the ${RELENG_CONTROL} directory already exists on local file system.
-# While it is in the cvs repository in ${RELENG_CONTROL}, it is
+# While it is in the cvs repository in ${RELENG_CONTROL}, it is
# meant to be executed from the parent directory
-# of ${RELENG_CONTROL} on the file system.
+# of ${RELENG_CONTROL} on the file system.
# export is used, instead of checkout, just to avoid the CVS directories and since this code
# for a local build, there should never be a need to check it back in to CVS.
-if [ ! -e ${RELENG_CONTROL} ]
+if [ ! -e ${RELENG_CONTROL} ]
then
- cd ..
- if [ ! -e ${RELENG_CONTROL} ]
+ cd ..
+ if [ ! -e ${RELENG_CONTROL} ]
then
echo "${RELENG_CONTROL} does not exist as sub directory";
exit 1;
@@ -41,5 +41,5 @@ mv *.ser ${RELENG_CONTROL} >/dev/null 2>/dev/null
echo " making sure releng control files are executable and have proper EOL ..."
dos2unix ${RELENG_CONTROL}/*.sh* ${RELENG_CONTROL}/*.properties ${RELENG_CONTROL}/*.xml >/dev/null 2>>/dev/null
chmod +x ${RELENG_CONTROL}/*.sh > /dev/null
-echo
+echo
diff --git a/releng.control/killcc.sh b/releng.control/killcc.sh
index 17f389856..28dbe1ae8 100644
--- a/releng.control/killcc.sh
+++ b/releng.control/killcc.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh
PIDFILE=cc.pid
echo;
if [ -f ${PIDFILE} ] ; then
@@ -13,6 +13,6 @@ if [ -f ${PIDFILE} ] ; then
rm -f ${PIDFILE}
else
echo " PID file (${PIDFILE}) does not exist.";
- echo " Either CC not running, or PID file deleted";
+ echo " Either CC not running, or PID file deleted";
fi
-echo;
\ No newline at end of file
+echo;
\ No newline at end of file
diff --git a/releng.control/restoreStateSnapshot.sh b/releng.control/restoreStateSnapshot.sh
deleted file mode 100644
index ad4c56eb0..000000000
--- a/releng.control/restoreStateSnapshot.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-# This file is to "copy up" the state saved in cvs,
-# in stateSnapshot directory. Since the snapshot is
-# only taken occasionally, the best procedure is to
-# save the state locally and restore each time releng.control
-# is deleted and restored ... but, in case that is not
-# possible, this this the second best alternative.
-# If the state files do not exists at all, cruise control
-# will lose track of their status and state and attempt to
-# build every project.
-
-mv stateSnapshot/*.ser .
-
--
GitLab