prep for creating a patch feature

releng.control/ant.sh

 #!/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

releng.control/cc.sh

 #!/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

releng.control/commonVariations.sh

+#!/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

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" />