Changing maintenance builds to M builds
diff --git a/archive/releng.builder/scripts/buildAll.properties b/archive/releng.builder/scripts/buildAll.properties
index 21b40f9..5dc08ab 100644
--- a/archive/releng.builder/scripts/buildAll.properties
+++ b/archive/releng.builder/scripts/buildAll.properties
@@ -17,7 +17,9 @@
# Set this to the relative path for the
# directory to be use for the current build.
# It must be relative to the buildHome
-build.current=build-current
+# Final name will include the component and build type
+# e.g: build-wtp-I
+build.current=build
# Set this to the relative path for the
# directory that keeps the downloaded drivers
@@ -28,7 +30,9 @@
# Set this to the relative path for the
# directory to be use for the current test pass.
# It must be relative to the buildHome
-build.tests=test-current
+# Final name will include the component and build type
+# e.g: test-wtp-I
+build.tests=test
# Set this to the relative path for the
# directory to be use for the current peformance test pass.
@@ -59,6 +63,11 @@
build.trial=true
+# Set this property to the name of the component to build
+# i.e. wtp, jsf, ejb3.0, docs
+build.component=wtp
+
+
# javacFailOnError must be false otherwise the
# build will terminated at the first compile error
# javacVerbose must be true otherwise the compile
diff --git a/archive/releng.builder/scripts/buildAll.xml b/archive/releng.builder/scripts/buildAll.xml
index efe79c4..dc04c6c 100644
--- a/archive/releng.builder/scripts/buildAll.xml
+++ b/archive/releng.builder/scripts/buildAll.xml
@@ -13,9 +13,9 @@
<taskdef name="wtp-monitor" classname="org.eclipse.wtp.releng.monitor.BuildMonitor" classpathref="monitor.classpath" />
<target name="init">
- <property name="buildDirectory" value="${build.home}/${build.current}-${buildType}/${build.directory}" />
- <property name="baseLocation" value="${build.home}/${build.current}-${buildType}/${base.location}" />
- <property name="testDir" value="${build.home}/${build.tests}-${buildType}" />
+ <property name="buildDirectory" value="${build.home}/${build.current}-${build.component}-${buildType}/${build.directory}" />
+ <property name="baseLocation" value="${build.home}/${build.current}-${build.component}-${buildType}/${base.location}" />
+ <property name="testDir" value="${build.home}/${build.tests}-${build.component}-${buildType}" />
<property name="perfDir" value="${build.home}/${build.perf.tests}-${buildType}" />
<property name="bootclasspath" value="${java.home}/lib/rt.jar${path.separator}${java.home}/lib/jsse.jar" />
@@ -23,6 +23,13 @@
<equals arg1="${build.trial}" arg2="true" />
</condition>
+ <condition property="buildBranch" value="R1.0">
+ <equals arg1="${mapVersionTag}" arg2="HEAD" />
+ </condition>
+ <condition property="buildBranch" value="R0.7 Maintenance">
+ <equals arg1="${mapVersionTag}" arg2="R0_7_maintenance" />
+ </condition>
+
<condition property="isEclipseFileTarGz" value="true">
<equals arg1="${baseos}" arg2="linux" />
</condition>
@@ -46,7 +53,7 @@
- <available file="${build.home}/${build.current}-${buildType}/${base.location}/startup.jar" property="eclipse.exists"/>
+ <available file="${build.home}/${build.current}-${build.component}-${buildType}/${base.location}/startup.jar" property="eclipse.exists"/>
<antcall target="getPreReq" />
<antcall target="unzipEclipse" />
@@ -74,17 +81,17 @@
<antcall target="unzipEclipseSDK" />
<antcall target="untarEclipseSDK" />
- <unzip dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${emfFile}" overwrite="true" />
- <unzip dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${gefFile}" overwrite="true" />
- <unzip dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${jemFile}" overwrite="true" />
- <unzip dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${junitFile}" overwrite="true" />
+ <unzip dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${emfFile}" overwrite="true" />
+ <unzip dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${gefFile}" overwrite="true" />
+ <unzip dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${jemFile}" overwrite="true" />
+ <unzip dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${junitFile}" overwrite="true" />
</target>
<target name="unzipEclipseSDK" unless="isEclipseFileTarGz">
- <unzip dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${eclipseFile}" overwrite="true" />
+ <unzip dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${eclipseFile}" overwrite="true" />
</target>
<target name="untarEclipseSDK" if="isEclipseFileTarGz">
- <untar dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${eclipseFile}" compression="gzip" overwrite="true" />
+ <untar dest="${build.home}/${build.current}-${build.component}-${buildType}" src="${build.home}/${build.drivers}/${eclipseFile}" compression="gzip" overwrite="true" />
</target>
<target name="create.label.properties" unless="label.properties.exists">
@@ -334,7 +341,7 @@
<fileset dir="${buildDirectory}/${buildLabel}"/>
</move>
<delete dir="${buildDirectory}" failonerror="false"/>
- <delete dir="${build.home}/${build.current}-${buildType}" failonerror="false"/>
+ <delete dir="${build.home}/${build.current}-${build.component}-${buildType}" failonerror="false"/>
<delete dir="${testDir}" failonerror="false"/>
<delete dir="${perfDir}" failonerror="false"/>
</target>
@@ -862,14 +869,14 @@
<param name="emitterClass" value="org.eclipse.wtp.releng.tools.component.api.usecoverage.APIUseCoverageEmitter"/>
<param name="args" value="-eclipseDir ${apitoolsDir}/base/eclipse/plugins -testDir ${apitoolsDir}/base/eclipse/plugins -compXMLDir ${buildDirectory}/plugins -compAPIDir ${buildDirectory}/${buildLabel}/apitools -genHTML"/>
</antcall>
- <copy todir="${build.home}/${build.current}-${buildType}/eclipse/plugins/org.eclipse.wtp.releng.tools.component.core" overwrite="true">
+ <copy todir="${build.home}/${build.current}-${build.component}-${buildType}/eclipse/plugins/org.eclipse.wtp.releng.tools.component.core" overwrite="true">
<fileset dir="${apitoolsDir}/${component.core}"/>
</copy>
- <java classpath="${build.home}/${build.current}-${buildType}/eclipse/startup.jar"
+ <java classpath="${build.home}/${build.current}-${build.component}-${buildType}/eclipse/startup.jar"
fork="true"
classname="org.eclipse.core.launcher.Main"
failonerror="false"
- dir="${build.home}/${build.current}-${buildType}">
+ dir="${build.home}/${build.current}-${build.component}-${buildType}">
<jvmarg value="-Dosgi.ws=${basews}"/>
<jvmarg value="-Dosgi.os=${baseos}"/>
<jvmarg value="-Dosgi.arch=${basearch}"/>
@@ -884,7 +891,7 @@
<sysproperty key="srcDir" value="${buildDirectory}/plugins"/>
<sysproperty key="outputDir" value="${buildDirectory}/${buildLabel}/apitools"/>
</java>
- <delete dir="${build.home}/${build.current}-${buildType}/eclipse/plugins/org.eclipse.wtp.releng.tools.component.core"/>
+ <delete dir="${build.home}/${build.current}-${build.component}-${buildType}/eclipse/plugins/org.eclipse.wtp.releng.tools.component.core"/>
<antcall target="runAPIToolsEmitter">
<param name="emitterClass" value="org.eclipse.wtp.releng.tools.component.api.compatibility.APICompatibilityEmitter"/>
<param name="args" value="-currAPIIndex ${buildDirectory}/${buildLabel}/apitools/index-comp-summary.xml -refAPIIndex ${apitoolsDir}/${apiFinalDir}/index-comp-summary.xml -outputDir ${buildDirectory}/${buildLabel}/apitools -genHTML"/>
@@ -1022,7 +1029,7 @@
hostname="127.0.0.1"
sender="buildmaster@lomboz.org"
recipients="wtp-releng@eclipse.org"
- prefix="[wtp-build]"
+ prefix="[wtp-${buildBranch}-build]"
buildLabel="${buildLabel}"
dropTokenList="%wst%,%jst%,%wstsdk%,%jstsdk%"
xmlDirectoryName="${buildDirectory}/${buildLabel}/testResults/xml"
diff --git a/archive/releng.builder/scripts/cruise.xml b/archive/releng.builder/scripts/cruise.xml
index 2ccdeda..6328151 100644
--- a/archive/releng.builder/scripts/cruise.xml
+++ b/archive/releng.builder/scripts/cruise.xml
@@ -20,6 +20,7 @@
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<jvmarg value="-Dclean=true"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<arg value="-application"/>
@@ -48,6 +49,7 @@
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -74,6 +76,7 @@
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -95,6 +98,7 @@
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -116,6 +120,7 @@
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -155,6 +160,7 @@
<property name="buildLabel" value="${buildType}-${buildId}-${timestamp}"/>
<antcall target="eclipse.performance"/>
<antcall target="wtp.performance"/>
+ <property name="build.component" value="${build.component}"/>
</target>
<target name="eclipse.performance" if="run.eclipse.perf">
@@ -167,6 +173,7 @@
<property name="build.trial" value="${build.trial}"/>
<property name="timestamp" value="${timestamp}"/>
<property name="buildLabel" value="${buildLabel}"/>
+ <property name="build.component" value="${build.component}"/>
</ant>
</target>
@@ -180,6 +187,7 @@
<property name="buildId" value="${buildId}"/>
<property name="timestamp" value="${timestamp}"/>
<property name="buildLabel" value="${buildLabel}"/>
+ <property name="build.component" value="${build.component}"/>
</ant>
</target>
@@ -202,6 +210,7 @@
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<jvmarg value="-Dclean=true"/>
<jvmarg value="-DjavacDebugInfo=on"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -226,6 +235,7 @@
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -250,6 +260,7 @@
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
+ <jvmarg value="-Dbuild.component=${build.component}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
diff --git a/archive/releng.builder/tools/cruise/checkout.xml b/archive/releng.builder/tools/cruise/checkout.xml
index a98fe1b..234525d 100644
--- a/archive/releng.builder/tools/cruise/checkout.xml
+++ b/archive/releng.builder/tools/cruise/checkout.xml
@@ -28,6 +28,36 @@
</target>
<target name="I">
+ <echo message="Map Version tag for releng: ${mapVersionTag}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}-doc" dest="${codir}" tag="${mapVersionTag}" />
+
+ <delete dir="${codir}/releng.builder/workspace" failonerror="false" />
+
+ <property file="${codir}/releng/maps/build.cfg" />
+ <echo message="Version tag for releng builder is: ${wtpBuilderVersion}" />
+
+ <delete dir="${codir}/releng.builder" failonerror="false" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng.builder}" dest="${codir}" tag="${wtpBuilderVersion}" />
+
+ </target>
+
+ <target name="M">
+ <echo message="Map Version tag for releng: ${mapVersionTag}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}-doc" dest="${codir}" tag="${mapVersionTag}" />
+
+ <delete dir="${codir}/releng.builder/workspace" failonerror="false" />
+
+ <property file="${codir}/releng/maps/build.cfg" />
+ <echo message="Version tag for releng builder is: ${wtpBuilderVersion}" />
+
+ <delete dir="${codir}/releng.builder" failonerror="false" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng.builder}" dest="${codir}" tag="${wtpBuilderVersion}" />
+
+ </target>
+
+ <target name="R">
<cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
<cvs cvsRoot="${mapCvsRoot}" package="${releng}-doc" dest="${codir}" tag="${mapVersionTag}" />
diff --git a/archive/releng.builder/tools/cruise/config.xml b/archive/releng.builder/tools/cruise/config.xml
index 6daca2b..6c3774e 100644
--- a/archive/releng.builder/tools/cruise/config.xml
+++ b/archive/releng.builder/tools/cruise/config.xml
@@ -31,7 +31,7 @@
file="logs/wtp-driver/buildstatus.txt" />
<email mailhost="localhost"
returnaddress="buildmaster@lomboz.org" skipusers="true"
- subjectprefix="[wtp-build]"
+ subjectprefix="[wtp-driver-build]"
buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-driver">
<always address="wtp-releng@eclipse.org" />
</email>
@@ -59,6 +59,9 @@
buildfile="trigger.xml" target="docs" 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="docs"/>
</ant>
</schedule>
@@ -69,7 +72,7 @@
file="logs/wtp-docs/buildstatus.txt" />
<email mailhost="localhost"
returnaddress="buildmaster@lomboz.org" skipusers="true"
- subjectprefix="[wtp-build]"
+ subjectprefix="[wtp-doc-build]"
buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-docs">
<always address="wtp-releng@eclipse.org" />
</email>
@@ -95,9 +98,12 @@
<schedule interval="3600">
<ant
antscript="/home/build-home/build-node/builder/releng.builder/tools/cruise/ant.sh"
- buildfile="trigger.xml" target="I-Build" uselogger="false"
+ buildfile="trigger.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"/>
</ant>
</schedule>
@@ -112,6 +118,7 @@
file="logs/wtp-I/buildstatus.txt" />
<email mailhost="localhost"
returnaddress="buildmaster@lomboz.org" skipusers="true"
+ subjectprefix="[wtp-R1.0-I-build]"
buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-I">
<failure address="wtp-dev@eclipse.org" />
<always address="wtp-releng@eclipse.org" />
@@ -119,12 +126,12 @@
</publishers>
</project>
- <project name="wtp-0_7_maintenanceI" buildafterfailed="true">
+ <project name="wtp-M" buildafterfailed="true">
<!-- Bootstrappers are run every time the build runs,
*before* the modification checks -->
<bootstrappers>
<currentbuildstatusbootstrapper
- file="logs/wtp-0_7_maintenanceI/buildstatus.txt" />
+ file="logs/wtp-M/buildstatus.txt" />
</bootstrappers>
<!-- Defines where cruise looks for changes, to decide whether to run the build -->
@@ -132,30 +139,34 @@
<cvs
cvsroot=":pserver:anonymous@dev.eclipse.org:/home/webtools"
tag="R0_7_maintenance"
- localworkingcopy="/home/build-home/build-node/checkout/wtp-0_7_maintenanceI" />
+ localworkingcopy="/home/build-home/build-node/checkout/wtp-M" />
</modificationset>
<schedule interval="3600">
<ant
antscript="/home/build-home/build-node/builder/releng.builder/tools/cruise/ant.sh"
- buildfile="trigger.xml" target="I-Mntnc-Build" uselogger="false"
+ buildfile="trigger.xml" target="Build" uselogger="false"
usedebug="false"
antworkingdir="/home/build-home/build-node/builder/releng.builder/tools/cruise">
+ <property name="buildType" value="M"/>
+ <property name="mapVersionTag" value="R0_7_maintenance"/>
+ <property name="build.component" value="wtp"/>
</ant>
</schedule>
<!-- directory to write build logs to -->
- <log dir="logs/wtp-0_7_maintenanceI"></log>
+ <log dir="logs/wtp-M"></log>
<!-- Publishers are run *after* a build completes -->
<publishers>
<currentbuildstatuspublisher
- file="logs/wtp-0_7_maintenanceI/buildstatus.txt" />
+ file="logs/wtp-M/buildstatus.txt" />
<email mailhost="localhost"
returnaddress="buildmaster@lomboz.org" skipusers="true"
- buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-0_7_maintenanceI">
+ subjectprefix="[wtp-R0.7-M-build]"
+ buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-M">
<failure address="wtp-dev@eclipse.org" />
<always address="wtp-releng@eclipse.org" />
</email>
diff --git a/archive/releng.builder/tools/cruise/trigger.properties b/archive/releng.builder/tools/cruise/trigger.properties
index 86d39d7..a2b6b91 100644
--- a/archive/releng.builder/tools/cruise/trigger.properties
+++ b/archive/releng.builder/tools/cruise/trigger.properties
@@ -3,6 +3,10 @@
#basews=gtk
#basearch=x86
+mapVersionTag=HEAD
+buildType=I
+build.component=wtp
+
build.home=/home/build-home
build.trial=false
build.drivers=downloads
diff --git a/archive/releng.builder/tools/cruise/trigger.xml b/archive/releng.builder/tools/cruise/trigger.xml
index 3c59246..9e8791f 100644
--- a/archive/releng.builder/tools/cruise/trigger.xml
+++ b/archive/releng.builder/tools/cruise/trigger.xml
@@ -1,118 +1,49 @@
-<project default="N-Build">
+<project default="Build">
+
<property file="trigger.properties" />
- <target name="N-Build">
- <property name="buildType" value="N" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="fullBuild">
- </antcall>
- </target>
- <target name="N-Repeat">
- <property name="buildType" value="N" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="repeatBuild">
- </antcall>
- </target>
- <target name="N-Test">
- <property name="buildType" value="N" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="testBuild">
- </antcall>
- </target>
- <target name="N-Publish">
- <property name="buildType" value="N" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="publishBuild">
- </antcall>
- </target>
- <target name="N-Push">
- <property name="buildType" value="N" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="pushBuild">
+ <target name="Build">
+ <property name="buildTarget" value="all" />
+ <property name="removeBuildDir" value="true" />
+ <antcall target="startBuild">
</antcall>
</target>
- <target name="I-Build">
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="fullBuild">
- </antcall>
- </target>
-
- <target name="I-Mntnc-Build">
- <property name="buildType" value="I" />
- <property name="maintenance" value="0_7_maintenance" />
- <property name="mapVersionTag" value="R0_7_maintenance" />
- <antcall target="fullBuild">
+ <target name="Repeat">
+ <property name="buildTarget" value="all" />
+ <antcall target="startBuild">
</antcall>
</target>
- <target name="I-Repeat">
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="repeatBuild">
- </antcall>
- </target>
- <target name="I-Test">
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="testBuild">
- </antcall>
- </target>
- <target name="I-Publish">
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="publishBuild">
- </antcall>
- </target>
- <target name="I-Push">
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="uploadBuild">
+ <target name="Test">
+ <delete dir="${build.home}/test-${build.component}-${buildType}" failonerror="false" />
+ <property name="buildTarget" value="test" />
+ <antcall target="startBuild">
</antcall>
</target>
-
- <target name="S-Build">
- <property name="buildType" value="S" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="fullBuild">
- </antcall>
- </target>
- <target name="S-Repeat">
- <property name="buildType" value="S" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="repeatBuild">
- </antcall>
- </target>
- <target name="S-Test">
- <property name="buildType" value="S" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="testBuild">
- </antcall>
- </target>
- <target name="S-Publish">
- <property name="buildType" value="S" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="publishBuild">
- </antcall>
- </target>
- <target name="S-Push">
- <property name="buildType" value="S" />
- <property name="mapVersionTag" value="HEAD" />
- <antcall target="pushBuild">
+ <target name="Publish">
+ <property name="buildTarget" value="justPublish" />
+ <antcall target="startBuild">
</antcall>
</target>
- <target name="fullBuild" depends="clean">
+ <target name="Push">
+ <property name="buildTarget" value="justPush" />
+ <antcall target="startBuild">
+ </antcall>
+ </target>
+
+ <target name="startBuild" depends="clean">
<antcall target="clean" />
+
<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
- <property name="codir" value="/home/build-home/build-node/checkout/wtp-${maintenance}${buildType}" />
+ <property name="codir" value="/home/build-home/build-node/checkout/${build.component}-${buildType}" />
<property name="buildType" value="${buildType}" />
<property name="mapVersionTag" value="${mapVersionTag}" />
</ant>
- <ant antfile="cruise.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-${maintenance}${buildType}/releng.builder/scripts" inheritall="false">
+ <ant antfile="cruise.xml" target="${buildTarget}" dir="/home/build-home/build-node/checkout/${build.component}-${buildType}/releng.builder/scripts" inheritall="false">
<!-- PUBLISH TO eclipse.org -->
<property name="baseos" value="${baseos}" />
@@ -120,6 +51,7 @@
<property name="basearch" value="${basearch}" />
<property name="build.home" value="${build.home}" />
<property name="build.trial" value="${build.trial}" />
+ <property name="build.component" value="${build.component}" />
<property name="mapVersionTag" value="${mapVersionTag}" />
<property name="buildType" value="${buildType}" />
@@ -131,87 +63,8 @@
</ant>
</target>
- <target name="repeatBuild">
- <ant antfile="cruise.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/scripts" inheritall="false">
- <!-- PUBLISH TO eclipse.org -->
- <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="mapVersionTag" value="${mapVersionTag}" />
- <property name="buildType" value="${buildType}" />
- <property name="ftpUser" value="${ftpUser}" />
- <property name="ftpPassword" value="${ftpPassword}" />
- <property name="ftpServer" value="${ftpServer}" />
- <property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
-
- </ant>
- </target>
-
- <target name="testBuild">
- <ant antfile="cruise.xml" target="test" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/scripts" inheritall="false">
- <!-- PUBLISH TO eclipse.org -->
- <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="mapVersionTag" value="${mapVersionTag}" />
- <property name="buildType" value="${buildType}" />
- <property name="ftpUser" value="${ftpUser}" />
- <property name="ftpPassword" value="${ftpPassword}" />
- <property name="ftpServer" value="${ftpServer}" />
- <property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
-
- </ant>
- </target>
-
- <target name="uploadBuild">
-
- <ant antfile="cruise.xml" target="justPush" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/scripts" inheritall="false">
- <!-- PUBLISH TO eclipse.org -->
- <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="mapVersionTag" value="${mapVersionTag}" />
- <property name="buildType" value="${buildType}" />
- <property name="ftpUser" value="${ftpUser}" />
- <property name="ftpPassword" value="${ftpPassword}" />
- <property name="ftpServer" value="${ftpServer}" />
- <property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
-
- </ant>
- </target>
-
- <target name="publishBuild">
-
- <ant antfile="cruise.xml" target="justPublish" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/scripts" inheritall="false">
- <!-- PUBLISH TO eclipse.org -->
- <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="mapVersionTag" value="${mapVersionTag}" />
- <property name="buildType" value="${buildType}" />
- <property name="ftpUser" value="${ftpUser}" />
- <property name="ftpPassword" value="${ftpPassword}" />
- <property name="ftpServer" value="${ftpServer}" />
- <property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
-
- </ant>
- </target>
-
<target name="Driver">
<ant antfile="checkout.xml" target="all" dir="." inheritall="false">
<property name="codir" value="/home/build-home/build-node/checkout/wtp-driver" />
@@ -221,38 +74,19 @@
<ant antfile="drivers.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-driver/releng.builder/tools/cruise" inheritall="false">
</ant>
</target>
-
+
<target name="docs">
- <property name="mapVersionTag" value="HEAD" />
- <property name="buildType" value="I" />
-
- <ant antfile="checkout.xml" target="all" dir="." inheritall="false">
- <property name="codir" value="/home/build-home/build-node/checkout/wtp-docs" />
- <property name="buildType" value="docs" />
- <property name="mapVersionTag" value="${mapVersionTag}" />
- </ant>
-
- <ant antfile="cruise.xml" target="buildDoc" dir="/home/build-home/build-node/checkout/wtp-docs/releng.builder/scripts" inheritall="false">
- <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="mapVersionTag" value="${mapVersionTag}" />
- <property name="buildType" value="${buildType}" />
- <property name="ftpUser" value="${ftpUser}" />
- <property name="ftpPassword" value="${ftpPassword}" />
- <property name="ftpServer" value="${ftpServer}" />
- <property name="ftpRemoteDirectory" value="${ftpRemoteDirectory}" />
- </ant>
+ <property name="build.component" value="docs" />
+ <property name="buildTarget" value="buildDocs" />
+ <antcall target="Build">
+ </antcall>
</target>
- <target name="clean" unless="noClean">
- <delete dir="${build.home}/build-current-${buildType}" failonerror="false" />
- <delete dir="${build.home}/test-current-${buildType}" failonerror="false" />
- <delete dir="/home/build-home/build-node/checkout/wtp-${buildType}/build/test-results" failonerror="false" />
+ <target name="clean" if="removeBuildDir">
+ <delete dir="${build.home}/build-${build.component}-${buildType}" failonerror="false" />
+ <delete dir="${build.home}/test-${build.component}-${buildType}" failonerror="false" />
+ <delete dir="/home/build-home/build-node/checkout/${build.component}-${buildType}/build/test-results" failonerror="false" />
<delete dir="${build.home}/workspace" failonerror="false" />
</target>