clean up to simplify

releng.control/ant.sh

@@ -9,17 +9,10 @@ fi
 
 export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
  
-export CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
-
-
 # for now, swithed to use Java 5 for EMF pre-req EE, 
 # but long term, each test should run according to 
 # what it needs. 
-export JAVA_HOME=${JAVA_5_HOME}
-
-
-ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
-export ANT_HOME
+export JAVA_HOME=${JAVA_5_HOME}
 
 
 # OS specific support.
@@ -42,13 +35,6 @@ if $sunjvm ; then
 fi
 ANT_CMD=${ANT_HOME}/bin/ant
 
-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
-
 export ANT_OPTS
 exec "$ANT_CMD" "$@"
 

releng.control/cc.sh

@@ -2,37 +2,24 @@
 
 # remember to leave no slashes on filename in source command, 
 # so that users path is used to find it (first)
-if [ -n $BUILD_INITIALIZED] 
+if [ -n $BUILD_INITIALIZED ] 
 then
    source commonVariations.sh 
 fi
 
-LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-export LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
 
-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/${JAVA_5_DIR}
-export JAVA_HOME
+export JAVA_HOME=${JAVA_5_HOME}
 
-JAVA5_HOME=$BUILD_HOME/apps/${JAVA_5_DIR}
-export JAVA5_HOME
-
-ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
-export ANT_HOME
 
 port="7000"
 
 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
+export CCDIR=${BUILD_HOME}/apps/cruisecontrol-bin-2.5
 
 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/commonVariations.sh

@@ -26,6 +26,12 @@ JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
 export bootclasspath="${JAVA_4_HOME}/jre/lib/core.jar:${JAVA_4_HOME}/jre/lib/ibmjsseprovider.jar:${JAVA_4_HOME}/jre/lib/xml.jar"
 export bootclasspath_15="${JAVA_5_HOME}/jre/lib/core.jar:${JAVA_5_HOME}/jre/lib/vm.jar:${JAVA_5_HOME}/jre/lib/xml.jar"
 
+export ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
+
+export PATH=$PATH:$HOME/bin:$ANT_HOME/bin:$JAVA_HOME/bin
+
+export JAVA_HIGH_ZIPFDS=500
+
 export BUILD_INITIALIZED="true"
 
 echo " "
@@ -39,3 +45,7 @@ echo " "
 echo "    JAVA_5_DIR: ${JAVA_5_DIR}"
 echo "        ${bootclasspath_15}"
 echo " "
+echo "     ANT_HOME: ${ANT_HOME}"
+echo " "
+echo "     PATH: ${PATH}"
+echo " "

releng.control/config.xml

@@ -33,14 +33,8 @@
         <log
             dir="${logDir}"
             encoding="ISO-8859-1" />
-        <!-- Defines where cruise looks for changes, to decide whether to run the build -->
-        <modificationset quietperiod="120">
-            <cvs 
-                tag="R1_5_maintenance_patches"
-                localworkingcopy="${build.home}/build-node/checkout/wtp-R1.5-P/releng" />
-            <cvs 
-                tag="R1_5_maintenance_patches"
-                localworkingcopy="${build.home}/build-node/checkout/wtp-R1.5-P/releng.wtpbuilder" />
+          <modificationset>
+            <forceonly/>
         </modificationset>
 
         <schedule interval="${time.OnRequestOnly}">
@@ -372,6 +366,7 @@
 				tag="HEAD"
 				localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/wst" />
 			-->
+			<!--
 			<cvs
 				tag="HEAD"
 				localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/releng" />
@@ -379,6 +374,8 @@
 			<cvs
 				tag="HEAD"
 				localworkingcopy="${build.home}/build-node/checkout/wtp-R2.0-N/releng.wtpbuilder" />
+				-->
+				<forceonly/>
 		</modificationset>
 
 		<schedule interval="${time.OnRequestOnly}">