[104039] Add option for local/trial builds
diff --git a/archive/releng.builder/scripts/buildAll.properties b/archive/releng.builder/scripts/buildAll.properties
index 10c09bf..90d110a 100644
--- a/archive/releng.builder/scripts/buildAll.properties
+++ b/archive/releng.builder/scripts/buildAll.properties
@@ -52,6 +52,12 @@
#buildId=1.0M1
buildType=N
+# Set this property to true if the build is a trial build
+# i.e. Setting this property to a false will cause
+# the build to tag map files, send emails to releng
+# and upload results to the download.eclipse.org
+build.trial=true
+
# javacFailOnError must be false otherwise the
# build will terminated at the first compile error
diff --git a/archive/releng.builder/scripts/buildAll.xml b/archive/releng.builder/scripts/buildAll.xml
index 090ba25..e14e9f1 100644
--- a/archive/releng.builder/scripts/buildAll.xml
+++ b/archive/releng.builder/scripts/buildAll.xml
@@ -18,7 +18,11 @@
<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" />
- <condition property="isEclipseFileTarGz" value="true">
+ <condition property="doTrial">
+ <equals arg1="${build.trial}" arg2="true" />
+ </condition>
+
+ <condition property="isEclipseFileTarGz" value="true">
<equals arg1="${baseos}" arg2="linux" />
</condition>
<condition property="eclipseURL" value="${eclipseURL.linux}">
@@ -59,6 +63,7 @@
<not>
<isset property="nopush"/>
</not>
+ <equals arg1="${build.trial}" arg2="false" />
</and>
</condition>
@@ -114,10 +119,11 @@
</echo>
</target>
- <target name="run" depends="init">
- <antcall target="runAll"/>
- <antcall target="cleanUp"/>
- </target>
+ <target name="run" depends="init">
+ <antcall target="runAll"/>
+ <antcall target="cleanUp"/>
+ </target>
+
<target name="runAll" depends="init">
<antcall target="buildAll"/>
@@ -193,10 +199,7 @@
<param name="pluginsDir" value="${buildDirectory}/plugins"/>
</antcall>
-
- <ant antfile="build.xml" target="main">
- <property name="component" value="releng"/>
- </ant>
+ <antcall target="tagReleng" />
<!-- WST TARGETS -->
@@ -995,7 +998,7 @@
<!-- =================================
target: notify
================================= -->
- <target name="notify" depends="init" description="wtp monitor">
+ <target name="notify" depends="init" description="wtp monitor" unless="doTrial">
<wtp-monitor
hostname="127.0.0.1"
sender="buildmaster@lomboz.org"
@@ -1010,6 +1013,17 @@
/>
</target>
-
+
+
+ <!-- - - - - - - - - - - - - - - - - -
+ target: tagReleng
+ - - - - - - - - - - - - - - - - - -->
+ <target name="tagReleng" unless="doTrial">
+ <ant antfile="build.xml" target="main">
+ <property name="component" value="releng"/>
+ </ant>
+ </target>
+
+
</project>
\ No newline at end of file
diff --git a/archive/releng.builder/scripts/cruise.xml b/archive/releng.builder/scripts/cruise.xml
index f76a92a..f25d605 100644
--- a/archive/releng.builder/scripts/cruise.xml
+++ b/archive/releng.builder/scripts/cruise.xml
@@ -13,6 +13,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
@@ -38,6 +39,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
@@ -62,6 +64,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
@@ -85,6 +88,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DbuildType=${buildType}"/>
<jvmarg value="-DjavacDebugInfo=on"/>
<arg value="-application"/>
@@ -97,6 +101,7 @@
<target name="performance">
<echo message="build.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<echo message="buildType=${buildType}"/>
<echo message="date=${date}"/>
<echo message="time=${time}"/>
@@ -134,6 +139,7 @@
<property name="date" value="${date}"/>
<property name="time" value="${time}"/>
<property name="buildId" value="${buildId}"/>
+ <property name="build.trial" value="${build.trial}"/>
<property name="timestamp" value="${timestamp}"/>
<property name="buildLabel" value="${buildLabel}"/>
</ant>
@@ -143,6 +149,7 @@
<ant antfile="buildAll.xml" target="performance">
<property name="build.home" value="${build.home}"/>
<property name="buildType" value="${buildType}"/>
+ <property name="build.trial" value="${build.trial}"/>
<property name="date" value="${date}"/>
<property name="time" value="${time}"/>
<property name="buildId" value="${buildId}"/>
@@ -161,6 +168,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
@@ -186,6 +194,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
@@ -208,6 +217,7 @@
<jvmarg value="-Dbaseos=${baseos}"/>
<jvmarg value="-Dbasearch=${basearch}"/>
<jvmarg value="-Dbuild.home=${build.home}"/>
+ <jvmarg value="-Dbuild.trial=${build.trial}"/>
<jvmarg value="-DftpServer=${ftpServer}"/>
<jvmarg value="-DftpRemoteDirectory=${ftpRemoteDirectory}"/>
<jvmarg value="-DftpUser=${ftpUser}"/>
diff --git a/archive/releng.builder/tools/cruise/trigger.properties b/archive/releng.builder/tools/cruise/trigger.properties
index 86e497b..86d39d7 100644
--- a/archive/releng.builder/tools/cruise/trigger.properties
+++ b/archive/releng.builder/tools/cruise/trigger.properties
@@ -4,6 +4,7 @@
#basearch=x86
build.home=/home/build-home
+build.trial=false
build.drivers=downloads
localDrivers=drivers
baseos=linux
diff --git a/archive/releng.builder/tools/cruise/trigger.xml b/archive/releng.builder/tools/cruise/trigger.xml
index b31ab44..0f1a415 100644
--- a/archive/releng.builder/tools/cruise/trigger.xml
+++ b/archive/releng.builder/tools/cruise/trigger.xml
@@ -94,6 +94,7 @@
<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="buildType" value="${buildType}" />
<property name="ftpUser" value="${ftpUser}" />
@@ -111,6 +112,7 @@
<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="buildType" value="${buildType}" />
@@ -129,6 +131,7 @@
<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="buildType" value="${buildType}" />
<property name="ftpUser" value="${ftpUser}" />
@@ -147,6 +150,7 @@
<property name="basews" value="${basews}" />
<property name="basearch" value="${basearch}" />
<property name="build.home" value="${build.home}" />
+ <property name="build.trial" value="${build.trial}" />
@@ -167,6 +171,7 @@
<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="buildType" value="${buildType}" />
<property name="ftpUser" value="${ftpUser}" />
diff --git a/archive/releng.builder/tools/installer/install.properties b/archive/releng.builder/tools/installer/install.properties
index e3547a3..d417400 100644
--- a/archive/releng.builder/tools/installer/install.properties
+++ b/archive/releng.builder/tools/installer/install.properties
@@ -12,15 +12,15 @@
#URL to WTP zip to be downloaded
-wtpURL=http://download.eclipse.org/webtools/downloads/drops/I-I20050711-200507110513/wtp-sdk-I20050711.zip
-wtpFile=wtp-sdk-I20050711.zip
+wtpURL=http://download.eclipse.org/webtools/downloads/drops/S-0.7RC1-200507150303/wtp-sdk-0.7RC1.zip
+wtpFile=wtp-sdk-0.7RC1.zip
#
# There is no need to change these but
# they can be
#
build.current=target
-buildType=I20050711
+buildType=S07RC1
#
# This is the absolute path to the org.eclipse.wtp.releng