From bccd41f09cfaafa685234f62c89143a915ed0de6 Mon Sep 17 00:00:00 2001
From: ndai <ndai>
Date: Mon, 8 Aug 2005 19:15:03 +0000
Subject: [PATCH] refactoring doc and maintenance builds
---
.../components/testManifest.xml | 30 ++++
.../scripts/buildAll.properties | 5 +-
archive/releng.builder/scripts/buildAll.xml | 139 +++++-------------
archive/releng.builder/scripts/buildDoc.xml | 106 +++++++++++++
archive/releng.builder/scripts/cruise.xml | 22 ++-
.../releng.builder/tools/cruise/checkout.xml | 20 ++-
.../releng.builder/tools/cruise/config.xml | 81 ++++++++++
.../releng.builder/tools/cruise/trigger.xml | 59 +++++++-
8 files changed, 339 insertions(+), 123 deletions(-)
create mode 100644 archive/releng.builder/scripts/buildDoc.xml
diff --git a/archive/releng.builder/components/testManifest.xml b/archive/releng.builder/components/testManifest.xml
index e759a8206..ef4a066c3 100644
--- a/archive/releng.builder/components/testManifest.xml
+++ b/archive/releng.builder/components/testManifest.xml
@@ -57,6 +57,36 @@
fileName='<a href="@mirror@wtp-jst-perf-Tests-@build@.zip">wtp-jst-perf-Tests-@build@.zip</a> (<a href="wtp-jst-perf-Tests-@build@.zip.MD5">md5</a>) <font size="2"></font>'>
</platform>
</zipType>
+
+ <zipType name="wtpruntimedoc">
+ <platform
+ id="WTPRUNDOC"
+ name="All"
+ fileName='<a href="@mirror@wtp-doc-@build@.zip">wtp-doc-@build@.zip</a>(<a href="wtp-doc-@build@.zip.MD5">md5</a>) <font size="2"></font>'>
+ </platform>
+ </zipType>
+ <zipType name="wtpsdkdoc">
+ <platform
+ id="WTPSDKDOC"
+ name="All"
+ fileName='<a href="@mirror@wtp-sdk-doc-@build@.zip">wtp-sdk-doc-@build@.zip</a>(<a href="wtp-sdk-doc-@build@.zip.MD5">md5</a>) <font size="2"></font>'>
+ </platform>
+ </zipType>
+ <zipType name="wstdoc">
+ <platform
+ id="WSTDOC"
+ name="All"
+ fileName='<a href="@mirror@wtp-wst-doc-@build@.zip">wtp-wst-doc-@build@.zip</a>(<a href="wtp-wst-doc-@build@.zip.MD5">md5</a>) <font size="2"></font>'>
+ </platform>
+ </zipType>
+ <zipType name="wst-sdkdoc">
+ <platform
+ id="WST-SDKDOC"
+ name="All"
+ fileName='<a href="@mirror@wtp-wst-sdk-doc-@build@.zip">wtp-wst-sdk-doc-@build@.zip</a>(<a href="wtp-wst-sdk-doc-@build@.zip.MD5">md5</a>) <font size="2"></font>'>
+ </platform>
+ </zipType>
+
</zipTypes>
<logFiles>
diff --git a/archive/releng.builder/scripts/buildAll.properties b/archive/releng.builder/scripts/buildAll.properties
index 90d110a51..15026f1ce 100644
--- a/archive/releng.builder/scripts/buildAll.properties
+++ b/archive/releng.builder/scripts/buildAll.properties
@@ -12,7 +12,7 @@
# For automated builds this property is overriden
# by the driving ant script using vmargs such as
# -DbuildHome=/home/build-home
-build.home=C\:/nmd/dev/build-home
+build.home=D\:/nmd/dev/build-home
# Set this to the relative path for the
# directory to be use for the current build.
@@ -50,7 +50,7 @@ cloudscapeLib=derby/lib
# -DbuildId=1.0M4
#buildType=S
#buildId=1.0M1
-buildType=N
+buildType=I
# Set this property to true if the build is a trial build
# i.e. Setting this property to a false will cause
@@ -92,6 +92,7 @@ cvsServer=dev.eclipse.org
cvsProtocol=pserver
cvsUser=anonymous
+mapVersionTag=HEAD
mapCvsProtocol=ext
mapCvsUser=ndai
diff --git a/archive/releng.builder/scripts/buildAll.xml b/archive/releng.builder/scripts/buildAll.xml
index 5593974d0..2f4ed3221 100644
--- a/archive/releng.builder/scripts/buildAll.xml
+++ b/archive/releng.builder/scripts/buildAll.xml
@@ -1,8 +1,8 @@
<project default="run" basedir=".">
+ <import file="buildDoc.xml"/>
<property file="buildAll.properties"/>
<property file="builddates.properties"/>
<property file="../../releng/maps/build.cfg"/>
- <property file="../../releng-doc/maps/build.cfg"/>
<path id="monitor.classpath">
<fileset dir="../tools/monitor">
@@ -86,20 +86,6 @@
<target name="untarEclipseSDK" if="isEclipseFileTarGz">
<untar dest="${build.home}/${build.current}-${buildType}" src="${build.home}/${build.drivers}/${eclipseFile}" compression="gzip" overwrite="true" />
</target>
-
- <target name="unzipWTPSDK" unless="wtp.exists">
- <!-- Unzip the source plugins from the WTP SDK build. -->
- <unzip dest="${buildDirectory}/WSTSourcePlugins" src="${build.home}/${build.drivers}/${wtpFile}" overwrite="true">
- <patternset>
- <include name="**/*org.eclipse.wst.source*/**/*"/>
- </patternset>
- </unzip>
- <unzip dest="${buildDirectory}/JSTSourcePlugins" src="${build.home}/${build.drivers}/${wtpFile}" overwrite="true">
- <patternset>
- <include name="**/*org.eclipse.jst.source*/**/*"/>
- </patternset>
- </unzip>
- </target>
<target name="create.label.properties" unless="label.properties.exists">
<mkdir dir="${buildDirectory}" />
@@ -134,16 +120,15 @@
</echo>
</target>
- <target name="run" depends="init, checkBuildType">
-
+ <target name="run" depends="init">
<antcall target="runAll"/>
- <antcall target="buildDoc"/>
<antcall target="cleanUp"/>
</target>
- <target name="runAll" depends="init" unless="docbuild">
+ <target name="runAll" depends="init">
<antcall target="buildAll"/>
+ <antcall target="buildDoc"/>
<!--
<antcall target="checkpii"/>
-->
@@ -180,6 +165,11 @@
<antcall target="push"/>
</target>
+
+ <target name="runDocBuild" depends="init">
+ <antcall target="buildDocStandalone"/>
+ <antcall target="push"/>
+ </target>
<target name="publishPush" depends="init">
<antcall target="publish"/>
@@ -189,35 +179,30 @@
<antcall target="push"/>
</target>
- <target name="build" depends="init, checkBuildType">
-
+ <target name="build" depends="init">
+
<antcall target="buildAll"/>
<antcall target="buildDoc"/>
-
- <antcall target="regularBuildProcess"/>
-
+
+ <!--
+ <antcall target="checkpii"/>
+ -->
+
+ <antcall target="test"/>
+ <antcall target="checkInternalReference"/>
+
+ <!--
+ <antcall target="eclipsePerf"/>
+ <antcall target="performance"/>
+ -->
+ <antcall target="publish"/>
+ <!--
+ <antcall target="cvsrlog"/>
+ -->
<antcall target="cleanUp"/>
</target>
-
- <target name="regularBuildProcess" unless="docbuild">
- <!--
- <antcall target="checkpii"/>
- -->
-
- <antcall target="test"/>
- <antcall target="checkInternalReference"/>
-
- <!--
- <antcall target="eclipsePerf"/>
- <antcall target="performance"/>
- -->
- <antcall target="publish"/>
- <!--
- <antcall target="cvsrlog"/>
- -->
- </target>
- <target name="buildAll" depends="init" unless="docbuild">
+ <target name="buildAll" depends="init">
<!-- Third party content -->
<antcall target="getThirdPartyContent">
@@ -262,42 +247,6 @@
<property name="component" value="jst.perf.tests"/>
</ant>
</target>
-
- <target name="buildDoc" depends="init" if="docbuild">
- <echo message="Building Docs"/>
-
- <antcall target="tagReleng" />
-
- <antcall target="checkDocPreReq"/>
-
- <antcall target="getDocPreReq"/>
-
- <available file="${build.home}/${build.current}-${buildType}/${base.location}/plugins/org.eclipse.wst_${wtp-version}/META-INF/MANIFEST.MF" property="wtp.exists"/>
-
- <antcall target="unzipWTPSDK"/>
-
- <!-- WST TARGETS -->
- <ant antfile="build.xml" target="main">
- <property name="component" value="wst.doc"/>
- </ant>
-
- <ant antfile="build.xml" target="main">
- <property name="component" value="wst.doc-sdk"/>
- </ant>
-
- <!-- JST TARGETS -->
- <!-- No JST Doc plugins yet
- <ant antfile="build.xml" target="main">
- <property name="component" value="jst.doc"/>
- </ant>
- -->
-
- <ant antfile="build.xml" target="main">
- <property name="component" value="jst.doc-sdk"/>
- </ant>
-
- </target>
-
<target name="getThirdPartyContent">
</target>
@@ -328,16 +277,6 @@
<antcall target="getTomcat50" />
<antcall target="getJOnAS432" />
</target>
-
- <target name="checkDocPreReq">
- <available file="${build.home}/${build.drivers}/${wtpFile}" property="wtpfile.exists"/>
- </target>
-
- <target name="getDocPreReq">
- <available file="${build.home}/${build.drivers}/${wtpFile}" property="wtpfile.exists"/>
-
- <antcall target="getWTP" />
- </target>
<target name="getEclipse" unless="eclipsefile.exists" >
<get src="${eclipseURL}" dest="${build.home}/${build.drivers}/${eclipseFile}" />
@@ -386,11 +325,6 @@
<target name="getJAF" unless="jaf.exists" >
<get src="${jafURL}" dest="${build.home}/${build.drivers}/${jafFile}" />
</target>
-
- <!-- This target is strictly for the Doc build. -->
- <target name="getWTP" unless="wtpfile.exists" >
- <get src="${wtpURL}" dest="${build.home}/${build.drivers}/${wtpFile}" />
- </target>
<target name="cleanUp" if="clean" >
<!-- keep a local copy -->
@@ -693,12 +627,14 @@
</target>
<target name="test" depends="init">
+
<antcall target="setupTestEclipse"/>
<unzip dest="${testDir}" src="${buildDirectory}/${buildLabel}/wtp-${buildId}.zip" overwrite="true" />
<unzip dest="${testDir}" src="${buildDirectory}/${buildLabel}/wtp-wst-Automated-Tests-${buildId}.zip" overwrite="true" />
<unzip dest="${testDir}" src="${buildDirectory}/${buildLabel}/wtp-jst-Automated-Tests-${buildId}.zip" overwrite="true" />
<!-- Third party content -->
+
<antcall target="getThirdPartyContent">
<param name="pluginsDir" value="${testDir}/eclipse/plugins"/>
</antcall>
@@ -709,6 +645,7 @@
<antcall target="postRunTestEclipse">
<param name="testTarget" value="all"/>
</antcall>
+
</target>
@@ -1005,7 +942,7 @@
<antcall target="clearWST" />
<ant antfile="${publish.xml}" dir="${basedir}">
- <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%" />
+ <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%wtpruntimedoc%,%wtpsdkdoc%,%wstdoc%,%wst-sdkdoc%" />
<property name="isBuildTested" value="false" />
<property name="indexTemplateFilename" value="${indexTemplateFilename}" />
</ant>
@@ -1029,6 +966,10 @@
<include name="wtp-wst-${buildId}.zip.MD5"/>
<include name="wtp-wst-sdk-${buildId}.zip"/>
<include name="wtp-wst-sdk-${buildId}.zip.MD5"/>
+ <include name="wtp-wst-doc-${buildId}.zip"/>
+ <include name="wtp-wst-doc-${buildId}.zip.MD5"/>
+ <include name="wtp-wst-sdk-doc-${buildId}.zip"/>
+ <include name="wtp-wst-sdk-doc-${buildId}.zip.MD5"/>
</fileset>
</delete>
</target>
@@ -1099,14 +1040,6 @@
<property name="component" value="releng"/>
</ant>
</target>
-
- <target name="checkBuildType">
- <condition property="docbuild">
- <equals arg1="${buildCategory}" arg2="doc"/>
- </condition>
- <echo message="buildCategory: ${buildCategory}"/>
- <echo message="docbuild ${docbuild}"/>
- </target>
diff --git a/archive/releng.builder/scripts/buildDoc.xml b/archive/releng.builder/scripts/buildDoc.xml
new file mode 100644
index 000000000..9c8777e3e
--- /dev/null
+++ b/archive/releng.builder/scripts/buildDoc.xml
@@ -0,0 +1,106 @@
+<project default="default" basedir=".">
+ <property file="../../releng-doc/maps/build.cfg"/>
+
+ <target name="default">
+ <echo message="This build script is designed to be called from buildAll.xml."/>
+ </target>
+
+ <!-- Unzip the WTP SDK driver from the download directory. Used if this
+ is specifically a doc build. -->
+ <target name="unzipWTPSDK">
+ <!-- Unzip the source plugins from the WTP SDK build. -->
+ <unzip dest="${buildDirectory}/WSTSourcePlugins" src="${build.home}/${build.drivers}/${wtpFile}" overwrite="true">
+ <patternset>
+ <include name="**/*org.eclipse.wst.source*/**/*"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${buildDirectory}/JSTSourcePlugins" src="${build.home}/${build.drivers}/${wtpFile}" overwrite="true">
+ <patternset>
+ <include name="**/*org.eclipse.jst.source*/**/*"/>
+ </patternset>
+ </unzip>
+ </target>
+
+ <!-- Unzip the current WTP SDK driver (ie. the one that was built as part
+ of this build). Used for regular builds.-->
+ <target name="unzipCurrentWTPSDK">
+ <!-- Unzip the source plugins from the WTP SDK build. -->
+ <unzip dest="${buildDirectory}/WSTSourcePlugins" src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildId}.zip" overwrite="true">
+ <patternset>
+ <include name="**/*org.eclipse.wst.source*/**/*"/>
+ </patternset>
+ </unzip>
+ <unzip dest="${buildDirectory}/JSTSourcePlugins" src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildId}.zip" overwrite="true">
+ <patternset>
+ <include name="**/*org.eclipse.jst.source*/**/*"/>
+ </patternset>
+ </unzip>
+ </target>
+
+ <!-- Run the doc build. -->
+ <target name="buildDoc">
+ <echo message="Building Docs"/>
+
+ <!-- antcall target="tagReleng" /-->
+
+ <antcall target="unzipCurrentWTPSDK"/>
+
+ <antcall target="docBuild"/>
+
+ </target>
+
+ <!-- Run a standalone doc build. -->
+ <target name="buildDocStandalone">
+ <echo message="Building Docs"/>
+
+ <antcall target="getDocPreReq"/>
+
+ <antcall target="unzipWTPSDK"/>
+
+ <antcall target="docBuild"/>
+
+ </target>
+
+ <!-- Build the doc zips. -->
+ <target name="docBuild">
+ <!-- WST TARGETS -->
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="wst.doc"/>
+ </ant>
+
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="wst.doc-sdk"/>
+ </ant>
+
+ <!-- JST TARGETS -->
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="jst.doc"/>
+ </ant>
+
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="jst.doc-sdk"/>
+ </ant>
+ </target>
+
+ <!-- Check if the WTP SDK driver has already been downloaded and get the driver. -->
+ <target name="getDocPreReq">
+ <available file="${build.home}/${build.drivers}/${wtpFile}" property="wtpfile.exists"/>
+
+ <antcall target="getWTP" />
+ </target>
+
+ <!-- Get the WTP SDK driver if it hasn't already been retrieved. -->
+ <target name="getWTP" unless="wtpfile.exists" >
+ <get src="${wtpURL}" dest="${build.home}/${build.drivers}/${wtpFile}" />
+ </target>
+
+ <!--
+ <target name="checkBuildType">
+ <condition property="docbuild">
+ <equals arg1="${buildCategory}" arg2="doc"/>
+ </condition>
+ <echo message="buildCategory: ${buildCategory}"/>
+ <echo message="docbuild ${docbuild}"/>
+ </target>-->
+
+</project>
diff --git a/archive/releng.builder/scripts/cruise.xml b/archive/releng.builder/scripts/cruise.xml
index 709a99e40..2ccdedac8 100644
--- a/archive/releng.builder/scripts/cruise.xml
+++ b/archive/releng.builder/scripts/cruise.xml
@@ -2,7 +2,6 @@
<property file="buildAll.properties"/>
<property file="../../releng/maps/build.cfg"/>
- <property name="buildCategory" value="default"/>
<target name="all" >
<echo></echo>
@@ -20,9 +19,9 @@
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DbuildType=${buildType}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<jvmarg value="-Dclean=true"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -48,7 +47,7 @@
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -74,7 +73,7 @@
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -84,7 +83,6 @@
</target>
<target name="build" >
- <echo message="buildCategory: ${buildCategory}"/>
<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
<jvmarg value="-Dosgi.ws=${basews}"/>
<jvmarg value="-Dosgi.os=${baseos}"/>
@@ -96,7 +94,7 @@
<jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -105,8 +103,7 @@
</java>
</target>
- <target name="docbuild" >
- <echo message="buildCategory: ${buildCategory}"/>
+ <target name="buildDoc" >
<java classpath="${build.home}/${eclipse.builder}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
<jvmarg value="-Dosgi.ws=${basews}"/>
<jvmarg value="-Dosgi.os=${baseos}"/>
@@ -118,12 +115,12 @@
<jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=doc"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
<arg value="buildAll.xml"/>
- <arg value="build"/>
+ <arg value="runDocBuild"/>
</java>
</target>
@@ -202,9 +199,9 @@
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
<jvmarg value="-DbuildType=${buildType}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<jvmarg value="-Dclean=true"/>
<jvmarg value="-DjavacDebugInfo=on"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -228,7 +225,7 @@
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
- <jvmarg value="-DbuildCategory=${buildCategory}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<arg value="-application"/>
<arg value="org.eclipse.ant.core.antRunner"/>
<arg value="-buildfile"/>
@@ -252,6 +249,7 @@
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
<jvmarg value="-DftpPassword=${ftpPassword}"/>
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}"/>
<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 1b32c61fd..956cefa97 100644
--- a/archive/releng.builder/tools/cruise/checkout.xml
+++ b/archive/releng.builder/tools/cruise/checkout.xml
@@ -7,13 +7,13 @@
<target name="N">
<delete dir="${codir}/releng.builder/workspace" failonerror="false" />
<cvs cvsRoot="${mapCvsRoot}" package="${releng.builder}" dest="${codir}" />
- <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
<cvs cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
<cvs cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
</target>
<target name="S">
- <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
<delete dir="${codir}/releng.builder/workspace" failonerror="false" />
@@ -26,7 +26,21 @@
</target>
<target name="I">
- <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" 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="docs">
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
+ <cvs cvsRoot="${mapCvsRoot}" package="${releng}.docs" dest="${codir}" tag="${mapVersionTag}" />
<delete dir="${codir}/releng.builder/workspace" failonerror="false" />
diff --git a/archive/releng.builder/tools/cruise/config.xml b/archive/releng.builder/tools/cruise/config.xml
index 372c77f25..8f7edd3a3 100644
--- a/archive/releng.builder/tools/cruise/config.xml
+++ b/archive/releng.builder/tools/cruise/config.xml
@@ -38,6 +38,44 @@
</publishers>
</project>
+ <project name="docs" buildafterfailed="true">
+ <!-- Bootstrappers are run every time the build runs,
+ *before* the modification checks -->
+ <bootstrappers>
+ <currentbuildstatusbootstrapper
+ file="logs/wtp-docs/buildstatus.txt" />
+ </bootstrappers>
+
+ <modificationset quietperiod="300">
+ <cvs
+ cvsroot=":pserver:anonymous@dev.eclipse.org:/home/webtools"
+ tag="HEAD"
+ localworkingcopy="/home/build-home/build-node/checkout/wtp-docs" />
+ </modificationset>
+
+ <schedule interval="31536000">
+ <ant
+ antscript="/home/build-home/build-node/builder/releng.builder/tools/cruise/ant.sh"
+ buildfile="trigger.xml" target="docs" uselogger="false"
+ usedebug="false"
+ antworkingdir="/home/build-home/build-node/builder/releng.builder/tools/cruise">
+ </ant>
+ </schedule>
+
+ <log dir="logs/wtp-docs"></log>
+
+ <publishers>
+ <currentbuildstatuspublisher
+ file="logs/wtp-docs/buildstatus.txt" />
+ <email mailhost="localhost"
+ returnaddress="buildmaster@lomboz.org" skipusers="true"
+ subjectprefix="[wtp-build]"
+ buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-docs">
+ <always address="wtp-releng@eclipse.org" />
+ </email>
+ </publishers>
+ </project>
+
<project name="wtp-I" buildafterfailed="true">
<!-- Bootstrappers are run every time the build runs,
*before* the modification checks -->
@@ -65,6 +103,49 @@
+ <!-- directory to write build logs to -->
+ <log dir="logs/wtp-I"></log>
+
+ <!-- Publishers are run *after* a build completes -->
+ <publishers>
+ <currentbuildstatuspublisher
+ file="logs/wtp-I/buildstatus.txt" />
+ <email mailhost="localhost"
+ returnaddress="buildmaster@lomboz.org" skipusers="true"
+ buildresultsurl="http://buildserver.lomboz.org:8080/cruisecontrol/buildresults/wtp-I">
+ <failure address="wtp-dev@eclipse.org" />
+ <always address="wtp-releng@eclipse.org" />
+ </email>
+ </publishers>
+ </project>
+
+ <project name="wtp0_7_mntnc-I" buildafterfailed="true">
+ <!-- Bootstrappers are run every time the build runs,
+ *before* the modification checks -->
+ <bootstrappers>
+ <currentbuildstatusbootstrapper
+ file="logs/wtp0_7_mntnc-I/buildstatus.txt" />
+ </bootstrappers>
+
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ cvsroot=":pserver:anonymous@dev.eclipse.org:/home/webtools"
+ tag="R0_7_maintenance"
+ localworkingcopy="/home/build-home/build-node/checkout/wtp0_7_mntnc-I" />
+ </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"
+ usedebug="false"
+ antworkingdir="/home/build-home/build-node/builder/releng.builder/tools/cruise">
+ </ant>
+ </schedule>
+
+
+
<!-- directory to write build logs to -->
<log dir="logs/wtp-I"></log>
diff --git a/archive/releng.builder/tools/cruise/trigger.xml b/archive/releng.builder/tools/cruise/trigger.xml
index 0f1a415fc..7cf76f0ed 100644
--- a/archive/releng.builder/tools/cruise/trigger.xml
+++ b/archive/releng.builder/tools/cruise/trigger.xml
@@ -3,52 +3,71 @@
<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">
</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">
+ </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">
</antcall>
</target>
@@ -56,26 +75,31 @@
<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">
</antcall>
</target>
@@ -83,11 +107,11 @@
<target name="fullBuild" 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-${buildType}" />
+ <property name="codir" value="/home/build-home/build-node/checkout/wtp-${maintenance}${buildType}" />
<property name="buildType" value="${buildType}" />
</ant>
- <ant antfile="cruise.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/scripts" inheritall="false">
+ <ant antfile="cruise.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-${maintenance}${buildType}/releng.builder/scripts" inheritall="false">
<!-- PUBLISH TO eclipse.org -->
<property name="baseos" value="${baseos}" />
@@ -96,6 +120,7 @@
<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}" />
@@ -115,6 +140,7 @@
<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}" />
@@ -133,6 +159,7 @@
<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}" />
@@ -154,6 +181,7 @@
+ <property name="mapVersionTag" value="${mapVersionTag}" />
<property name="buildType" value="${buildType}" />
<property name="ftpUser" value="${ftpUser}" />
<property name="ftpPassword" value="${ftpPassword}" />
@@ -173,6 +201,7 @@
<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}" />
@@ -187,7 +216,31 @@
<property name="codir" value="checkout/wtp-driver" />
<property name="buildType" value="I" />
</ant>
- <ant antfile="drivers.xml" target="all" dir="/home/build-home/build-node/checkout/wtp-${buildType}/releng.builder/tools/cruise" inheritall="false">
+ <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="checkout/wtp-docs" />
+ <property name="buildType" value="docs" />
+ </ant>
+ <ant antfile="cruise.xml" target="buildDoc" dir="/home/build-home/build-node/checkout/wtp-docs/releng.builder/tools/cruise" 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>
</target>
--
GitLab