From e773c28fae2137212a21a43ce9025ee71ff12a20 Mon Sep 17 00:00:00 2001
From: david_williams <david_williams>
Date: Tue, 14 Nov 2006 07:48:16 +0000
Subject: [PATCH] prep for creating a patch feature
---
releng.control/ant.sh | 19 ++++++++-----------
releng.control/cc.sh | 20 ++++++++++----------
releng.control/commonVariations.sh | 19 +++++++++++++++++++
releng.control/config.xml | 6 ++++--
4 files changed, 41 insertions(+), 23 deletions(-)
create mode 100644 releng.control/commonVariations.sh
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 24d7bb941..45b66ed29 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -1,21 +1,23 @@
#!/bin/sh
-PROJECT_HOME=`dirname "$0"`
-echo "Project Home: ${PROJECT_HOME}"
+# remember to leave no slashes on filename in source command,
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED]
+then
+ source commonVariations.sh
+fi
LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
export LD_LIBRARY_PATH
-BUILD_HOME=/shared/webtools
-export BUILD_HOME
CCDIR=$BUILD_HOME/apps/cruisecontrol-bin-2.5
export CCDIR
-JAVA_HOME=${BUILD_HOME}/apps/IBMJava2-ppc-142
+JAVA_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
export JAVA_HOME
-JAVA5_HOME=$BUILD_HOME/apps/jdk1.5.0_09
+JAVA5_HOME=$BUILD_HOME/apps/${JAVA_5_DIR}
export JAVA5_HOME
ANT_HOME=$BUILD_HOME/apps/apache-ant-1.6.5
@@ -36,8 +38,6 @@ esac
bootclasspath="$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/jre/lib/jsse.jar"
bootclasspath_15="$JAVA5_HOME/jre/lib/rt.jar"
-export J2SE14="$bootclasspath"
-export J2SE15="$bootclasspath_15"
buildPaths="-DJ2SE-1.4=${bootclasspath} -DJ2SE-1.5=${bootclasspath_15}"
ANT_OPTS="-Xms128m -Xmx768m $buildPaths"
@@ -46,9 +46,6 @@ if $sunjvm ; then
fi
ANT_CMD=${ANT_HOME}/bin/ant
-DISPLAY=127.0.0.1:1.0
-export DISPLAY
-
PATH=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin
PATH=$PATH:$HOME/bin:$ANT_HOME/bin
PATH=$PATH:$JAVA_HOME/bin
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 9f7a21cc9..c0265e9a3 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -1,20 +1,23 @@
#!/bin/sh
+# remember to leave no slashes on filename in source command,
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED]
+then
+ source commonVariations.sh
+fi
+
LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
export LD_LIBRARY_PATH
-
-
-BUILD_HOME=/shared/webtools
-export BUILD_HOME
-
CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
export CCDIR
# NOTE: we intentionally use Java 5 here to run Cruise Control
-JAVA_HOME=${BUILD_HOME}/apps/ibm-java2-ppc-50
+JAVA_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
export JAVA_HOME
-JAVA5_HOME=${BUILD_HOME}/apps/ibm-java2-ppc-50
+
+JAVA5_HOME=$BUILD_HOME/apps/${JAVA_5_DIR}
export JAVA5_HOME
ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
@@ -22,9 +25,6 @@ export ANT_HOME
port="7000"
-DISPLAY=127.0.0.1:1.0
-export DISPLAY
-
rm -fr ./workspace
PATH=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin
diff --git a/releng.control/commonVariations.sh b/releng.control/commonVariations.sh
new file mode 100644
index 000000000..1f1964436
--- /dev/null
+++ b/releng.control/commonVariations.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# Note: if "local" users have this file on their path, then
+# the bash "include source" function will find that path version
+# first, instead of this "standard" eclipse ppc one.
+
+export PROJECT_HOME=`dirname "$0"`
+export BUILD_HOME=/shared/webtools
+export DISPLAY=127.0.0.1:1.0
+export JAVA_4_DIR="IBMJava2-ppc-142"
+export JAVA_5_DIR="ibm-java2-ppc-50"
+export BUILD_INITIALIZED="true"
+
+
+echo "Project Home: ${PROJECT_HOME}"
+echo "Build Home: ${BUILD_HOME}"
+echo "DISPLAY: ${DISPLAY}
+echo "JAVA_4_DIR: ${JAVA_4_DIR}
+echo "JAVA_5_DIR: ${JAVA_5_DIR}
\ No newline at end of file
diff --git a/releng.control/config.xml b/releng.control/config.xml
index a62712204..e57fa6baf 100644
--- a/releng.control/config.xml
+++ b/releng.control/config.xml
@@ -43,7 +43,7 @@
localworkingcopy="${build.home}/build-node/checkout/wtp-R1.5-P/releng.wtpbuilder" />
</modificationset>
- <schedule interval="${time.onRequestOnly}">
+ <schedule interval="${time.OnRequestOnly}">
<ant
antscript="${build.home}/releng.control/ant.sh"
buildfile="committer.xml"
@@ -58,9 +58,11 @@
name="buildType"
value="P" />
+ <!-- need to make this build ID a better variable,
+ especially for this 'patch' case -->
<property
name="buildId"
- value="1.5.2" />
+ value="B162974" />
<property
name="buildBranch"
value="R1.5" />
--
GitLab