prep for creating a patch feature

releng.control/ant.sh

@@ -3,26 +3,21 @@ PROJECT_HOME=`dirname "$0"`
 
 echo "Project Home: ${PROJECT_HOME}"
 
-
 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=/shared/webtools/apps/IBMJava2-ppc-142
+JAVA_HOME=${BUILD_HOME}/apps/IBMJava2-ppc-142
 export JAVA_HOME
 
-
 JAVA5_HOME=$BUILD_HOME/apps/jdk1.5.0_09
 export JAVA5_HOME
 
-
 ANT_HOME=$BUILD_HOME/apps/apache-ant-1.6.5
 export ANT_HOME
 

releng.control/cc.sh

-#!/bin/sh
-
-PATH=/usr/local/bin:/usr/bin:/usr/X11R6/bin:/bin:/usr/games:/opt/gnome/bin:/opt/kde3/bin
-PATH=$PATH:$HOME/bin:/shared/webtools/apps/apache-ant-1.6.5/bin
-PATH=$PATH:/shared/webtools/apps/ibm-java2-ppc-50/bin
-export PATH
-
-LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-export LD_LIBRARY_PATH
-
-
-
+#!/bin/sh
+
+LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
+export LD_LIBRARY_PATH
+
+
+
 BUILD_HOME=/shared/webtools
-export BUILD_HOME
-
-CCDIR=/shared/webtools/apps/cruisecontrol-bin-2.5
-export CCDIR
-
-JAVA_HOME=/shared/webtools/apps/ibm-java2-ppc-50
-export JAVA_HOME
-
-ANT_HOME=/shared/webtools/apps/apache-ant-1.6.5
-export ANT_HOME
-
-port="7000"
-
-DISPLAY=127.0.0.1:1.0
-export DISPLAY
-
-rm -fr ./workspace
-
-export JAVA_HIGH_ZIPFDS=500
-
-sh $CCDIR/cruisecontrol.sh $BUILD_HOME/releng.control/config.xml -jmxport $port -webport 7777 -user wtp -password ballad -cchome $CCDIR 1>out.txt 2>err.txt &
-
+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
+export JAVA_HOME
+JAVA5_HOME=${BUILD_HOME}/apps/ibm-java2-ppc-50
+export JAVA5_HOME
+
+ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
+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
+PATH=$PATH:$HOME/bin:$ANT_HOME/bin
+PATH=$PATH:$JAVA_HOME/bin
+export PATH
+
+export JAVA_HIGH_ZIPFDS=500
+
+sh $CCDIR/cruisecontrol.sh $BUILD_HOME/releng.control/config.xml -jmxport $port -webport 7777 -user wtp -password ballad -cchome $CCDIR 1>out.txt 2>err.txt &
+

releng.control/config.xml

@@ -5,7 +5,7 @@
 
 	<property
 		name="logDir"
-		value="/shared/webtools/cruise-project-logs/${project.name}" />
+		value="${build.home}/cruise-project-logs/${project.name}" />
 
 
 	<property
@@ -70,10 +70,16 @@
                 <property
                     name="mapVersionTag"
                     value="R1_5_maintenance_patches" />
+
                 <property
                     name="build.component"
                     value="wtp-patches" />
-                    <property
+
+                <property
+                    name="build.distribution"
+                    value="patches" />
+
+                <property
                     name="build.home"
                     value="${build.home}" />