[108259] Refactoring builds
diff --git a/archive/releng.builder/tools/cruise/ant.sh b/archive/releng.builder/tools/cruise/ant.sh
index a76473b..3ce29be 100644
--- a/archive/releng.builder/tools/cruise/ant.sh
+++ b/archive/releng.builder/tools/cruise/ant.sh
@@ -5,7 +5,7 @@
 export MOZILLA_FIVE_HOME
 
 JAVA_HOME=/usr/java/j2sdk1.4.2_08
-ANT_HOME=/usr/local/apache-ant-1.6.2
+ANT_HOME=/usr/local/apache-ant-1.6.5
 ANT_OPTS="-Xms128m -Xmx768m -XX:MaxPermSize=128M -XX:+UseParallelGC"
 ANT_CMD=${ANT_HOME}/bin/ant
 DISPLAY=127.0.0.1:1.0
diff --git a/archive/releng.builder/tools/cruise/cc.sh b/archive/releng.builder/tools/cruise/cc.sh
index be41dc3..ce2f2c6 100644
--- a/archive/releng.builder/tools/cruise/cc.sh
+++ b/archive/releng.builder/tools/cruise/cc.sh
@@ -3,7 +3,7 @@
 MOZILLA_FIVE_HOME=/usr/lib/mozilla-1.7.6
 export MOZILLA_FIVE_HOME
 JAVA_HOME=/usr/java/j2sdk1.4.2_07
-ANT_HOME=/home/build-home/apps/apache-ant-1.6.2
+ANT_HOME=/home/build-home/apps/apache-ant-1.6.5
 JAVA_HOME=/usr/java/j2sdk1.4.2_07
 DISPLAY=127.0.0.1:1.0
 export DISPLAY
diff --git a/archive/releng.builder/tools/cruise/checkout.properties b/archive/releng.builder/tools/cruise/checkout.properties
index 151fd32..7b3e2c5 100644
--- a/archive/releng.builder/tools/cruise/checkout.properties
+++ b/archive/releng.builder/tools/cruise/checkout.properties
@@ -2,5 +2,6 @@
 codir=/home/build-home/build-node/checkout/wtp
 releng=releng
 releng.builder=releng.builder
+releng.wtpbuilder=releng.wtpbuilder
 wst=wst
 jst=jst
diff --git a/archive/releng.builder/tools/cruise/checkout.xml b/archive/releng.builder/tools/cruise/checkout.xml
index 234525d..1220d8a 100644
--- a/archive/releng.builder/tools/cruise/checkout.xml
+++ b/archive/releng.builder/tools/cruise/checkout.xml
@@ -40,6 +40,9 @@
 		<delete dir="${codir}/releng.builder" failonerror="false" />
 		<cvs cvsRoot="${mapCvsRoot}" package="${releng.builder}" dest="${codir}" tag="${wtpBuilderVersion}" />
 
+		<delete dir="${codir}/releng.wtpbuilder" failonerror="false" />
+		<cvs cvsRoot="${mapCvsRoot}" package="${releng.builder}" dest="${codir}" tag="${wtpBuilderVersion}" />
+
 	</target>
 
 	<target name="M">
diff --git a/archive/releng.builder/tools/cruise/committer.properties b/archive/releng.builder/tools/cruise/committer.properties
new file mode 100644
index 0000000..5f36499
--- /dev/null
+++ b/archive/releng.builder/tools/cruise/committer.properties
@@ -0,0 +1,17 @@
+mapVersionTag=HEAD
+buildType=I
+build.distribution=wtp
+
+cvsUser=ndai
+cvsProtocol=ext
+
+build.home=/home/build-home
+build.trial=false
+build.drivers=downloads
+localDrivers=drivers
+baseos=linux
+basews=gtk
+basearch=x86
+
+build.clean=true
+build.localpublish.dir=/home/build-home/publish
diff --git a/archive/releng.builder/tools/cruise/committer.xml b/archive/releng.builder/tools/cruise/committer.xml
new file mode 100644
index 0000000..3e0a82f
--- /dev/null
+++ b/archive/releng.builder/tools/cruise/committer.xml
@@ -0,0 +1,93 @@
+<project default="Build">
+
+	<property file="committer.properties" />
+
+	<target name="Build">
+		<antcall target="clean" />
+		<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
+			<property name="codir" value="/home/build-home/build-node/checkout/${build.distribution}-${buildType}" />
+			<property name="buildType" value="${buildType}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+		</ant>
+
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/distribution/wtp.build/build.xml" target="build">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />
+			
+		</ant>
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />
+			
+		</ant>
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />
+			
+		</ant>
+
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="test">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />
+		</ant>
+		
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="site">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />
+		</ant>
+		<ant antfile="/home/build-home/build-node/checkout/build-${build.distribution}-${buildType}/releng.wtpbuilder/build.xml" target="upload">
+			<property name="baseos" value="${baseos}" />
+			<property name="basews" value="${basews}" />
+			<property name="basearch" value="${basearch}" />
+			<property name="build.home" value="${build.home}" />
+			<property name="build.trial" value="${build.trial}" />
+			<property name="build.clean" value="${build.clean}" />
+			<property name="build.distribution" value="${build.distribution}" />
+			<property name="mapVersionTag" value="${mapVersionTag}" />
+			<property name="buildType" value="${buildType}" />			
+		</ant>
+	</target>
+
+
+
+	<target name="clean" if="build.clean">
+		<delete dir="${build.home}/build-${build.distribution}-${buildType}" failonerror="false" />
+	</target>
+
+
+</project>
\ No newline at end of file
diff --git a/archive/releng.builder/tools/cruise/config.xml b/archive/releng.builder/tools/cruise/config.xml
index 6c3774e..01dc801 100644
--- a/archive/releng.builder/tools/cruise/config.xml
+++ b/archive/releng.builder/tools/cruise/config.xml
@@ -98,12 +98,12 @@
 		<schedule interval="3600">
 			<ant
 				antscript="/home/build-home/build-node/builder/releng.builder/tools/cruise/ant.sh"
-				buildfile="trigger.xml" target="Build" uselogger="false"
+				buildfile="committer.xml" target="Build" uselogger="false"
 				usedebug="false"
 				antworkingdir="/home/build-home/build-node/builder/releng.builder/tools/cruise">
 				<property name="buildType" value="I"/>
 				<property name="mapVersionTag" value="HEAD"/>
-				<property name="build.component" value="wtp"/>
+				<property name="build.distribution" value="wtp"/>
 			</ant>
 		</schedule>
 
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index 81805b2..706505b 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -15,6 +15,7 @@
 
 		<ant antfile="build.xml" dir="${pde.build.scripts}">
 			<property name="wtp.builder.home" value="${wtp.builder.home}" />			
+			<property name="buildBranch" value="${buildBranch}" />			
 			<property name="cvsUser" value="${cvsUser}" />
 			<property name="cvsProtocol" value="${cvsProtocol}" />
 			<property name="dependencyTargets" value="${basedir}/scripts/dependency/build.xml" />
@@ -36,7 +37,8 @@
 
 		<ant antfile="${wtp.builder.home}/distribution/${build.distribution}.site/build.xml">
 			<property name="wtp.builder.home" value="${wtp.builder.home}" />
-		</ant>
+			<property name="buildBranch" value="${buildBranch}" />			
+	</ant>
 	</target>
 	<!-- ================================= 
 	          target: test              
@@ -44,6 +46,7 @@
 	<target name="test" depends="init">
 		<ant antfile="${wtp.builder.home}/distribution/${build.distribution}.tests/build.xml">
 			<property name="wtp.builder.home" value="${wtp.builder.home}" />
+			<property name="buildBranch" value="${buildBranch}" />			
 			<property name="testRoot" value="${build.home}/${build.tests}-${build.distribution}-${buildType}" />
 			<property name="dependencyTargets" value="${wtp.builder.home}/scripts/dependency/build.xml" />
 			<property name="local.cache.dir" value="${build.home}/${build.local.repository}" />
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 1f2b5b7..c3bba9f 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -7,9 +7,6 @@
 		<property file="${wtbuilder.dir}/../../build.properties" />
 		<property name="buildTargets" value="${wtbuilder.dir}/../../scripts/build/build.xml" />
 
-		
-
-
 		<ant antfile="${buildTargets}" >
 			<property name="component" value="wst" />
 		</ant>
@@ -50,4 +47,8 @@
 		<!-- delete dir="${build.home}/${eclipse.builder}" failonerror="false"/ -->
 		<ant antfile="${buildTargets}" target="getBaseBuilder" />
 	</target>
+	
+
+
+
 </project>