re-write for less variables
diff --git a/releng.control/ant.sh b/releng.control/ant.sh
index 550c5ae..6dd6709 100644
--- a/releng.control/ant.sh
+++ b/releng.control/ant.sh
@@ -1,40 +1,18 @@
#!/bin/sh
-# remember to leave no slashes on filename in source command,
-# so that users path is used to find it (first)
+# remember to leave no slashes on commonVariations in source command,
+# so that users path is used to find it (first). But, path on
+# commonComputedVariables means we expect to execute only our
+# version
+
if [ -n $BUILD_INITIALIZED ]
then
- source commonVariations.sh
+ source commonVariations.shsource
+ source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
fi
-export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-
-# 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}
-
-# OS specific support.
-sunjvm=false;
-ibmjvm=false;
-javaversion="`uname -a`"
-
-case "$javaversion" in
- *i686*) sunjvm=true;;
- *ppc*) ibmjvm=true;;
-esac
-
-
-
-buildPaths="-DJ2SE-1.4=${bootclasspath} -DJ2SE-1.5=${bootclasspath_15}"
-
-ANT_OPTS="-Xms128m -Xmx768m $buildPaths"
-if $sunjvm ; then
- ANT_OPTS="-Xms128m -Xmx768m -XX:MaxPermSize=128M -XX:+UseParallelGC $buildPaths"
-fi
ANT_CMD=${ANT_HOME}/bin/ant
-export ANT_OPTS
exec "$ANT_CMD" "$@"
diff --git a/releng.control/cc.sh b/releng.control/cc.sh
index 6ea9485..d7cd1c2 100644
--- a/releng.control/cc.sh
+++ b/releng.control/cc.sh
@@ -4,22 +4,22 @@
# so that users path is used to find it (first)
if [ -n $BUILD_INITIALIZED ]
then
- source commonVariations.sh
+ source commonVariations.shsource
+ source ${BUILD_HOME}/releng.control/commonComputedVariables.shsource
fi
-export LD_LIBRARY_PATH=/opt/gnome/lib:/opt/gnome/lib64
-
-
-# NOTE: we intentionally use Java 5 here to run Cruise Control
-export JAVA_HOME=${JAVA_5_HOME}
-
-
port="7000"
+webport="7777"
+# its ok for these to be trivial, just used to prevent
+# accidental use, no real security needed.
+trivialUserName="wtp"
+trivialPw="ballad"
rm -fr ./workspace
-
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 &
+CCNAME="Webtools builds"
+
+sh $CCDIR/cruisecontrol.sh -configfile $BUILD_HOME/releng.control/cc_config.xml -jmxport $port -webport $webport -user $trivialUserName -password $trivialPw -cchome $CCDIR -ccname $CCNAME 1>out.txt 2>err.txt &
diff --git a/releng.control/cc_config.xml b/releng.control/cc_config.xml
new file mode 100644
index 0000000..901ce54
--- /dev/null
+++ b/releng.control/cc_config.xml
@@ -0,0 +1,464 @@
+<cruisecontrol>
+
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" toupper="true" />
+
+ <!-- Note: can not quite use "standard properites" pattern, as in ant files,
+ since for CC, it is an error if a property file does not exist. -->
+
+ <!-- remember, our logDir must be same as logdir specified in CC's web.xml file -->
+ <property
+ name="logDir"
+ value="${env.LOG_DIR}/${project.name}" />
+
+
+ <property
+ name="time.tenMinutes"
+ value="600" />
+
+ <property
+ name="time.oneHour"
+ value="3600" />
+
+ <property
+ name="time.VeryVeryLongTime"
+ value="31536000" />
+
+ <plugin
+ name="log"
+ dir="${logDir}"
+ encoding="ISO-8859-1" />
+
+ <plugin
+ name="currentbuildstatuslistener"
+ file="${logDir}/buildstatus.html" />
+
+ <plugin
+ name="project"
+ buildafterfailed="true">
+ <dateformat format="yyyyMMdd-HHmm z" />
+ <log
+ dir="${logDir}"
+ encoding="ISO-8859-1" />
+ <schedule interval="${time.VeryVeryLongTime}" />
+ <listeners>
+ <currentbuildstatuslistener />
+ </listeners>
+ <modificationset>
+ <forceonly />
+ </modificationset>
+ <publishers>
+ <email
+ mailhost="localhost"
+ returnaddress="${env.BUILD_BUILDMASTER_EMAIL}"
+ skipusers="false"
+ subjectprefix="[${project.name}]"
+ spamwhilebroken="false"
+ buildresultsurl="${env.BUILD_RESULT_URL}/${project.name}">
+ <always address="${env.BUILD_TOADDRESS}" />
+ </email>
+ </publishers>
+ </plugin>
+
+ <plugin
+ name="cvs"
+ cvsroot="${env.CVS_MAIN_REPO}" />
+
+ <!--
+ Note: projects should normally be named in the form
+ ${build.distribution}-${buildBranch}-${buildType}
+ -->
+
+ <project name="wtp-R1.5-P">
+
+ <schedule>
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ <property
+ name="buildType"
+ value="P" />
+
+ <!-- need to make this build ID a better variable,
+ especially for this 'patch' case -->
+ <property
+ name="buildId"
+ value="B163391" />
+ <property
+ name="buildBranch"
+ value="R1.5" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="R1_5_maintenance_patches" />
+
+ <property
+ name="build.distribution"
+ value="patches" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <!-- ++++++++++++++++ -->
+ <!-- R1.0 MAINTENANCE -->
+ <!-- ++++++++++++++++ -->
+ <project name="wtp-R1.0-M">
+
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.VeryVeryLongTime}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ <!-- this "M" label should be changed to "R" once maintenance release
+ is warming up for its "R"elease.
+ -->
+ <property
+ name="buildType"
+ value="R" />
+ <!-- should comment out pre-spec'd coded buildId, once R-1.0.2 is declared -->
+
+ <property
+ name="buildId"
+ value="1.0.3" />
+ <property
+ name="buildBranch"
+ value="R1.0" />
+
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="R1_0_maintenance" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+ <!-- ++++++++++++++++ -->
+ <!-- R1.5 MAINTENANCE -->
+ <!-- ++++++++++++++++ -->
+ <project name="wtp-R1.5-M">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng" />
+ <cvs
+ tag="R1_0_maintenance"
+ module="releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.oneHour}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ <!-- this "M" label should be changed to "R" once maintenance release
+ is warming up for its "R"elease.
+ -->
+ <property
+ name="buildType"
+ value="M" />
+
+ <property
+ name="buildId"
+ value="1.5.3" />
+ <property
+ name="buildBranch"
+ value="R1.5" />
+
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+
+ <property
+ name="mapVersionTag"
+ value="R1_5_maintenance" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-I">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+ <cvs module="releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.oneHour}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="I" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-N">
+
+ <schedule>
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="N" />
+ <!-- in this context, buildBranch is simply a label -->
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+ <property
+ name="build.trial"
+ value="true" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-S">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+ <cvs module="releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.VeryVeryLongTime}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="S" />
+ <property
+ name="buildId"
+ value="2.0M3" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+
+ </project>
+
+
+ <project name="wtp-thirdparty-R2.0-T">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng-thirdparty" />
+ </modificationset>
+
+ <schedule interval="${time.tenMinutes}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="T" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="buildBranch"
+ value="R2.0" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp-thirdparty" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+ <project name="wtp-R2.0-R">
+ <!-- Defines where cruise looks for changes, to decide whether to run the build -->
+ <modificationset quietperiod="120">
+ <cvs module="releng" />
+ <cvs module="releng-jsf" />
+ <cvs module="releng.dali" />
+ <cvs module="releng.wtpbuilder" />
+ </modificationset>
+
+ <schedule interval="${time.VeryVeryLongTime}">
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="cc_project_build.xml"
+ target="Build"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+ <property
+ name="buildType"
+ value="R" />
+ <property
+ name="buildId"
+ value="2.0" />
+ <property
+ name="buildBranch"
+ value="R2.0" />
+ <property
+ name="checkoutprojectname"
+ value="${project.name}" />
+
+ <property
+ name="mapVersionTag"
+ value="HEAD" />
+ <property
+ name="build.distribution"
+ value="wtp" />
+
+
+ </ant>
+ </schedule>
+
+ </project>
+
+ <project name="wtp-whatisfixed">
+ <schedule>
+ <ant
+ antscript="${env.BUILD_HOME}/releng.control/ant.sh"
+ buildfile="whatisfixed.xml"
+ target="whatisfixed"
+ useQuiet="false"
+ useLogger="false"
+ savelogdir="${logDir}"
+ usedebug="false"
+ antworkingdir="${env.BUILD_HOME}/releng.control">
+
+ </ant>
+ </schedule>
+
+ </project>
+
+
+</cruisecontrol>
+
diff --git a/releng.control/cc_project_build.xml b/releng.control/cc_project_build.xml
new file mode 100644
index 0000000..ab34af4
--- /dev/null
+++ b/releng.control/cc_project_build.xml
@@ -0,0 +1,93 @@
+<project name="cc_project_build" default="Build" basedir=".">
+
+
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
+
+ <!--
+ If not set yet, by "caller", then we set checkoutprojectname here.
+ Normally this is literally the project name from CruiseControl, but
+ if running "standalone", we make this simplifying assumption.
+ -->
+ <property name="checkoutprojectname" value="${build.distribution}-${buildBranch}-${buildType}" />
+
+ <target name="Build">
+
+ <!-- set main builder file name, based on distribution, buildBranch and build type -->
+ <property name="wtpBuilder"
+ value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}/releng.wtpbuilder/build.xml" />
+
+
+
+ <!-- clean previous build -->
+ <antcall target="clean" />
+
+
+
+
+ <!-- check out fresh set of appropriate files -->
+ <!-- this is to make sure maps and builders are correct, but also to
+ make sure the cruisecontrol triggered "diffs" are accurate next
+ time around -->
+ <ant antfile="checkout.xml">
+ <property name="checkoutprojectname" value="${checkoutprojectname}"/>
+
+ </ant>
+
+
+
+ <!-- build and create preliminary download site files -->
+ <ant antfile="${wtpBuilder}" target="build">
+
+ </ant>
+
+ <ant antfile="${wtpBuilder}" target="site" />
+
+ <!-- upload what we have so far -->
+ <ant antfile="${wtpBuilder}" target="upload" />
+
+
+ <!-- test and create test summary files -->
+ <ant antfile="${wtpBuilder}" target="test" />
+
+ <ant antfile="${wtpBuilder}" target="site" />
+ <!-- upload what we have so far -->
+ <ant antfile="${wtpBuilder}" target="upload" />
+
+ </target>
+
+
+
+ <target name="clean" depends="check.clean" if="doClean">
+ <delete dir="${env.BUILD_HOME}/build-${checkoutprojectname}"
+ failonerror="false" />
+ <delete dir="${env.BUILD_HOME}/test-${checkoutprojectname}"
+ failonerror="false" />
+ </target>
+
+
+ <target name="check.clean">
+ <condition property="doClean">
+ <equals arg1="${build.clean}" arg2="true" />
+ </condition>
+ </target>
+
+
+</project>
diff --git a/releng.control/checkout-dw.properties b/releng.control/checkout-dw.properties
deleted file mode 100644
index 731fc09..0000000
--- a/releng.control/checkout-dw.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# some constants controling some common check out tasks
-
-
-# its handy to set this value to false, when
-# doing local builds to test new versions of wtpbuilder
-# so that your local edits are not over written each time
-# normally always 'true' for "production" builds
-checkout.wtpbuilder.clean=false
-
-
-# handy constant to avoid hard coding
-mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
-
-
-
-# these are some not currently important constants to avoid hard coding,
-# and allowing easier expansion in future
-releng=releng
-releng.wtpbuilder=releng.wtpbuilder
-wst=wst
-jst=jst
-
diff --git a/releng.control/checkout.properties b/releng.control/checkout.properties
deleted file mode 100644
index 2c30c54..0000000
--- a/releng.control/checkout.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-# some constants controling some common check out tasks
-
-
-# its handy to set this value to false, when
-# doing local builds to test new versions of wtpbuilder
-# so that your local edits are not over written each time
-# normally always 'true' for "production" builds
-checkout.wtpbuilder.clean=true
-
-
-# handy constant to avoid hard coding
-mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
-
-
-
-# these are some not currently important constants to avoid hard coding,
-# and allowing easier expansion in future
-releng=releng
-releng.wtpbuilder=releng.wtpbuilder
-wst=wst
-jst=jst
-
diff --git a/releng.control/checkout.xml b/releng.control/checkout.xml
index 9705f3e..bf1f296 100644
--- a/releng.control/checkout.xml
+++ b/releng.control/checkout.xml
@@ -1,81 +1,151 @@
-<project default="all">
+<project name="checkout" default="checkout" basedir=".">
- <!-- requires following to be passed in
- buildType
- build.home (env.BUILD_HOME)
- codir
- mapVersionTag
- -->
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
- <property file="checkout.properties" />
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
+
+ <property name="codir"
+ value="${env.BUILD_HOME}/build-node/checkout/${checkoutprojectname}" />
- <target name="all">
- <antcall target="${buildType}" />
- </target>
+ <echo message="checkoutprojectname: ${checkoutprojectname}" />
+ <target name="checkout" if="${checkoutprojectname}">
+ <!-- we always check and init the builder -->
+ <antcall target="getwtpbuilder" />
+ <!-- and projects can do more if needed. -->
+ <antcall target="${checkoutprojectname}" />
+ </target>
- <target name="N">
+ <target name="wtp-R2.0-N">
- <antcall target="initBuilders"/>
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
- <antcall target="getwtpbuilder" />
+ <!--
+ do not need, since we do nightly builds "on demand" only
+ <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${wst}" dest="${codir}" />
+ <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${jst}" dest="${codir}" />
+ -->
- </target>
+ </target>
- <target name="S">
- <antcall target="initBuilders"/>
- <antcall target="getwtpbuilder" />
- </target>
+ <target name="wtp-R2.0-S">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng-jsf"
+ dest="${codir}"
+ tag="HEAD" />
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng.dali"
+ dest="${codir}"
+ tag="HEAD" />
+ </target>
- <target name="I">
- <antcall target="initBuilders"/>
- <antcall target="getwtpbuilder" />
- </target>
+ <target name="wtp-R2.0-I">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng-jsf"
+ dest="${codir}"
+ tag="HEAD" />
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng.dali"
+ dest="${codir}"
+ tag="HEAD" />
+ </target>
- <target name="M">
- <antcall target="initBuilders"/>
- <antcall target="getwtpbuilder" />
- </target>
-
- <target name="P">
- <antcall target="initBuilders"/>
- <antcall target="getwtpbuilder" />
- </target>
- <target name="R">
- <antcall target="initBuilders"/>
- <antcall target="getwtpbuilder" />
- </target>
-
-
+ <target name="wtp-R2.0-R">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng-jsf"
+ dest="${codir}"
+ tag="HEAD" />
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng.dali"
+ dest="${codir}"
+ tag="HEAD" />
+ </target>
+
+ <target name="wtp-R1.5-M">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="${releng}"
+ dest="${codir}"
+ tag="R1_5_maintenance" />
+ </target>
+
+ <target name="wtp-patches-P">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="${releng}"
+ dest="${codir}"
+ tag="R1_5_maintenance_patches" />
+ </target>
+
+ <target name="wtp-thirdparty-R2.0-T">
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="releng-thirdparty"
+ dest="${codir}"
+ tag="HEAD" />
+ </target>
- <target name="getwtpbuilder" depends="check.clean" if="doClean">
- <property file="${codir}/releng/maps/build.cfg" />
- <delete dir="${codir}/releng.wtpbuilder" failonerror="false" />
- <echo message="Version tag for ${releng.wtpbuilder} is: ${wtpBuilderVersion}" />
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng.wtpbuilder}" dest="${codir}" tag="${wtpBuilderVersion}" />
-
- </target>
- <target name="check.clean">
- <condition property="doClean">
- <equals arg1="${checkout.wtpbuilder.clean}" arg2="true" />
- </condition>
- </target>
+ <!--
+ The order of execution of these three worker targets
+ is critical, check.clean, initBuilders, and
+ then getwtpbuilder.
+ -->
+ <target name="getwtpbuilder"
+ depends="check.clean,initBuilders"
+ if="doClean">
+ <!-- This is a special property file, that contains (only) the
+ value of wtpBuilderVersion. Then, that version of the builder
+ is fetched to control the rest of the build -->
+ <property file="${codir}/${releng}/maps/build.cfg" />
+ <delete dir="${codir}/releng.wtpbuilder"
+ failonerror="false" />
+ <echo message="Version tag for ${releng.builder} is: ${wtpBuilderVersion}" />
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="${releng.builder}"
+ dest="${codir}"
+ tag="${wtpBuilderVersion}" />
+ </target>
- <target name="initBuilders">
- <echo message="Version tag for ${releng}: ${mapVersionTag}" />
- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng}" dest="${codir}" tag="${mapVersionTag}" />
+ <target name="check.clean">
+ <condition property="doClean">
+ <equals arg1="${checkout.wtpbuilder.clean}"
+ arg2="true" />
+ </condition>
+ </target>
-<!-- <delete dir="${codir}/releng.control/workspace" failonerror="false" /> -->
- <!-- issue, we should probably not always use 'head' ... perhaps eliminate altogether
- and just check out when ever server is (re) started? -->
-<!-- <cvs quiet="true" cvsRoot="${mapCvsRoot}" package="${releng.control}" dest="${codir}" tag="HEAD" />
--->
- </target>
+ <target name="initBuilders" if="doClean">
+ <echo message="Version tag for ${releng}: ${mapVersionTag}" />
+ <cvs quiet="true"
+ cvsRoot="${mapCvsRoot}"
+ package="${releng}"
+ dest="${codir}"
+ tag="${mapVersionTag}" />
+ </target>
</project>
diff --git a/releng.control/committer-dw.properties b/releng.control/committer-dw.properties
deleted file mode 100644
index 73863b1..0000000
--- a/releng.control/committer-dw.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-mapVersionTag=HEAD
-buildType=I
-buildBranch=R2.0
-build.distribution=wtp
-
-cvsUser=david_williams
-# ext typically requires CVS_RSH=ssh
-cvsProtocol=ext
-
-build.trial=false
-build.drivers=downloads
-
-baseos=linux
-basews=gtk
-basearch=x86
-
-build.clean=true
-build.pack-all-in-one=false
-
diff --git a/releng.control/committer.properties b/releng.control/committer.properties
deleted file mode 100644
index c5a0c72..0000000
--- a/releng.control/committer.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-mapVersionTag=HEAD
-buildType=I
-buildBranch=R2.0
-build.distribution=wtp
-
-cvsUser=david_williams
-# ext typically requires CVS_RSH=ssh
-cvsProtocol=ext
-
-build.trial=false
-build.drivers=downloads
-
-baseos=linux
-basews=gtk
-basearch=ppc
-
-build.clean=true
-build.pack-all-in-one=false
diff --git a/releng.control/committer.xml b/releng.control/committer.xml
deleted file mode 100644
index e729ff5..0000000
--- a/releng.control/committer.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<project default="Build" basedir=".">
-
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
-
- <property file="committer.properties" />
-
- <target name="Build">
-
- <!-- set main builder file name, based on distribution and build type -->
- <property name="wtpBuilder"
- value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml" />
-
-
-
- <!-- clean previous build -->
- <antcall target="clean" />
-
-
-
-
- <!-- check out fresh set of appropriate files -->
- <!-- this is to make sure maps and builders are correct, but also to
- make sure the cruisecontrol triggered "diffs" are accurate next
- time around -->
- <ant antfile="checkout.xml"
- target="all"
- dir="."
- inheritall="false">
- <property name="codir"
- value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
- <property name="buildType"
- value="${buildType}" />
- <property name="buildBranch"
- value="${buildBranch}" />
- <property name="mapVersionTag"
- value="${mapVersionTag}" />
- </ant>
-
-
-
- <!-- build and create preliminary download site files -->
- <ant antfile="${wtpBuilder}" target="build">
- <property name="baseos" value="${baseos}" />
- <property name="basews" value="${basews}" />
- <property name="basearch" value="${basearch}" />
- </ant>
-
- <ant antfile="${wtpBuilder}" target="site" />
- <!-- upload what we have so far -->
- <ant antfile="${wtpBuilder}" target="upload">
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/upload.properties" />
- </ant>
-
-
- <!-- test and create test summary files -->
- <ant antfile="${wtpBuilder}" target="test" />
- <ant antfile="${wtpBuilder}" target="site" />
- <!-- upload what we have so far -->
- <ant antfile="${wtpBuilder}" target="upload">
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/upload.properties" />
- </ant>
-
- </target>
-
-
-
- <target name="clean" depends="check.clean" if="doClean">
- <delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}"
- failonerror="false" />
- <delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}"
- failonerror="false" />
- </target>
-
-
- <target name="check.clean">
- <condition property="doClean">
- <equals arg1="${build.clean}" arg2="true" />
- </condition>
- </target>
-
-
-</project>
diff --git a/releng.control/commonComputedVariables.shsource b/releng.control/commonComputedVariables.shsource
new file mode 100644
index 0000000..4fd3912
--- /dev/null
+++ b/releng.control/commonComputedVariables.shsource
@@ -0,0 +1,99 @@
+#!/bin/sh
+
+# intentionally named "shsource" to denote this is intended to
+# be included in other sh files, with "source" command, not
+# executed on its own.
+
+########################################################
+
+export PROJECT_HOME=`dirname "$0"`
+
+export ANT_HOME=${BUILD_HOME}/apps/${ANT_DIR}
+
+export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
+export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
+
+export PATH=${PATH}:${HOME}/bin:${ANT_HOME}/bin:${JAVA_HOME}/bin
+
+# project name is resolved dynamically, as CC runs
+export LOG_DIR=${BUILD_HOME}/cruise-project-logs
+
+# need for some PPC or Linux issues?
+export JAVA_HIGH_ZIPFDS=500
+
+# for now, always use Java 5 as native "home", but
+# scripts and paths may still use java 1.4
+export JAVA_HOME=${JAVA_5_HOME}
+
+# values of the bootclasspath attribute used in ant javac calls.
+# the names of these jars are VM vendor specific. the first set
+# below, commented out, are typical for sun VM's. The
+# second set are for IBM's VM's ... which is what we use
+# on the PPC machine, so we'll leave that as the defaults
+# in this file.
+
+
+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"
+
+
+# OS specific support.
+sunjvm=false;
+ibmjvm=false;
+javaversion="`uname -a`"
+
+case "$javaversion" in
+ *i686*) sunjvm=true;;
+ *ppc*) ibmjvm=true;;
+esac
+
+# set initial values as if for IBM's PPC VM
+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_OPTS="-Xms128m -Xmx512m"
+
+# and change them if Sun's VM is being used
+if $sunjvm ; then
+ export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
+ export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar"
+ export ANT_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=128M -XX:+UseParallelGC"
+fi
+
+
+export CVS_RSH=ssh
+export CVS_MAIN_REPO=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+export J2SE14=${bootclasspath}
+export J2SE15=${bootclasspath_15}
+
+
+# Set this to the relative path for the
+# directory that keeps the downloaded drivers
+# and pre-reqs
+export LOCAL_PREREQS_CACHE=${BUILD_HOME}/downloads
+
+
+export BUILD_INITIALIZED="true"
+
+echo " "
+echo " Project Home: ${PROJECT_HOME}"
+echo " Build Home: ${BUILD_HOME}"
+echo " DISPLAY: ${DISPLAY}"
+echo " "
+echo " JAVA_4_HOME: ${JAVA_4_HOME}"
+echo " ${bootclasspath}"
+echo " "
+echo " JAVA_5_HOME: ${JAVA_5_HOME}"
+echo " ${bootclasspath_15}"
+echo " "
+echo " ANT_HOME: ${ANT_HOME}"
+echo " "
+echo " PATH: ${PATH}"
+echo " "
+echo " BASEOS: ${BASEOS}"
+echo " BASEWS: ${BASEWS}"
+echo " BASEARCH: ${BASEARCH}"
+echo " "
+echo " LOCAL_BUILD_PROPERTIES_DIR: ${LOCAL_BUILD_PROPERTIES_DIR}"
+echo " STANDARD_PROPERTIES_DIR: ${STANDARD_PROPERTIES_DIR}"
+echo " "
diff --git a/releng.control/commonVariations.sh b/releng.control/commonVariations.sh
deleted file mode 100644
index 9e27703..0000000
--- a/releng.control/commonVariations.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# Note: if "local" users have this file on their path, then
-# the bash "include source" function will find that path version
-# first, instead of this "standard" eclipse ppc one.
-
-export BUILD_HOME=/shared/webtools
-
-export DISPLAY=127.0.0.1:1.0
-
-JAVA_4_DIR="IBMJava2-ppc-142"
-JAVA_5_DIR="ibm-java2-ppc-50"
-
-export ANT_HOME=${BUILD_HOME}/apps/apache-ant-1.6.5
-
-########################################################
-
-export PROJECT_HOME=`dirname "$0"`
-
-export JAVA_4_HOME=${BUILD_HOME}/apps/${JAVA_4_DIR}
-export JAVA_5_HOME=${BUILD_HOME}/apps/${JAVA_5_DIR}
-
-# values of the bootclasspath attribute used in ant javac calls.
-# the names of these jars are VM vendor specific. the first set
-# below, commented out, are typical for sun VM's. The
-# second set are for IBM's VM's ... which is what we use
-# on the PPC machine, so we'll leave that as the defaults
-# in this file.
-
-#export bootclasspath="${JAVA_4_HOME}/jre/lib/rt.jar:${JAVA_4_HOME}/jre/lib/jsse.jar"
-#export bootclasspath_15="${JAVA_5_HOME}/jre/lib/rt.jar"
-
-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 PATH=$PATH:$HOME/bin:$ANT_HOME/bin:$JAVA_HOME/bin
-
-export JAVA_HIGH_ZIPFDS=500
-
-export BUILD_INITIALIZED="true"
-
-echo " "
-echo " Project Home: ${PROJECT_HOME}"
-echo " Build Home: ${BUILD_HOME}"
-echo " DISPLAY: ${DISPLAY}"
-echo " "
-echo " JAVA_4_HOME: ${JAVA_4_HOME}"
-echo " ${bootclasspath}"
-echo " "
-echo " JAVA_5_HOME: ${JAVA_5_HOME}"
-echo " ${bootclasspath_15}"
-echo " "
-echo " ANT_HOME: ${ANT_HOME}"
-echo " "
-echo " PATH: ${PATH}"
-echo " "
diff --git a/releng.control/commonVariations.shsource b/releng.control/commonVariations.shsource
new file mode 100644
index 0000000..d6603c7
--- /dev/null
+++ b/releng.control/commonVariations.shsource
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Note: if "local" users have this file first in their path, then
+# the bash shell's "include source" function will find that paths version
+# first, instead of this "standard" eclipse ppc one.
+
+# this file is intentionally named "shsource" to denote this is intended to
+# be included in other sh files, with "source" command, not
+# executed on its own.
+
+
+export BUILD_HOME=/shared/webtools
+
+export DISPLAY=127.0.0.1:1.0
+
+export JAVA_4_DIR="IBMJava2-ppc-142"
+export JAVA_5_DIR="ibm-java2-ppc-50"
+export ANT_DIR="apache-ant-1.6.5"
+
+export BASEOS=linux
+export BASEWS=gtk
+export BASEARCH=ppc
+
+# no local build properties, for production builds
+export LOCAL_BUILD_PROPERTIES_DIR=
+
+export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
+
+export BUILD_BUILDMASTER_EMAIL=wtpBuild@eclipse.org
+export BUILD_RESULT_URL/cruisecontrol/buildresults=http://build.eclipse.org:7777/cruisecontrol/buildresults
+export BUILD_TOADDRESS=david_williams@us.ibm.com
+
diff --git a/releng.control/config.xml b/releng.control/config.xml
deleted file mode 100644
index 82e70ba..0000000
--- a/releng.control/config.xml
+++ /dev/null
@@ -1,702 +0,0 @@
-<cruisecontrol>
-
- <property file="cruise.properties" />
-
- <!-- note: cc allows to force upper case, but ant does not -->
- <property
- environment="env"
- toupper="true" />
-
- <property
- name="logDir"
- value="${env.BUILD_HOME}/cruise-project-logs/${project.name}" />
-
- <property
- name="time.tenMinutes"
- value="600" />
-
- <property
- name="time.oneHour"
- value="3600" />
-
- <property
- name="time.OnRequestOnly"
- value="31536000" />
-
- <plugin
- name="log"
- dir="${logDir}" />
- <plugin
- name="currentbuildstatuslistener"
- file="${logDir}/buildstatus.html" />
-
- <project
- name="wtp-R1.5-P"
- buildafterfailed="true">
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <log
- dir="${logDir}"
- encoding="ISO-8859-1" />
- <modificationset>
- <forceonly />
- </modificationset>
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
-
- <property
- name="buildType"
- value="P" />
-
- <!-- need to make this build ID a better variable,
- especially for this 'patch' case -->
- <property
- name="buildId"
- value="B163391" />
- <property
- name="buildBranch"
- value="R1.5" />
-
-
-
- <property
- name="mapVersionTag"
- value="R1_5_maintenance_patches" />
-
- <property
- name="build.component"
- value="wtp-patches" />
-
- <property
- name="build.distribution"
- value="patches" />
-
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
-
- <property
- name="sub-home"
- value="patches" />
-
- </ant>
- </schedule>
-
-
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R1.5-P-Bbuild]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.5-P">
- </email>
- </publishers>
- </project>
-
-
- <!-- ++++++++++++++++ -->
- <!-- R1.0 MAINTENANCE -->
- <!-- ++++++++++++++++ -->
- <project
- name="wtp-R1.0-M"
- buildafterfailed="true">
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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_0_maintenance"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng" />
- <cvs
- tag="R1_0_maintenance"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.0-M/releng.wtpbuilder" />
- </modificationset>
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
-
- <!-- this "M" label should be changed to "R" once maintenance release
- is warming up for its "R"elease.
- -->
- <property
- name="buildType"
- value="R" />
- <!-- should comment out pre-spec'd coded buildId, once R-1.0.2 is declared -->
-
- <property
- name="buildId"
- value="1.0.3" />
- <property
- name="buildBranch"
- value="R1.0" />
-
-
-
- <property
- name="mapVersionTag"
- value="R1_0_maintenance" />
- <property
- name="build.component"
- value="wtp" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
-
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R1.0-M-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.0-M">
- </email>
- </publishers>
- </project>
-
- <!-- ++++++++++++++++ -->
- <!-- R1.5 MAINTENANCE -->
- <!-- ++++++++++++++++ -->
- <project
- name="wtp-R1.5-M"
- buildafterfailed="true">
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng" />
- <cvs
- tag="R1_5_maintenance"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R1.5-M/releng.wtpbuilder" />
- </modificationset>
-
- <schedule interval="${time.oneHour}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
-
- <!-- this "M" label should be changed to "R" once maintenance release
- is warming up for its "R"elease.
- -->
- <property
- name="buildType"
- value="M" />
-
- <property
- name="buildId"
- value="1.5.3" />
- <property
- name="buildBranch"
- value="R1.5" />
-
-
-
- <property
- name="mapVersionTag"
- value="R1_5_maintenance" />
- <property
- name="build.component"
- value="wtp" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
-
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
-
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R1.5-M-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R1.5-M">
- </email>
- </publishers>
- </project>
-
-
- <project
- name="wtp-R2.0-I"
- buildafterfailed="true">
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.wtpbuilder" />
- </modificationset>
-
- <schedule interval="${time.oneHour}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="I" />
- <property
- name="buildBranch"
- value="R2.0" />
-
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R2.0-I-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-I">
- </email>
- </publishers>
- </project>
-
-
- <project
- name="wtp-R2.0-N"
- buildafterfailed="true">
-
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <log
- dir="${logDir}"
- encoding="ISO-8859-1" />
-
- <!-- Defines where cruise looks for changes, to decide whether to run the build -->
- <modificationset quietperiod="120">
- <forceonly />
- </modificationset>
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="N" />
- <!-- in this context, buildBranch is simply a label -->
- <property
- name="buildBranch"
- value="R2.0" />
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp" />
- <property
- name="build.trial"
- value="true" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
-
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="true"
- subjectprefix="[wtp-R2.0-N-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-N">
- </email>
- </publishers>
- </project>
-
-
- <project
- name="wtp-R2.0-S"
- buildafterfailed="true">
-
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
-
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
- </modificationset>
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="S" />
- <property
- name="buildId"
- value="2.0M3" />
- <property
- name="buildBranch"
- value="R2.0" />
-
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R2.0-S-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-S">
- </email>
- </publishers>
- </project>
-
-
- <project
- name="wtp-thirdparty"
- buildafterfailed="true">
-
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng-thirdparty" />
- <!-- usually no need to rebuild third party, if builder changes, since the
- third party build is more of a copy -->
- <!--
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-S/releng.wtpbuilder" />
- -->
- </modificationset>
-
- <schedule interval="${time.tenMinutes}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="S" />
- <property
- name="buildId"
- value="2.0thirdparty" />
- <property
- name="buildBranch"
- value="R2.0" />
-
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp-thirdparty" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R2.0-S-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R2.0-S">
- </email>
- </publishers>
- </project>
-
-
- <project
- name="wtp-R2.0-R"
- buildafterfailed="true">
-
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <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="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng-jsf" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-I/releng.dali" />
- <cvs
- tag="HEAD"
- localworkingcopy="${env.BUILD_HOME}/build-node/checkout/wtp-R2.0-R/releng.wtpbuilder" />
- </modificationset>
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="committer.xml"
- target="Build"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
- <property
- name="buildType"
- value="R" />
- <property
- name="buildId"
- value="2.0" />
- <property
- name="buildBranch"
- value="R2.0" />
-
- <property
- name="mapVersionTag"
- value="HEAD" />
- <property
- name="build.distribution"
- value="wtp" />
- <property
- name="build.home"
- value="${env.BUILD_HOME}" />
- <property
- name="sub-home"
- value="committers" />
-
- </ant>
- </schedule>
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="false"
- subjectprefix="[wtp-R2.0-R-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-R">
- </email>
- </publishers>
- </project>
-
- <project
- name="wtp-whatisfixed"
- buildafterfailed="true">
-
- <dateformat format="yyyyMMdd-HHmm z" />
- <listeners>
- <currentbuildstatuslistener />
- </listeners>
- <log
- dir="${logDir}"
- encoding="ISO-8859-1" />
-
-
- <schedule interval="${time.OnRequestOnly}">
- <ant
- antscript="${env.BUILD_HOME}/releng.control/ant.sh"
- buildfile="whatisfixed.xml"
- target="whatisfixed"
- useQuiet="false"
- useLogger="false"
- savelogdir="${logDir}"
- usedebug="false"
- antworkingdir="${env.BUILD_HOME}/releng.control">
-
- </ant>
- </schedule>
-
-
-
-
- <!-- Publishers are run *after* a build completes -->
- <publishers>
- <email
- mailhost="localhost"
- returnaddress="${build.buildmaster.email}"
- skipusers="true"
- subjectprefix="[wtp-whatisfixed-build]"
- spamwhilebroken="false"
- buildresultsurl="${build.result.url}/cruisecontrol/buildresults/wtp-whatisfixed">
- </email>
- </publishers>
- </project>
-
-
-</cruisecontrol>
-
diff --git a/releng.control/cruise-dw.properties b/releng.control/cruise-dw.properties
deleted file mode 100644
index fceeee2..0000000
--- a/releng.control/cruise-dw.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://localhost:7777
-build.buildmaster.email=david_williams@eclipse.org
-build.toaddress=david_williams@mindspring.com
-logdir=${env.BUILD_HOME}/cruise-project-logs
-
diff --git a/releng.control/cruise-eclipse.properties b/releng.control/cruise-eclipse.properties
deleted file mode 100644
index acaa1d9..0000000
--- a/releng.control/cruise-eclipse.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://build.eclipse.org:7777
-build.buildmaster.email=wtpBuild@eclipse.org
-build.toaddress=wtp-releng@eclipse.org
diff --git a/releng.control/cruise-lomboz.properties b/releng.control/cruise-lomboz.properties
deleted file mode 100644
index b2d7848..0000000
--- a/releng.control/cruise-lomboz.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# values for the x86 lomboz server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://buildserver.lomboz.org:8080
-build.buildmaster.email=buildmaster@lomboz.org
\ No newline at end of file
diff --git a/releng.control/cruise.properties b/releng.control/cruise.properties
deleted file mode 100644
index ffddf21..0000000
--- a/releng.control/cruise.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# values for the ppc eclipse.org server
-# should be renamed cruise.properties when deployed
-
-
-build.result.url=http://build.eclipse.org:7777
-build.buildmaster.email=wtpBuild@eclipse.org
-build.toaddress=wtp-releng@eclipse.org
-logdir=${env.BUILD_HOME}/cruise-project-logs
\ No newline at end of file
diff --git a/releng.control/drivers.xml b/releng.control/drivers.xml
deleted file mode 100644
index 2677d3c..0000000
--- a/releng.control/drivers.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project default="all">
- <property file="trigger.properties" />
- <property file="../maps/build.cfg" />
-
- <target name="all">
- <antcall target="getDrivers" />
- <copy todir="${env.BUILD_HOME}/${localDrivers}" overwrite="true">
- <fileset dir="${env.BUILD_HOME}/${build.drivers}" >
- <include name="**/GEF*.*"/>
- <include name="**/emf*.*"/>
- <include name="**/JEM*.*"/>
- </fileset>
- </copy>
-
- <echo message="RSYNC TO: ${ftpUser}@${ftpServer}:${remoteDrivers}" />
- <exec executable="rsync">
- <arg line="-e ssh -Cavz ${env.BUILD_HOME}/${localDrivers} ${ftpUser}@${ftpServer}:${remoteDrivers}" />
- </exec>
-
- </target>
-
- <target name="getDrivers">
- <available file="${env.BUILD_HOME}/${build.drivers}/${emfFile}" property="emf.exists" />
- <available file="${env.BUILD_HOME}/${build.drivers}/${gefFile}" property="gef.exists" />
- <available file="${env.BUILD_HOME}/${build.drivers}/${jemFile}" property="jem.exists" />
- <antcall target="getEmf" />
- <antcall target="getGef" />
- <antcall target="getJem" />
- </target>
- <target name="getEmf" unless="emf.exists">
- <get src="${emfURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${emfFile}" />
- </target>
- <target name="getGef" unless="gef.exists">
- <get src="${gefURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${gefFile}" />
- </target>
- <target name="getJem" unless="jem.exists">
- <get src="${jemURL.primary}" dest="${env.BUILD_HOME}/${build.drivers}/${jemFile}" />
- </target>
-
-</project>
diff --git a/releng.control/getFromCVS-relengControl.sh b/releng.control/getFromCVS-relengControl.sh
index 34473a0..ad6cef7 100644
--- a/releng.control/getFromCVS-relengControl.sh
+++ b/releng.control/getFromCVS-relengControl.sh
@@ -1,6 +1,10 @@
+#!/bin/sh
-# This bat file is to help get builds started "fresh".
-# The -f means do not use ~/.cvsrc file -- this is just to ensure no "hidden options"
+# This script file is to help get builds started "fresh", when
+# the releng.control directory already exists on local file system.
+# While it is in the cvs repository in releng.control, it is
+# meant to be executed from the parent directory
+# of releng.control on the file system.
# export is used, instead of checkout, just to avoid the CVS directories and since this code
# for a local build, there should never be a need to check it back in to CVS.
@@ -11,11 +15,12 @@
rm -fr releng.control
-cvs -f -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r HEAD releng.control
+cvs -d :pserver:anonymous@dev.eclipse.org:/cvsroot/webtools export -r HEAD releng.control
restore serialized state
mv *.ser releng.control
-dos2unix releng.control/*.sh
+# make sure releng.control files are executable and in proper format
+dos2unix releng.control/*.sh* releng.control/*.properties releng.control/*.xml
chmod +x releng.control/*.sh
diff --git a/releng.control/justtest.xml b/releng.control/justtest.xml
deleted file mode 100644
index 1692ed8..0000000
--- a/releng.control/justtest.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<project default="Build">
-
-
- <property file="committer.properties" />
-
- <property environment="env" />
-
-
- <target name="Build">
-
- <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
- <ant antfile="checkout.xml" target="all" dir="." inheritall="false">
- <property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
- <property name="buildType" value="${buildType}" />
- <property name="mapVersionTag" value="${mapVersionTag}" />
- </ant>
-
- <ant antfile="${wtpBuilder}" target="site" />
- <ant antfile="${wtpBuilder}" target="upload" />
- <ant antfile="${wtpBuilder}" target="test" />
- <ant antfile="${wtpBuilder}" target="site" />
- <ant antfile="${wtpBuilder}" target="upload" />
- </target>
-
- <target name="JustBuild">
-
- <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
- <ant antfile="${wtpBuilder}" target="build" />
- </target>
-
-
-
- <target name="clean" if="build.clean">
- <delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
- <delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
- </target>
-
-
-</project>
diff --git a/releng.control/localBuildExample/buildutilities.properties b/releng.control/localBuildExample/buildutilities.properties
new file mode 100644
index 0000000..d26fc1c
--- /dev/null
+++ b/releng.control/localBuildExample/buildutilities.properties
@@ -0,0 +1,2 @@
+
+#noralizeJarFiles=true
diff --git a/releng.control/localBuildExample/cc_project_build.properties b/releng.control/localBuildExample/cc_project_build.properties
new file mode 100644
index 0000000..c1bc73d
--- /dev/null
+++ b/releng.control/localBuildExample/cc_project_build.properties
@@ -0,0 +1,35 @@
+# committer.properties
+
+# mapVersionTag=HEAD
+buildType=N
+# buildBranch=R2.0
+# build.distribution=wtp
+
+
+# build.trial is always false for production
+# builds.
+build.trial=true
+
+# these cvs values need to be "real" if
+# build.trial is false. This is the ID used
+# to tag releng map files per build.
+# cvsUser=david_williams
+# 'ext' protocol typically requires
+# environment variable CVS_RSH to be set to ssh
+# that is, CVS_RSH=ssh
+# cvsProtocol=ext
+
+
+
+
+# This controls whether java files are re-fetched
+# clean according to releng tags, or simply the
+# local versions used. Note: this only works if
+# its "gone though" a build already, where some
+# infrastructure files (e.g. "fetch") have already
+# been created.
+# build.clean=true
+
+
+# build.pack-all-in-one=false
+
diff --git a/releng.control/localBuildExample/checkout.properties b/releng.control/localBuildExample/checkout.properties
new file mode 100644
index 0000000..1ed43e7
--- /dev/null
+++ b/releng.control/localBuildExample/checkout.properties
@@ -0,0 +1,28 @@
+# checkout.propererties
+
+# Its handy to set this value to false,
+# to test new versions of releng.wtpbuilder
+# If set to false, local edits to wtpbuilder files
+# are not over written each time a
+# build starts.
+# Normally always 'true' for "production" builds,
+# in which case the version of releng.wtpbuilder
+# specificed in releng/build.cfg is used for the build.
+
+# checkout.wtpbuilder.clean=true
+
+
+
+# Following are just handy constants, too avoid
+# hard coding in the scripts, but they are not often used
+
+# mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+
+# these are some not currently important constants to avoid hard coding,
+# and allowing easier expansion in future
+# releng=releng
+# releng.wtpbuilder=releng.wtpbuilder
+# wst=wst
+# jst=jst
+
diff --git a/releng.control/localBuildExample/description.txt b/releng.control/localBuildExample/description.txt
new file mode 100644
index 0000000..126b475
--- /dev/null
+++ b/releng.control/localBuildExample/description.txt
@@ -0,0 +1,11 @@
+
+The files in this directory are not used
+in production builds.
+
+The are given here as examples of how someone might
+override various build properties on their own machine,
+to do "local builds".
+
+These files, if used, should be in the directory named in
+the LOCAL_BUILD_PROPERTIES_DIR environment variable, which
+is set in the "commonVariations" file.
diff --git a/releng.control/localBuildExample/upload.properties b/releng.control/localBuildExample/upload.properties
new file mode 100644
index 0000000..bf1fc81
--- /dev/null
+++ b/releng.control/localBuildExample/upload.properties
@@ -0,0 +1,22 @@
+# upload.properties
+
+# These are some properties needed to upload builds from the build machine to the download machine.
+# The actual task that does that is in wtp.upload in releng.wtpBuidler.
+# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
+
+
+# Use care with "true" unless you really
+# have a place for the builds to go. You
+# would not want them to accidently go to eclipse.org
+build.upload=false
+
+# uploadUser=davidw
+# uploadPassword="This is not really used since ssh login is assumed (required)"
+# uploadServer=localhost
+# uploadRemoteDirectory=/usr/local/apache2/htdocs/webtools/${site-sub-dir}/drops/${buildBranch}
+
+# rsyncRootPrefix should be empty for Linux machines.
+# But, Windows using cygwin will needs something like /cygdrive/G/
+# for what ever drive or directory is parent of build home
+# rsyncRootPrefix=
+
diff --git a/releng.control/restart.sh b/releng.control/restart.sh
index 3867874..28492c1 100644
--- a/releng.control/restart.sh
+++ b/releng.control/restart.sh
@@ -12,6 +12,6 @@
# error conditions, they will start, but then shutdown a few seconds later
sleep 10s
echo "current java processes"
-ps -u wtpBuild -f -w -w | grep java
+ps x ww | grep java
diff --git a/releng.control/restoreStateSnapshot.sh b/releng.control/restoreStateSnapshot.sh
new file mode 100644
index 0000000..ad4c56e
--- /dev/null
+++ b/releng.control/restoreStateSnapshot.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# This file is to "copy up" the state saved in cvs,
+# in stateSnapshot directory. Since the snapshot is
+# only taken occasionally, the best procedure is to
+# save the state locally and restore each time releng.control
+# is deleted and restored ... but, in case that is not
+# possible, this this the second best alternative.
+# If the state files do not exists at all, cruise control
+# will lose track of their status and state and attempt to
+# build every project.
+
+mv stateSnapshot/*.ser .
+
diff --git a/releng.control/somePathDirectory/commonVariations.shsource b/releng.control/somePathDirectory/commonVariations.shsource
new file mode 100644
index 0000000..d07e045
--- /dev/null
+++ b/releng.control/somePathDirectory/commonVariations.shsource
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# This particular file is not used in production builds,
+# though there is a similar one (with same name) in main
+# directory that is.
+
+# If "local" users have this file on their path,
+# that is, in "someDirectory" on the users local path,
+# then the bash "include source" function will find that version
+# first, instead of the "standard" eclipse ppc one.
+
+export BUILD_HOME=/home/shared/webtools
+
+#export DISPLAY=127.0.0.1:1.
+
+JAVA_4_DIR="j2sdk1.4.2_11"
+JAVA_5_DIR="jdk1.5.0_09"
+ANT_DIR="apache-ant-1.7.0RC1"
+
+export BASEOS=linux
+export BASEWS=gtk
+export BASEARCH=x86
+
+
+export LOCAL_BUILD_PROPERTIES_DIR=${BUILD_HOME}/localBuildProperties
+
+# technically should not be needed for "local builds" ... but ... just in case.
+export STANDARD_PROPERTIES_DIR=${BUILD_HOME}/releng.control/standardMachineProperties
+
+export BUILD_BUILDMASTER_EMAIL=davidw@davidw.com
+export BUILD_RESULT_URL=http://davidw.com:7777/cruisecontrol/buildresults
+export BUILD_TOADDRESS=david_williams@us.ibm.com
+
diff --git a/releng.control/standardMachineProperties/buildutilities.properties b/releng.control/standardMachineProperties/buildutilities.properties
new file mode 100644
index 0000000..304ba4f
--- /dev/null
+++ b/releng.control/standardMachineProperties/buildutilities.properties
@@ -0,0 +1,2 @@
+
+noralizeJarFiles=true
diff --git a/releng.control/standardMachineProperties/cc_project_build.properties b/releng.control/standardMachineProperties/cc_project_build.properties
new file mode 100644
index 0000000..0308667
--- /dev/null
+++ b/releng.control/standardMachineProperties/cc_project_build.properties
@@ -0,0 +1,37 @@
+# committer.properties
+
+mapVersionTag=HEAD
+buildType=I
+buildBranch=R2.0
+build.distribution=wtp
+
+
+# build.trial is always false for production
+# builds.
+build.trial=true
+
+# these cvs values need to be "real" if
+# build.trial is false. This is the ID used
+# to tag releng map files per build.
+cvsUser=david_williams
+# 'ext' protocol typically requires
+# environment variable CVS_RSH to be set to ssh
+# that is, CVS_RSH=ssh
+cvsProtocol=ext
+
+
+
+
+# This controls whether java files are re-fetched
+# clean according to releng tags, or simply the
+# local versions used. Note: this only works if
+# its "gone though" a build already, where some
+# infrastructure files (e.g. "fetch") have already
+# been created.
+build.clean=true
+
+
+build.pack-all-in-one=false
+
+
+
diff --git a/releng.control/standardMachineProperties/checkout.properties b/releng.control/standardMachineProperties/checkout.properties
new file mode 100644
index 0000000..067164a
--- /dev/null
+++ b/releng.control/standardMachineProperties/checkout.properties
@@ -0,0 +1,28 @@
+# checkout.propererties
+
+# Its handy to set this value to false,
+# to test new versions of releng.wtpbuilder
+# If set to false, local edits to wtpbuilder files
+# are not over written each time a
+# build starts.
+# Normally always 'true' for "production" builds,
+# in which case the version of releng.wtpbuilder
+# specificed in releng/build.cfg is used for the build.
+
+checkout.wtpbuilder.clean=true
+
+
+
+# Following are just handy constants, too avoid
+# hard coding in the scripts, but they are not often used
+
+mapCvsRoot=:pserver:anonymous@dev.eclipse.org:/cvsroot/webtools
+
+
+# these are some not currently too important constants to avoid hard coding,
+# and allowing easier expansion in future
+releng=releng
+releng.builder=releng.wtpbuilder
+wst=wst
+jst=jst
+
diff --git a/releng.control/standardMachineProperties/description.txt b/releng.control/standardMachineProperties/description.txt
new file mode 100644
index 0000000..3557ec5
--- /dev/null
+++ b/releng.control/standardMachineProperties/description.txt
@@ -0,0 +1,24 @@
+
+The files in this directory, in theory, are not used
+in production builds on build.eclipse.org.
+
+They are provided as "default values" that may need
+to be changed on other machines.
+
+The are given here as examples of how someone might
+override various build properties on their own machine.
+
+These files, if used, should be in the directory named in
+the STANDARD_PROPERTIES_DIR environment variable, which
+is set in the "commonVariations" file.
+
+Note to build developers: the "defaults" here, in the
+CVS version, should "written in" as default values in build
+scripts, so the eclipse build.eclipse "official builds" are
+always correct, even without these files. It is best to keep
+these files "up to date", though, as a means of documenting
+what can be varied from machine to machine.
+
+Individual "local builds" should use the LOCAL_BUILD_PROPERTIES_DIR
+mechanism to provide their own "local" parameters. See the
+localBuildExample directory.
diff --git a/releng.control/standardMachineProperties/upload.properties b/releng.control/standardMachineProperties/upload.properties
new file mode 100644
index 0000000..63cff8b
--- /dev/null
+++ b/releng.control/standardMachineProperties/upload.properties
@@ -0,0 +1,22 @@
+# upload.properties
+
+# These are some properties needed to upload builds from the build machine to the download machine.
+# The actual task that does that is in wtp.upload in releng.wtpBuidler.
+# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
+
+
+# Use care with "true" unless you really
+# have a place for the builds to go. You
+# would not want them to accidently go to eclipse.org
+build.upload=true
+
+uploadUser=david_williams
+uploadPassword="This is not really used since ssh login is assumed (required)"
+uploadServer=download.eclipse.org
+uploadRemoteDirectory=/home/data/users/${uploadUser}/downloads/webtools/${site-sub-dir}/drops/${buildBranch}
+
+# rsyncRootPrefix should be empty for Linux machines.
+# But, Windows using cygwin will needs something like /cygdrive/G/
+# for what ever drive or directory is parent of build home
+rsyncRootPrefix=
+
diff --git a/releng.control/whatisfixed.properties b/releng.control/standardMachineProperties/whatisfixed.properties
similarity index 100%
rename from releng.control/whatisfixed.properties
rename to releng.control/standardMachineProperties/whatisfixed.properties
diff --git a/releng.control/startbuild.sh b/releng.control/startbuild.sh
index 8b9510c..a78b245 100644
--- a/releng.control/startbuild.sh
+++ b/releng.control/startbuild.sh
@@ -1,8 +1,15 @@
#!/bin/sh
+# remember to leave no slashes on filename in source command,
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED ]
+then
+ source commonVariations.sh
+# source computeCommon.sh
+fi
-cd /shared/webtools/releng.control
-sh /shared/webtools/releng.control/cc.sh
+cd ${BUILD_HOME}/releng.control
+sh ${BUILD_HOME}/releng.control/cc.sh
diff --git a/releng.control/wtp-R1.0-M.ser b/releng.control/stateSnapshot/wtp-R1.0-M.ser
similarity index 100%
rename from releng.control/wtp-R1.0-M.ser
rename to releng.control/stateSnapshot/wtp-R1.0-M.ser
Binary files differ
diff --git a/releng.control/wtp-R1.5-M.ser b/releng.control/stateSnapshot/wtp-R1.5-M.ser
similarity index 75%
rename from releng.control/wtp-R1.5-M.ser
rename to releng.control/stateSnapshot/wtp-R1.5-M.ser
index 47a5873..610dcec 100644
--- a/releng.control/wtp-R1.5-M.ser
+++ b/releng.control/stateSnapshot/wtp-R1.5-M.ser
Binary files differ
diff --git a/releng.control/wtp-R1.5-P.ser b/releng.control/stateSnapshot/wtp-R1.5-P.ser
similarity index 100%
rename from releng.control/wtp-R1.5-P.ser
rename to releng.control/stateSnapshot/wtp-R1.5-P.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-I.ser b/releng.control/stateSnapshot/wtp-R2.0-I.ser
similarity index 75%
rename from releng.control/wtp-R2.0-I.ser
rename to releng.control/stateSnapshot/wtp-R2.0-I.ser
index 730516f..5d8521a 100644
--- a/releng.control/wtp-R2.0-I.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-I.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-N.ser b/releng.control/stateSnapshot/wtp-R2.0-N.ser
similarity index 75%
rename from releng.control/wtp-R2.0-N.ser
rename to releng.control/stateSnapshot/wtp-R2.0-N.ser
index 58712ff..982dbc6 100644
--- a/releng.control/wtp-R2.0-N.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-N.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-R.ser b/releng.control/stateSnapshot/wtp-R2.0-R.ser
similarity index 100%
rename from releng.control/wtp-R2.0-R.ser
rename to releng.control/stateSnapshot/wtp-R2.0-R.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-S.ser b/releng.control/stateSnapshot/wtp-R2.0-S.ser
similarity index 75%
rename from releng.control/wtp-R2.0-S.ser
rename to releng.control/stateSnapshot/wtp-R2.0-S.ser
index 637f68a..689854d 100644
--- a/releng.control/wtp-R2.0-S.ser
+++ b/releng.control/stateSnapshot/wtp-R2.0-S.ser
Binary files differ
diff --git a/releng.control/wtp-R2.0-N.ser b/releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
similarity index 70%
copy from releng.control/wtp-R2.0-N.ser
copy to releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
index 58712ff..6d48200 100644
--- a/releng.control/wtp-R2.0-N.ser
+++ b/releng.control/stateSnapshot/wtp-thirdparty-R2.0-T.ser
Binary files differ
diff --git a/releng.control/wtp-whatisfixed.ser b/releng.control/stateSnapshot/wtp-whatisfixed.ser
similarity index 100%
rename from releng.control/wtp-whatisfixed.ser
rename to releng.control/stateSnapshot/wtp-whatisfixed.ser
Binary files differ
diff --git a/releng.control/stopBuilds.sh b/releng.control/stopBuilds.sh
index c979fe3..34af31a 100644
--- a/releng.control/stopBuilds.sh
+++ b/releng.control/stopBuilds.sh
@@ -1,14 +1,21 @@
#!/bin/sh
+# remember to leave no slashes on filename in source command,
+# so that users path is used to find it (first)
+if [ -n $BUILD_INITIALIZED ]
+then
+ source commonVariations.sh
+ source computeCommon.sh
+fi
# allow to terminate themselves, if they will
echo "Attempting normal terminate of all java processes"
-killall /opt/public/webtools/apps/IBMJava2-ppc-142/jre/bin/java
+killall ${JAVA_HOME}/jre/bin/java
# pause briefly to allow shutdown to finish
sleep 10s
# but if the do not terminate themselves, we can safely force them down
echo "forcing termination of any remaing java processes"
-killall -9 /opt/public/webtools/apps/IBMJava2-ppc-142/jre/bin/java
+killall -9 ${JAVA_HOME}/jre/bin/java/jre/bin/java
# pause briefly to allow ports to free up, etc.
sleep 10s
diff --git a/releng.control/testb.xml b/releng.control/testb.xml
deleted file mode 100644
index d1b22f0..0000000
--- a/releng.control/testb.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<project default="Build">
-
- <property file="committer.properties" />
- <property environment="env" />
-
- <target name="Build">
-
- <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
- <ant antfile="checkout.xml" target="all" dir="." inheritall="false">
- <property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
- <property name="buildType" value="${buildType}" />
- <property name="mapVersionTag" value="${mapVersionTag}" />
- </ant>
-
- <ant antfile="${wtpBuilder}" target="build" />
- <ant antfile="${wtpBuilder}" target="upload" />
- <ant antfile="${wtpBuilder}" target="test" />
- <ant antfile="${wtpBuilder}" target="site" />
- <ant antfile="${wtpBuilder}" target="upload" />
- </target>
-
- <target name="JustBuild">
-
- <property name="wtpBuilder" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}/releng.wtpbuilder/build.xml"/>
-
-
- <ant antfile="${wtpBuilder}" target="build" />
- </target>
-
-
-
- <target name="clean" if="build.clean">
- <delete dir="${env.BUILD_HOME}/build-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
- <delete dir="${env.BUILD_HOME}/test-${build.distribution}-${buildBranch}-${buildType}" failonerror="false" />
- </target>
-
-
-</project>
diff --git a/releng.control/trigger.properties b/releng.control/trigger.properties
deleted file mode 100644
index b8808fb..0000000
--- a/releng.control/trigger.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-ftpUser=david_williams
-ftpPassword=xxxxxxx
-ftpServer=download.eclipse.org
-ftpRemoteDirectory=/home/data/users/david_williams/downloads/webtools/downloads/drops
-ftpDocsRemoteDirectory=/home/data/users/david_williams/downloads/webtools/docs/drops
-remoteDrivers=/home/data/users/david_williams/downloads/webtools/downloads
diff --git a/releng.control/trigger.xml b/releng.control/trigger.xml
deleted file mode 100644
index 192bb70..0000000
--- a/releng.control/trigger.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<project default="Build">
-
- <property file="trigger.properties" />
- <property environment="env" />
-
- <target name="Build">
- <property name="buildTarget" value="all" />
- <property name="removeBuildDir" value="true" />
- <antcall target="startBuild">
- </antcall>
- </target>
-
- <target name="Repeat">
- <property name="buildTarget" value="all" />
- <antcall target="startBuild">
- </antcall>
- </target>
-
- <target name="Test">
- <delete dir="${env.BUILD_HOME}/test-${build.component}-${buildType}" failonerror="false" />
- <property name="buildTarget" value="test" />
- <antcall target="startBuild">
- </antcall>
- </target>
-
- <target name="Publish">
- <property name="buildTarget" value="justPublish" />
- <antcall target="startBuild">
- </antcall>
- </target>
-
- <target name="Push">
- <property name="buildTarget" value="justPush" />
- <antcall target="startBuild">
- </antcall>
- </target>
-
- <target name="startBuild" depends="clean">
- <antcall target="clean" />
- <echo message="Component is: ${build.component}" />
- <echo message="Build type is: ${buildType}" />
- <echo message="Branch : ${mapVersionTag}" />
- <echo message="Trial : ${build.trial}" />
- <echo message="ftpRemoteDirectory : ${ftpRemoteDirectory}" />
-
- <ant antfile="checkout.xml" target="all" dir="." inheritall="false">
- <property name="codir" value="${env.BUILD_HOME}/build-node/checkout/${build.distribution}-${buildBranch}-${buildType}" />
- <property name="buildType" value="${buildType}" />
- <property name="mapVersionTag" value="${mapVersionTag}" />
- </ant>
-
- <!-- TODO: this appears obsolete? And should be removed? -->
- <ant antfile="cruise.xml" target="${buildTarget}" dir="${env.BUILD_HOME}/build-node/checkout/${build.component}-${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="${env.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}" />
- <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="build.home" value="${env.BUILD_HOME}" />
- <property name="codir" value="${env.BUILD_HOME}/build-node/checkout/wtp-driver" />
- <property name="buildType" value="I" />
- <property name="mapVersionTag" value="${mapVersionTag}" />
- </ant>
- <ant antfile="drivers.xml" target="all" dir="${env.BUILD_HOME}/build-node/checkout/wtp-driver/releng.builder/tools/cruise" inheritall="false">
- </ant>
- </target>
-
- <target name="docs">
- <property name="build.component" value="docs" />
- <property name="buildTarget" value="buildDoc" />
- <antcall target="Build">
- <param name="ftpRemoteDirectory" value="${ftpDocsRemoteDirectory}"/>
- </antcall>
- </target>
-
-
- <target name="clean" if="removeBuildDir">
- <delete dir="${env.BUILD_HOME}/build-${build.component}-${buildType}" failonerror="false" />
- <delete dir="${env.BUILD_HOME}/test-${build.component}-${buildType}" failonerror="false" />
- <delete dir="${env.BUILD_HOME}/build-node/checkout/${build.component}-${buildType}/build/test-results" failonerror="false" />
- <delete dir="${env.BUILD_HOME}/workspace" failonerror="false" />
- </target>
-
-</project>
diff --git a/releng.control/upload-dw.properties b/releng.control/upload-dw.properties
deleted file mode 100644
index ae243a6..0000000
--- a/releng.control/upload-dw.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# These are some properties needed to upload builds from the build machine to the download machine.
-# The actual task that does that is in wtp.upload in releng.wtpBuidler.
-# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
-#
-
-build.upload=true
-
-uploadUser=davidw
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=localhost
-uploadRemoteDirectory=/usr/local/apache2/htdocs/webtools/${sub-home}/drops/${buildBranch}
-
-# rsyncRootPrefix should be empty for Linux machines.
-# But, Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
diff --git a/releng.control/upload.properties b/releng.control/upload.properties
deleted file mode 100644
index 05c59f7..0000000
--- a/releng.control/upload.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# These are some properties needed to upload builds from the build machine to the download machine.
-# The actual task that does that is in wtp.upload in releng.wtpBuidler.
-# Its better to set here, "outside" of wtpBuilder, since it can be machine and user specific
-#
-buildBranch=R2.0
-
-uploadUser=david_williams
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=download.eclipse.org
-uploadRemoteDirectory=/home/data/users/${uploadUser}/downloads/webtools/${sub-home}/drops/${buildBranch}
-
-# rsyncRootPrefix should be empty for Linux machines.
-# But, Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
-build.upload=true
diff --git a/releng.control/whatisfixed.xml b/releng.control/whatisfixed.xml
index baa849c..002a1db 100644
--- a/releng.control/whatisfixed.xml
+++ b/releng.control/whatisfixed.xml
@@ -1,7 +1,23 @@
-<project default="whatisfixed" basedir=".">
+<project name="whatisfixed" default="whatisfixed" basedir=".">
- <property file="whatisfixed.properties" />
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
<target name="whatisfixed" depends="clean">
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index 6e6ae5d..82ec5e7 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -6,58 +6,23 @@
mapVersionTag=HEAD
buildType=I
-build.trial=true
-baseos=linux
-basews=gtk
-#basearch=x86
-basearch=ppc
-
-
-# Set this to the relative path for the
-# directory to be use for the current build.
-# It must be relative to the buildHome
-# 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 (local repository)
-# It must be relative to the buildHome
-build.local.repository=downloads
-
-
-# Set this to the relative path for the
-# directory to be use for the current test pass.
-# It must be relative to the buildHome
-# 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.
-# It must be relative to the buildHome
-build.perf.tests=perf-current
-
-
-# Set this property to the name of the component to build
-# i.e. wtp, jsf, ejb3.0, docs
build.distribution=wtp
-# javacFailOnError must be false otherwise the
-# build will terminated at the first compile error
+# javacFailOnError must be false otherwise the
+# build will terminated at the first compile error
javacFailOnError=false
javacDebugInfo=true
-##################################################
-# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
+# Asks the compiler for verbose output. This should be set
+# to true in order for *.bin.log files to be generated when
+# using the JDT Compiler Adapter to compile.
javacVerbose=true
# This is the eclipse releng driver
# It is only used to drive the build process
-# it must be relative to the buildHome
+# it must be relative to the build home
#
#
# in 3.2 based builds, this version is no longer appended to
@@ -71,6 +36,41 @@
eclipse.builder.version=M3_33
eclipse.builder.fetch=true
+archivesFormat=*,*,*-antZip
+
+# This parameter is specific to the compiler
+# being used (JDT Compiler, in our case).
+# 'showversion' causes the version of JDT Compiler to be
+# printed to the compiler log file.
+compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,raw
+
+
+# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
+# using the JDT Compiler Adapter to compile.
+javacVerbose=true
+
+#############################################################
+
+
+# Set this to the relative path for the
+# directory to be use for the current build.
+# It must be relative to the build home
+# Final name will include the ditribution name and build type
+# e.g: build-wtp-I
+build.current=build
+
+
+# Set this to the relative path for the
+# directory to be use for the current test pass.
+# It must be relative to the build home
+# 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 used for the peformance test.
+# It is relative to the build home.
+build.perf.tests=perf-current
# This is the directory in which eclipse driver
# that will be used to compile the build will
@@ -78,43 +78,19 @@
base.location=eclipse
-# This is the working directory in which wtp
-# build process will do its job
-# It is relative to the build.current
+# This is the working directory in which wtp
+# build process will do its job
+# It is relative to the build.current
build.directory=workdir
+
# This is the CVS Repository
# that is used during the build process
#
cvsRoot=/cvsroot/webtools
cvsServer=dev.eclipse.org
-cvsProtocol=pserver
-cvsUser=anonymous
-
-# needs to be valid committer id, and ext to tag (non trial) builds
-mapVersionTag=HEAD
-mapCvsProtocol=pserver
-mapCvsUser=anonymous
-
-# This is the directory where a local
-# copy of the latest build artifacts
-# are stored for backup
-# Relative to the build home
-#
-local.publish=publish
-
-archivesFormat=*,*,*-antZip
-
-# This parameter is specific to the compiler
-# being used (JDT Compiler, in our case).
-# 'showversion' causes the version of JDT Compiler to be
-# printed to the compiler log file.
-compilerArg=-showversion -encoding ISO-8859-1 -warn:-discouraged,serial,raw
-
-##################################################
-# Asks the compiler for verbose output. This should be set to true in order for *.bin.log files to be generated when
-# using the JDT Compiler Adapter to compile.
-javacVerbose=true
+cvsProtocol=ext
+cvsUser=david_williams
#############################################################
diff --git a/releng.wtpbuilder/build.xml b/releng.wtpbuilder/build.xml
index e701f69..d3c2a90 100644
--- a/releng.wtpbuilder/build.xml
+++ b/releng.wtpbuilder/build.xml
@@ -26,12 +26,6 @@
<property
name="build.pack-all-in-one"
value="${build.pack-all-in-one}" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
</target>
@@ -76,7 +70,7 @@
value="${wtp.builder.home}/scripts/dependency/build.xml" />
<property
name="local.cache.dir"
- value="${env.BUILD_HOME}/${build.local.repository}" />
+ value="${env.LOCAL_PREREQS_CACHE}" />
</ant>
</target>
diff --git a/releng.wtpbuilder/components/dali-sdk/dependency.xml b/releng.wtpbuilder/components/dali-sdk/dependency.xml
index a9a40c3..0712e7d 100644
--- a/releng.wtpbuilder/components/dali-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/dali-sdk/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
name="test"
diff --git a/releng.wtpbuilder/components/dali.tests/dependency.xml b/releng.wtpbuilder/components/dali.tests/dependency.xml
index 3201b1d..ec9b8ca 100644
--- a/releng.wtpbuilder/components/dali.tests/dependency.xml
+++ b/releng.wtpbuilder/components/dali.tests/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/dali/dependency.xml b/releng.wtpbuilder/components/dali/dependency.xml
index 954166f..f0aab2a 100644
--- a/releng.wtpbuilder/components/dali/dependency.xml
+++ b/releng.wtpbuilder/components/dali/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
name="test"
diff --git a/releng.wtpbuilder/components/jsf-sdk/dependency.xml b/releng.wtpbuilder/components/jsf-sdk/dependency.xml
index 34aca26..c1e3713 100644
--- a/releng.wtpbuilder/components/jsf-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jsf-sdk/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/jsf.tests/dependency.xml b/releng.wtpbuilder/components/jsf.tests/dependency.xml
index 5ba6282..392c62e 100644
--- a/releng.wtpbuilder/components/jsf.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jsf.tests/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/jsf/dependency.xml b/releng.wtpbuilder/components/jsf/dependency.xml
index 65bcc20..d011175 100644
--- a/releng.wtpbuilder/components/jsf/dependency.xml
+++ b/releng.wtpbuilder/components/jsf/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml
index 1eaae1d..7942193 100644
--- a/releng.wtpbuilder/components/jst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml
@@ -5,10 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
-
+
====================================================================== -->
<project
name="test"
diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml
index 1eaae1d..74ab384 100644
--- a/releng.wtpbuilder/components/jst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/jst.tests/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml
index 92689a1..6d3f241 100644
--- a/releng.wtpbuilder/components/jst/dependency.xml
+++ b/releng.wtpbuilder/components/jst/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml
index 0dd4bb7..a099efc 100644
--- a/releng.wtpbuilder/components/wst-sdk/dependency.xml
+++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml
index 5ba6282..392c62e 100644
--- a/releng.wtpbuilder/components/wst.tests/dependency.xml
+++ b/releng.wtpbuilder/components/wst.tests/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml
index 772d3f8..a362e10 100644
--- a/releng.wtpbuilder/components/wst/dependency.xml
+++ b/releng.wtpbuilder/components/wst/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
@@ -79,8 +77,5 @@
</ant>
</target>
-
-
-
</project>
diff --git a/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml b/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml
index d6505da..21c389b 100644
--- a/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml
+++ b/releng.wtpbuilder/components/wtp-thirdparty/dependency.xml
@@ -5,9 +5,7 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
+
====================================================================== -->
<project
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index 8e585e9..f2114ca 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -12,19 +12,12 @@
<property file="${wtp.builder.home}/build.properties" />
<property
name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}">
<property
name="component"
value="dali" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
-
</ant>
@@ -32,24 +25,12 @@
<property
name="component"
value="dali-sdk" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="dali.tests" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
@@ -63,7 +44,7 @@
property="wtbuilder.dir" />
<property
name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
<ant
antfile="${buildTargets}"
diff --git a/releng.wtpbuilder/distribution/dali.site/build.xml b/releng.wtpbuilder/distribution/dali.site/build.xml
index 44fcdbd..4b205a0 100644
--- a/releng.wtpbuilder/distribution/dali.site/build.xml
+++ b/releng.wtpbuilder/distribution/dali.site/build.xml
@@ -1,9 +1,17 @@
<project name="Build specific targets and properties" default="build">
- <target name="build">
+
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+
+ <target name="build">
<java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index ca12cd3..ddf157d 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -1,5 +1,12 @@
<project name="Build specific targets and properties" default="test">
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
@@ -26,7 +33,7 @@
</fileset>
</copy>
- <echo message="${baseos} ${basews} ${basearch} " />
+ <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
<ant antfile="${test.component.dir}/testdependency.xml" target="get">
<property name="dependency.properties" value="${buildDirectory}/maps/releng.dali/maps/dependencies.properties" />
<property name="base.install.dir" value="${testRoot}" />
@@ -46,9 +53,9 @@
<target name="runTestEclipse">
<java taskname="test-dali-${testTarget}" classpath="${testRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/dalitestlog.txt" dir="${testRoot}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dnoclean=true" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
diff --git a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
index 42740dc..1341470 100644
--- a/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/standaloneTest.xml
@@ -7,9 +7,6 @@
buildType
buildId
timestamp
- baseos
- basews
- basearch
build.stream [optional]
build.committers [optional]
testTarget [optional]
@@ -17,7 +14,7 @@
<target name="main">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="testRoot" value="${build.home}/testRoot"/>
<delete dir="${testRoot}" failonerror="false"/>
<mkdir dir="${testRoot}"/>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml
index 8aad53d..2cdde5c 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/api-tests.xml
@@ -69,18 +69,18 @@
<condition property="os.win32">
<equals arg1="${os}" arg2="win32" />
</condition>
- <available file="${build.home}/${build.drivers}/${piAgentFile}" property="piAgent.exists"/>
+ <available file="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}" property="piAgent.exists"/>
<antcall target="getPIAgent"/>
<antcall target="setupPIAgentLinux"/>
<antcall target="setupPIAgentWin32"/>
</target>
<target name="getPIAgent" unless="piAgent.exists">
- <get src="${piAgentURL}" dest="${build.home}/${build.drivers}/${piAgentFile}"/>
+ <get src="${piAgentURL}" dest="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}"/>
</target>
<target name="setupPIAgentLinux" if="os.linux">
- <unzip dest="${piagentDir}" src="${build.home}/${build.drivers}/${piAgentFile}">
+ <unzip dest="${piagentDir}" src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
<patternset>
<include name="**/*.so"/>
</patternset>
@@ -92,7 +92,7 @@
</target>
<target name="setupPIAgentWin32" if="os.win32">
- <unzip dest="${piagentDir}" src="${build.home}/${build.drivers}/${piAgentFile}">
+ <unzip dest="${piagentDir}" src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
<patternset>
<include name="**/*.dll"/>
</patternset>
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index 29bb395..fca9e6b 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -5,9 +5,6 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
====================================================================== -->
<project name="test" default="get">
diff --git a/releng.wtpbuilder/distribution/dali.upload/build.xml b/releng.wtpbuilder/distribution/dali.upload/build.xml
deleted file mode 100644
index b36a5e4..0000000
--- a/releng.wtpbuilder/distribution/dali.upload/build.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<project default="sync" basedir=".">
-
-
- <target name="sync" depends="initPropertyFile,check.upload" if="doUpload">
-
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
-
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
-
-
-
- <echo message="chmod for ${buildDirectory}/${buildLabel}"/>
- <!-- synch on host is a tiny bit faster if permisions already set -->
- <!-- and, remember, chmod ant task is implemented only for unix -->
- <exec executable="chmod">
- <arg line="-Rc o+rx ${buildDirectory}/${buildLabel}" />
- </exec>
-
-
-
-
- <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
-
- <exec executable="rsync">
- <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
- </exec>
- </target>
-
-
-
- <target name="check.upload" depends="initPropertyFile">
- <condition property="doUpload">
- <equals arg1="${build.upload}" arg2="true" />
- </condition>
- </target>
-
-
- <target name="initPropertyFile">
-
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
-
- </target>
-</project>
diff --git a/releng.wtpbuilder/distribution/dali.upload/fallback.upload.properties b/releng.wtpbuilder/distribution/dali.upload/fallback.upload.properties
deleted file mode 100644
index a108533..0000000
--- a/releng.wtpbuilder/distribution/dali.upload/fallback.upload.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-uploadUser=david_williams
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=download.eclipse.org
-uploadRemoteDirectory=/home/data/users/david_williams/downloads/webtools/committers/drops
-
-# rsyncRootPrefix should be empty for linux machines.
-# Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
-
-build.upload=true
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/jsf.build/build.xml b/releng.wtpbuilder/distribution/jsf.build/build.xml
index 9b2f5a0..53e92a2 100644
--- a/releng.wtpbuilder/distribution/jsf.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsf.build/build.xml
@@ -7,7 +7,7 @@
<dirname file="${ant.file}" property="distribution.jsf.build.dir"/>
<echo message="file:${file} " />
<property file="${wtp.builder.home}/build.properties" />
- <property name="buildTargets" value="${wtp.builder.home}/scripts/build/build.xml" />
+ <property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<!-- property name="baseLocation" value="c:/Eclipse/eclipse/" /> -->
<ant antfile="${buildTargets}" >
<property name="component" value="jsf" />
@@ -26,7 +26,7 @@
<target name="getBaseBuilder" if="eclipse.builder.fetch">
<dirname file="${ant.file}" property="wtbuilder.dir"/>
- <property name="buildTargets" value="${wtp.builder.home}/scripts/build/build.xml" />
+ <property name="buildTargets" value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
<ant antfile="${buildTargets}" target="getBaseBuilder" />
</target>
diff --git a/releng.wtpbuilder/distribution/jsf.site/build.xml b/releng.wtpbuilder/distribution/jsf.site/build.xml
index 538b744..ea3d6c6 100644
--- a/releng.wtpbuilder/distribution/jsf.site/build.xml
+++ b/releng.wtpbuilder/distribution/jsf.site/build.xml
@@ -1,9 +1,9 @@
<project name="Build specific targets and properties" default="build">
<target name="build">
<java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildType=${buildType}" />
diff --git a/releng.wtpbuilder/distribution/jsf.tests/build.xml b/releng.wtpbuilder/distribution/jsf.tests/build.xml
index f2478f5..d9747f5 100644
--- a/releng.wtpbuilder/distribution/jsf.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsf.tests/build.xml
@@ -1,5 +1,11 @@
<project name="Build specific targets and properties" default="test">
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
<!-- ===================================================================== -->
<!-- Steps to do after the build is done. -->
<!-- ===================================================================== -->
@@ -26,7 +32,7 @@
</fileset>
</copy>
- <echo message="${baseos} ${basews} ${basearch} " />
+ <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
<ant antfile="${test.component.dir}/testdependency.xml" target="get">
<property name="dependency.properties" value="${buildDirectory}/maps/releng-jsf/maps/dependencies.properties" />
<property name="base.install.dir" value="${testRoot}" />
@@ -45,10 +51,9 @@
<target name="runTestEclipse">
<java taskname="test-jsf-${testTarget}" classpath="${testRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/jsftestlog.txt" dir="${testRoot}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Dnoclean=true" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" /> <jvmarg value="-Dnoclean=true" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-DbuildLabel=${buildLabel}" />
diff --git a/releng.wtpbuilder/distribution/jsf.tests/testScripts/api-tests.xml b/releng.wtpbuilder/distribution/jsf.tests/testScripts/api-tests.xml
index 8aad53d..2cdde5c 100644
--- a/releng.wtpbuilder/distribution/jsf.tests/testScripts/api-tests.xml
+++ b/releng.wtpbuilder/distribution/jsf.tests/testScripts/api-tests.xml
@@ -69,18 +69,18 @@
<condition property="os.win32">
<equals arg1="${os}" arg2="win32" />
</condition>
- <available file="${build.home}/${build.drivers}/${piAgentFile}" property="piAgent.exists"/>
+ <available file="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}" property="piAgent.exists"/>
<antcall target="getPIAgent"/>
<antcall target="setupPIAgentLinux"/>
<antcall target="setupPIAgentWin32"/>
</target>
<target name="getPIAgent" unless="piAgent.exists">
- <get src="${piAgentURL}" dest="${build.home}/${build.drivers}/${piAgentFile}"/>
+ <get src="${piAgentURL}" dest="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}"/>
</target>
<target name="setupPIAgentLinux" if="os.linux">
- <unzip dest="${piagentDir}" src="${build.home}/${build.drivers}/${piAgentFile}">
+ <unzip dest="${piagentDir}" src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
<patternset>
<include name="**/*.so"/>
</patternset>
@@ -92,7 +92,7 @@
</target>
<target name="setupPIAgentWin32" if="os.win32">
- <unzip dest="${piagentDir}" src="${build.home}/${build.drivers}/${piAgentFile}">
+ <unzip dest="${piagentDir}" src="${env.LOCAL_PREREQS_CACHE}/${piAgentFile}">
<patternset>
<include name="**/*.dll"/>
</patternset>
diff --git a/releng.wtpbuilder/distribution/jsf.tests/testdependency.xml b/releng.wtpbuilder/distribution/jsf.tests/testdependency.xml
index 2e88202..6d1c8f9 100644
--- a/releng.wtpbuilder/distribution/jsf.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/jsf.tests/testdependency.xml
@@ -5,9 +5,6 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
====================================================================== -->
<project name="test" default="get">
diff --git a/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml b/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml
index 288d489..3891aae 100644
--- a/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp-thirdparty.build/build.xml
@@ -6,13 +6,11 @@
<dirname file="${ant.file}" property="distribution.wtp.build.dir" />
<property file="${wtp.builder.home}/build.properties" />
<property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}">
<property name="component" value="wtp-thirdparty" />
- <property name="J2SE-1.5" value="${J2SE-1.5}" />
- <property name="J2SE-1.4" value="${J2SE-1.4}" />
</ant>
@@ -23,7 +21,7 @@
<target name="getBaseBuilder" if="eclipse.builder.fetch">
<dirname file="${ant.file}" property="wtbuilder.dir" />
<property name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
<ant antfile="${buildTargets}" target="getBaseBuilder" />
</target>
diff --git a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml b/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml
index b36a5e4..73ffe67 100644
--- a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml
+++ b/releng.wtpbuilder/distribution/wtp-thirdparty.upload/build.xml
@@ -1,57 +1,12 @@
<project default="sync" basedir=".">
- <target name="sync" depends="initPropertyFile,check.upload" if="doUpload">
+ <target name="sync">
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
-
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
-
-
-
- <echo message="chmod for ${buildDirectory}/${buildLabel}"/>
- <!-- synch on host is a tiny bit faster if permisions already set -->
- <!-- and, remember, chmod ant task is implemented only for unix -->
- <exec executable="chmod">
- <arg line="-Rc o+rx ${buildDirectory}/${buildLabel}" />
- </exec>
-
-
-
-
- <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
-
- <exec executable="rsync">
- <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
- </exec>
- </target>
-
-
-
- <target name="check.upload" depends="initPropertyFile">
- <condition property="doUpload">
- <equals arg1="${build.upload}" arg2="true" />
- </condition>
- </target>
-
-
- <target name="initPropertyFile">
-
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
+ <ant antfile="${wtp.builder.home}/scripts/upload/upload.xml">
+ <property name="site-sub-dir"
+ value="committers" />
+ </ant>
</target>
</project>
diff --git a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/fallback.upload.properties b/releng.wtpbuilder/distribution/wtp-thirdparty.upload/fallback.upload.properties
deleted file mode 100644
index a108533..0000000
--- a/releng.wtpbuilder/distribution/wtp-thirdparty.upload/fallback.upload.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-uploadUser=david_williams
-uploadPassword="This is not really used since ssh login is assumed (required)"
-uploadServer=download.eclipse.org
-uploadRemoteDirectory=/home/data/users/david_williams/downloads/webtools/committers/drops
-
-# rsyncRootPrefix should be empty for linux machines.
-# Windows using cygwin will needs something like /cygdrive/G/
-# for what ever drive or directory is parent of build home
-rsyncRootPrefix=
-
-
-build.upload=true
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index ed7f0d9..3444b57 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -7,9 +7,9 @@
buildType
buildId
timestamp
- baseos
- basews
- basearch
+ env.BASEOS
+ env.BASEWS
+ env.BASEARCH
build.stream [optional]
build.committers [optional]
releng.tag [optional]
@@ -17,6 +17,13 @@
clean [optional]
-->
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+
<target name="main">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
<property file="${build.home}/releng.wtpbuilder/distribution/wtp.api/api.properties"/>
@@ -26,7 +33,7 @@
<mkdir dir="${apiRoot}"/>
<antcall target="getReleng"/>
<property file="${apiRoot}/releng/maps/dependencies.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="wtp.dir" value="${local.cache.dir}"/>
<property name="install.destination" value="${apiRoot}"/>
<antcall target="getDependencies"/>
@@ -82,13 +89,19 @@
<antcall target="getAndInstall">
<param name="groupId" value="oagis.wsdl" />
</antcall>
+
+ <!-- this appears to be pretty explict hard coding for windows machines.
+ I wonder why the usual "get dependencies" methods would not work?
+ -->
<antcall target="get">
<param name="groupId" value="eclipse" />
<param name="baseos" value="win32" />
<param name="basews" value="win32" />
<param name="basearch" value="x86" />
</antcall>
- <antcall target="get">
+
+
+ <antcall target="get">
<param name="groupId" value="tptp" />
</antcall>
<mkdir dir="${apiRoot}/piagent"/>
@@ -278,10 +291,9 @@
<target name="runEclipseApp">
<property name="vmargs" value=""/>
<java classpath="${apiRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" dir="${apiRoot}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Xmx256M" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" /> <jvmarg value="-Xmx256M" />
<jvmarg line="${vmargs}" />
<arg value="-application" />
<arg value="${application}" />
@@ -326,7 +338,7 @@
<target name="clean" if="clean">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="apiRoot" value="${build.home}/apiRoot"/>
<property name="wtp.dir" value="${local.cache.dir}"/>
<delete dir="${apiRoot}" failonerror="false"/>
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index e756cb1..6ce4f41 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -13,54 +13,30 @@
<property file="${wtp.builder.home}/build.properties" />
<property
name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<ant antfile="${buildTargets}">
<property
name="component"
value="wst" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="wst-sdk" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst-sdk" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
@@ -69,24 +45,12 @@
<property
name="component"
value="jsf" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
-->
<ant antfile="${buildTargets}">
<property
name="component"
value="dali" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
@@ -97,24 +61,12 @@
<property
name="component"
value="dali-sdk" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<!--
<ant antfile="${buildTargets}">
<property
name="component"
value="jsf-sdk" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
-->
@@ -123,46 +75,22 @@
<property
name="component"
value="wst.tests" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="jst.tests" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<ant antfile="${buildTargets}">
<property
name="component"
value="dali.tests" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
<!--
<ant antfile="${buildTargets}">
<property
name="component"
value="jsf.tests" />
- <property
- name="J2SE-1.5"
- value="${J2SE-1.5}" />
- <property
- name="J2SE-1.4"
- value="${J2SE-1.4}" />
</ant>
-->
@@ -178,7 +106,7 @@
property="wtbuilder.dir" />
<property
name="buildTargets"
- value="${wtp.builder.home}/scripts/build/build.xml" />
+ value="${wtp.builder.home}/scripts/build/runbuild.xml" />
<!-- delete dir="${pde.builder.path}" failonerror="false"/ -->
<ant
antfile="${buildTargets}"
diff --git a/releng.wtpbuilder/distribution/wtp.perf/build.xml b/releng.wtpbuilder/distribution/wtp.perf/build.xml
index f416ec2..86bbcfa 100644
--- a/releng.wtpbuilder/distribution/wtp.perf/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.perf/build.xml
@@ -8,9 +8,9 @@
buildId
date
time
- baseos
- basews
- basearch
+ env.BASEOS
+ env.BASEWS
+ env.BASEARCH
buildType.tests [optional]
buildId.tests [optional]
date.tests [optional]
@@ -20,7 +20,14 @@
releng.tag [optional]
perf.target [optional]
-->
-
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+
+
<target name="main">
<property name="perf.buildId" value="${buildType}${date}-${time}"/>
<property name="timestamp" value="${date}${time}"/>
@@ -30,7 +37,7 @@
<property name="time.tests" value="${time}"/>
<property name="timestamp.tests" value="${date.tests}${time.tests}"/>
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="workDir" value="${build.home}/workDir"/>
<property name="perfRoot" value="${build.home}/perfRoot"/>
<delete dir="${workDir}" failonerror="false"/>
@@ -192,10 +199,9 @@
<property name="perf.target" value="main"/>
<mkdir dir="${perfRoot}/results/consolelogs"/>
<java classpath="${workDir}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="28800000" output="${perfRoot}/results/consolelogs/wtpperflog.txt" dir="${workDir}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Dnoclean=true" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" /> <jvmarg value="-Dnoclean=true" />
<jvmarg value="-DbuildType=${buildType}" />
<jvmarg value="-DbuildId=${buildId}" />
<jvmarg value="-Dtimestamp=${timestamp}"/>
@@ -236,10 +242,9 @@
</antcall>
<mkdir dir="${perfRoot}/results/graph"/>
<java classpath="${perfRoot}/org.eclipse.releng.basebuilder/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="3600000" dir="${perfRoot}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Declipse.perf.dbloc=${build.home}/${perf.dbloc}"/>
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" /> <jvmarg value="-Declipse.perf.dbloc=${build.home}/${perf.dbloc}"/>
<arg value="-application" />
<arg value="org.eclipse.test.performance.ui.resultGenerator" />
<arg value="-baseline"/>
@@ -295,7 +300,7 @@
<target name="clean" if="clean">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="workDir" value="${build.home}/workDir"/>
<property name="perfRoot" value="${build.home}/perfRoot"/>
<delete dir="${workDir}" failonerror="false"/>
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 03cf736..857e8e9 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -1,9 +1,17 @@
<project name="Build specific targets and properties" default="build">
+
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+
<target name="build">
<java classpath="${pde.builder.path}/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
<jvmarg value="-Dbuild.home=${build.home}" />
<jvmarg value="-Dbuild.trial=${build.trial}" />
<jvmarg value="-DbuildBranch=${buildBranch}" />
@@ -51,7 +59,7 @@
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property name="buildBranch" value="${buildBranch}" />
- <property name="build.pack-all-in-one" value="${build.pack-all-in-one}"/>
+ <property name="build.pack-all-in-one" value="${build.pack-all-in-one}"/>
<property name="isBuildTested" value="${isBuildTested}" />
<property name="indexTemplateFilename" value="${indexTemplateFilename}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 9db7b5b..6781ab1 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -1,5 +1,10 @@
<project name="Build specific targets and properties" default="test">
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
<!-- ===================================================================== -->
@@ -28,7 +33,8 @@
</fileset>
</copy>
- <echo message="${baseos} ${basews} ${basearch} " />
+ <echo message="BASEOS: ${env.BASEOS} BASEWS: ${env.BASEWS} BASEARCH: ${env.BASEARCH} " />
+
<ant antfile="${test.component.dir}/testdependency.xml" target="get">
<property name="dependency.properties" value="${buildDirectory}/maps/releng/maps/dependencies.properties" />
<property name="base.install.dir" value="${testRoot}" />
@@ -58,12 +64,12 @@
<target name="runTestEclipse">
<java taskname="test-wtp-${testTarget}" classpath="${testRoot}/eclipse/startup.jar" fork="true" classname="org.eclipse.core.launcher.Main" failonerror="true" timeout="7200000" output="${testRoot}/results/consolelogs/wtptestlog.txt" dir="${testRoot}">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Dws=${basews}" />
- <jvmarg value="-Dos=${baseos}" />
- <jvmarg value="-Darch=${basearch}" />
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg value="-Dws=${env.BASEWS}" />
+ <jvmarg value="-Dos=${env.BASEOS}" />
+ <jvmarg value="-Darch=${env.BASEARCH}" />
<jvmarg value="-Dnoclean=true" />
<jvmarg value="-DbuildBranch=${buildBranch}" />
<jvmarg value="-DbuildType=${buildType}" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
index 7b7ffd5..3cb90de 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/standaloneTest.xml
@@ -7,9 +7,6 @@
buildType
buildId
timestamp
- baseos
- basews
- basearch
build.stream [optional]
build.committers [optional]
testTarget [optional]
@@ -17,7 +14,7 @@
<target name="main">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="testRoot" value="${build.home}/testRoot"/>
<delete dir="${testRoot}" failonerror="false"/>
<mkdir dir="${testRoot}"/>
@@ -136,7 +133,7 @@
<target name="clean" if="clean">
<property file="${build.home}/releng.wtpbuilder/build.properties"/>
- <property name="local.cache.dir" value="${build.home}/${build.local.repository}"/>
+ <property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}"/>
<property name="testRoot" value="${build.home}/testRoot"/>
<delete dir="${testRoot}" failonerror="false"/>
<delete failonerror="false">
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
index 58dbf21..7c2556a 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml
@@ -5,9 +5,6 @@
dependencyTargets
local.cache.dir
dependency.properties
- baseos
- basews
- basearch
====================================================================== -->
<project name="test" default="get">
diff --git a/releng.wtpbuilder/distribution/wtp.upload/build.xml b/releng.wtpbuilder/distribution/wtp.upload/build.xml
index b36a5e4..9f3ec07 100644
--- a/releng.wtpbuilder/distribution/wtp.upload/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.upload/build.xml
@@ -1,57 +1,10 @@
-<project default="sync" basedir=".">
+<project default="upload" basedir=".">
- <target name="sync" depends="initPropertyFile,check.upload" if="doUpload">
+ <target name="upload">
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
-
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
-
-
-
- <echo message="chmod for ${buildDirectory}/${buildLabel}"/>
- <!-- synch on host is a tiny bit faster if permisions already set -->
- <!-- and, remember, chmod ant task is implemented only for unix -->
- <exec executable="chmod">
- <arg line="-Rc o+rx ${buildDirectory}/${buildLabel}" />
- </exec>
-
-
-
-
- <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
-
- <exec executable="rsync">
- <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
- </exec>
- </target>
-
-
-
- <target name="check.upload" depends="initPropertyFile">
- <condition property="doUpload">
- <equals arg1="${build.upload}" arg2="true" />
- </condition>
- </target>
-
-
- <target name="initPropertyFile">
-
- <!-- if this upload properties file hasn't been set yet, we will provide this fallback file -->
- <!-- but, since these properties are machine and user sensitive, its better if set "outside" wtpbuilder,
- such as in releng.control -->
- <property name="wtpbuilder.upload.properties.file"
- value="${basedir}/fallback.upload.properties" />
-
- <property file="${wtpbuilder.upload.properties.file}" />
+ <ant antfile="${wtp.builder.home}/scripts/upload/upload.xml">
+ </ant>
</target>
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.whatisfixed/fallback.whatisfixed.properties b/releng.wtpbuilder/distribution/wtp.whatisfixed/fallback.whatisfixed.properties
deleted file mode 100644
index 6d45ff9..0000000
--- a/releng.wtpbuilder/distribution/wtp.whatisfixed/fallback.whatisfixed.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-# FROM DATE AND BUILD
-# This must be set as the reference point.
-#
-whatisfixed.since.date=2006-04-28 02:45:00 GMT
-whatisfixed.fromBuildId=R-1.0.2-200604280245
-
-
-# TO DATE AND BUILD
-# This is calculated at the time of the build. Is not set
-#
-#whatisfixed.to.date=
-#whatisfixed.toBuildId=
-
-# This is not used due to wierd behavior by cvs rlog
-#whatisfixed.to.branch
-
-# What is fixed list will only include bugs targeted to these
-#(seperate them by commas, blanks are significant in a name)
-# - means ignore target
-whatisfixed.targetMilestones=1.5 M4,1.5 M5,1.5 M6,1.5 RC1,1.5 RC2,1.5 RC3,1.5 RC4,1.5 RC5,1.5 RC6,1.0.1 M101,1.0.2 M102,1.0.3 M103
-
-# The list will include bugs with these statuses
-# - means ignore target (valid status - RESOLVED CLOSED NEW..)
-whatisfixed.status=-
-
-# These are the components under the cvs root to
-# search for changes (seperate them by commas, blanks are significant in a name!)
-whatisfixed.modules=wst,jst
-
-
-build.whatIsFixed=true
diff --git a/releng.wtpbuilder/rootfiles/notice.html b/releng.wtpbuilder/rootfiles/notice.html
index 15a10cf..c6af966 100644
--- a/releng.wtpbuilder/rootfiles/notice.html
+++ b/releng.wtpbuilder/rootfiles/notice.html
@@ -1,79 +1,79 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
- modules ("Modules") and made available as downloadable archives ("Downloads").</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
-Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
+<html>
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
+<title>Eclipse.org Software User Agreement</title>
+</head>
+
+<body lang="EN-US" link=blue vlink=purple>
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>March 17, 2005</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+ (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+ CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+ OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+ NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+ CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+ ("EPL"). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+ For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS
+ modules ("Modules") and made available as downloadable archives ("Downloads").</p>
+
+<ul>
+ <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"), plug-in fragments ("Fragments"), and features ("Features").</li>
+ <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java™ ARchive) in a directory named "plugins".</li>
+ <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named "features". Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of the Plug-ins
+ and/or Fragments associated with that Feature.</li>
+ <li>Features may also include other Features ("Included Features"). Within a Feature, files named "feature.xml" may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and
+Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+ <li>The top-level (root) directory</li>
+ <li>Plug-in and Fragment directories</li>
+ <li>Inside Plug-ins and Fragments packaged as JARs</li>
+ <li>Sub-directories of the directory named "src" of certain Plug-ins</li>
+ <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the
+installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+ <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+ <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+ <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+ <li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
+ <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+ <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+ another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+ possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
+</body>
+</html>
diff --git a/releng.wtpbuilder/scripts/build/build.xml b/releng.wtpbuilder/scripts/build/build.xml
deleted file mode 100644
index 0cc0bc7..0000000
--- a/releng.wtpbuilder/scripts/build/build.xml
+++ /dev/null
@@ -1,255 +0,0 @@
-<project default="runBuild">
-
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
- some variables, e.g. ones we set, since properties are case sensitive, even if
- the environment variables on your operating system are not, e.g. it will
- be ${env.Path} not ${env.PATH} on Windows -->
- <property environment="env" />
-
- <target name="runBuild">
- <dirname
- file="${ant.file}"
- property="scripts.build.dir" />
- <property
- name="wtp.builder.home"
- value="${scripts.build.dir}/../.." />
-
- <antcall target="runEclipseBuild">
- <param
- name="wtp.builder.home"
- value="${wtp.builder.home}" />
- </antcall>
- <antcall target="runEclipseBuildStamped">
- <param
- name="wtp.builder.home"
- value="${wtp.builder.home}" />
- </antcall>
- </target>
-
-
-
- <target
- name="build"
- depends="init">
-
- <!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
- <property
- name="buildingOSGi"
- value="true" />
-
- <!-- this generateFeatureVersionSuffix property causes feature
- suffixes to be calcuated based on their
- own CVS tag, plus the qualifier of their contained plugins -->
- <!--
- https://bugs.eclipse.org/bugs/show_bug.cgi?id=138825
- false for builds intended for 3.1.2, since can generate underscores
- true for builds instended for 3.2
- -->
- <property
- name="generateFeatureVersionSuffix"
- value="true" />
-
- <property
- name="outputUpdateJars"
- value="true" />
-
- <!--run the build for the specified component-->
- <echo message="basedir: ${basedir}" />
- <echo message="component: ${component}" />
- <echo message="buildDirectory: ${buildDirectory}" />
- <echo message="wtp.builder.home: ${wtp.builder.home}" />
-
- <ant
- antfile="build.xml"
- dir="${pde.build.scripts}">
- <property
- name="builder"
- value="${wtp.builder.home}/components/${component}" />
- <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="${wtp.builder.home}/scripts/dependency/build.xml" />
- <property
- name="local.cache.dir"
- value="${env.BUILD_HOME}/${build.local.repository}" />
- <property
- name="baseLocation"
- value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}/${base.location}" />
- <property
- name="buildBranch"
- value="${buildBranch}" />
- <property
- name="build.pack-all-in-one"
- value="${build.pack-all-in-one}" />
- <property
- name="buildRoot"
- value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}" />
- <property
- name="testRoot"
- value="${env.BUILD_HOME}/${build.tests}-${build.distribution}-${buildBranch}-${buildType}" />
- <property
- name="performanceRoot"
- value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
- </ant>
- </target>
-
- <target name="checkBaseBuilder">
- <available
- property="basebuilderLocal"
- file="${pde.builder.path}" />
- </target>
-
- <target
- name="getBaseBuilder"
- depends="checkBaseBuilder"
- unless="basebuilderLocal">
- <!-- *** change the repo info -->
- <property
- name="builderCvsRoot"
- value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
- <!-- note: the HEAD version of base builder is not good to use.
- in some cases, won't run at all, in the best of cases, will simply
- be unstable, as its the development version -->
- <property
- name="eclipse.builder.version"
- value="r311_vM20050914-1235" />
- <mkdir dir="${env.BUILD_HOME}/builders/${eclipse.builder.version}" />
- <cvs
- cvsRoot="${builderCvsRoot}"
- package="org.eclipse.releng.basebuilder"
- dest="${env.BUILD_HOME}/builders/${eclipse.builder.version}"
- tag="${eclipse.builder.version}" />
- </target>
-
-
- <target name="init">
-
-
- <condition
- property="buildBranch"
- value="R2.0">
- <equals
- arg1="${mapVersionTag}"
- arg2="HEAD" />
- </condition>
- <condition
- property="buildBranch"
- value="R0.7">
- <equals
- arg1="${mapVersionTag}"
- arg2="R0_7_maintenance" />
- </condition>
- <condition
- property="buildBranch"
- value="R1.0">
- <equals
- arg1="${mapVersionTag}"
- arg2="R1_0_maintenance" />
- </condition>
- <condition
- property="buildBranch"
- value="R1.5">
- <equals
- arg1="${mapVersionTag}"
- arg2="R1_5_maintenance" />
- </condition>
-
-
- <property file="${wtp.builder.home}/build.properties" />
- <touch file="${user.home}/.cvspass" />
-
- <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
- <property file="${buildDirectory}/label.properties" />
-
- <!--fetch the HEAD stream of all projects if build type specified as N-->
- <condition
- property="fetchTag"
- value="HEAD">
- <equals
- arg1="${buildType}"
- arg2="N" />
- </condition>
-
- <condition property="tagMaps">
- <equals
- arg1="${build.trial}"
- arg2="false" />
- </condition>
- </target>
-
- <target
- name="runEclipseBuild"
- if="buildId">
- <java
- taskname="build-${build.distribution}-${component}"
- classpath="${pde.builder.path}/startup.jar"
- fork="true"
- classname="org.eclipse.core.launcher.Main"
- failonerror="true">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
- <jvmarg value="-Dbuild.trial=${build.trial}" />
- <jvmarg value="-DbuildType=${buildType}" />
- <jvmarg value="-DbuildId=${buildId}" />
- <jvmarg value="-DjavacDebugInfo=${javacDebugInfo}" />
- <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
- <jvmarg value="-DcvsUser=${cvsUser}" />
- <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
- <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
- <jvmarg value="-Dbuild.distribution=${build.distribution}" />
- <jvmarg value="-Dcomponent=${component}" />
- <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
- <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
- <arg value="-application" />
- <arg value="org.eclipse.ant.core.antRunner" />
- <arg value="-buildfile" />
- <arg value="${ant.file}" />
- <arg value="build" />
- </java>
- </target>
-
- <target
- name="runEclipseBuildStamped"
- unless="buildId">
- <java
- taskname="build-${build.distribution}-${component}"
- classpath="${pde.builder.path}/startup.jar"
- fork="true"
- classname="org.eclipse.core.launcher.Main"
- failonerror="true">
- <jvmarg value="-Dosgi.ws=${basews}" />
- <jvmarg value="-Dosgi.os=${baseos}" />
- <jvmarg value="-Dosgi.arch=${basearch}" />
- <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
- <jvmarg value="-Dbuild.trial=${build.trial}" />
- <jvmarg value="-DbuildType=${buildType}" />
- <jvmarg value="-DjavacDebugInfo=${javacDebugInfo}" />
- <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
- <jvmarg value="-DcvsUser=${cvsUser}" />
- <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
- <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
- <jvmarg value="-Dbuild.distribution=${build.distribution}" />
- <jvmarg value="-Dcomponent=${component}" />
- <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
- <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
- <arg value="-application" />
- <arg value="org.eclipse.ant.core.antRunner" />
- <arg value="-buildfile" />
- <arg value="${ant.file}" />
- <arg value="build" />
- </java>
- </target>
-</project>
diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
index ea7192c..7f5a323 100644
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilities.xml
@@ -1,19 +1,40 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
- name="Build Utility Tasks"
+ name="buildutilities"
default="nodefault"
basedir=".">
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
+
+ <!-- if not otherwise set, use these default properties -->
<property
name="debugOptimization"
value="false" />
+ <property
+ name="normalizeJarFiles"
+ value="true" />
+ <property
+ name="packJarFiles"
+ value="false" />
<!-- ================================================================================== -->
<!-- -->
@@ -63,24 +84,9 @@
<!-- named normalized -->
<!-- -->
<!-- ================================================================================== -->
- <echo message="normalize jars" />
- <java
- jar="${pde.builder.path}/startup.jar"
- fork="true"
- jvm="${env.JAVA_5_HOME}/bin/java"
- failonerror="true"
- maxmemory="256m"
- dir="${buildDirectory}">
- <arg line="${logIfDebug}" />
- <arg line="-application org.eclipse.update.core.siteOptimizer" />
- <!-- note: this -processAll option is critical in this first step.
- For various reasons, jarProcessor is written to not act on
- any jar if the jar is not "marked", or if not told explicitly to
- to processAll
- -->
- <arg
- line="-jarProcessor ${verboseIfDebug} -processAll -outputDir ${tmpsite}/normalized -repack ${buildDirectory}/${buildLabel}/${archiveName}" />
- </java>
+ <echo message="normalize jars if desired ..." />
+ <antcall target="normalizeJarFiles" />
+ <echo message="normalized jars: ${normalizeJarFiles}" />
<!-- ================================================================================== -->
@@ -91,9 +97,11 @@
<!-- -->
<!-- ================================================================================== -->
<echo message="unzip normalized update jars to a holding place" />
+ <!-- previous 'normalize' step may have set archiveDir, but if not ... -->
+ <property name="archiveDir" value="${buildDirectory}/${buildLabel}" />
<unzip
dest="${tmpsite}"
- src="${tmpsite}/normalized/${archiveName}" />
+ src="${archiveDir}/${archiveName}" />
<!-- ================================================================================== -->
@@ -101,15 +109,10 @@
<!-- 3. copy all update jars to a common update site directory, if desired. -->
<!-- Note: overwite is false to avoid "touching" files already produced and -->
<!-- processed be previous steps in a larger build process. This means the updateSite -->
- <!-- *must* be complete clean before the larger process starts. -->
+ <!-- *must* be completely clean before the larger process starts. -->
<!-- -->
<!-- ================================================================================== -->
- <mkdir dir="${buildDirectory}/${buildLabel}/updateSite" />
- <copy
- todir="${buildDirectory}/${buildLabel}/updateSite"
- overwrite="false">
- <fileset dir="${tmpsite}/eclipse" />
- </copy>
+ <antcall target="makeCopyForUpdate" />
<!-- ================================================================================== -->
@@ -123,11 +126,10 @@
<!-- since developers wouldn't normally need it for a quick check of of a build. -->
<!-- -->
<!-- ================================================================================== -->
- <!-- <property
- name="doPack"
- value="true" /> -->
- <antcall target="createPackFilesIfDesired" />
+ <echo message="create pack files if desired ..." />
+ <antcall target="createPackFilesIfDesired" />
+ <echo message="created pack files: ${packJarFiles}" />
<!-- ================================================================================== -->
<!-- -->
@@ -204,6 +206,19 @@
value="true">
<istrue value="${debugOptimization}" />
</condition>
+ <condition
+ property="doNormalize"
+ value="true">
+ <istrue value="${normalizeJarFiles}" />
+ </condition>
+ <condition
+ property="doPack"
+ value="true">
+ <and>
+ <istrue value="${packJarFiles}" />
+ <istrue value="${normalizeJarFiles}" />
+ </and>
+ </condition>
</target>
@@ -213,6 +228,29 @@
<delete dir="${tmpsite}" />
</target>
+ <target
+ name="normalizeJarFiles"
+ if="doNormalize"
+ depends="init">
+ <property name="archiveDir" value="${tmpsite}/normalized" />
+ <java
+ jar="${pde.builder.path}/startup.jar"
+ fork="true"
+ jvm="${env.JAVA_5_HOME}/bin/java"
+ failonerror="true"
+ maxmemory="256m"
+ dir="${buildDirectory}">
+ <arg line="${logIfDebug}" />
+ <arg line="-application org.eclipse.update.core.siteOptimizer" />
+ <!-- note: this -processAll option is critical in this first step.
+ For various reasons, jarProcessor is written to not act on
+ any jar if the jar is not "marked", or if not told explicitly to
+ to processAll
+ -->
+ <arg
+ line="-jarProcessor ${verboseIfDebug} -processAll -outputDir ${archiveDir} -repack ${buildDirectory}/${buildLabel}/${archiveName}" />
+ </java>
+ </target>
<target
name="createPackFilesIfDesired"
@@ -232,6 +270,18 @@
</java>
</target>
+ <!-- no sense in making update dir, if not normalized -->
+ <target
+ name="makeCopyForUpdate"
+ if="doNormalize">
+ <mkdir dir="${buildDirectory}/${buildLabel}/updateSite" />
+ <copy
+ todir="${buildDirectory}/${buildLabel}/updateSite"
+ overwrite="false">
+ <fileset dir="${tmpsite}/eclipse" />
+ </copy>
+ </target>
+
<target
name="makeBackupCopyForDebugging"
if="keepIfDebug">
diff --git a/releng.wtpbuilder/scripts/build/label.xml b/releng.wtpbuilder/scripts/build/label.xml
index a66c63e..a97b8d9 100644
--- a/releng.wtpbuilder/scripts/build/label.xml
+++ b/releng.wtpbuilder/scripts/build/label.xml
@@ -1,12 +1,27 @@
<project
+ name="label"
default="label"
basedir=".">
- <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
some variables, e.g. ones we set, since properties are case sensitive, even if
the environment variables on your operating system are not, e.g. it will
be ${env.Path} not ${env.PATH} on Windows -->
<property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
<!-- Capture the computer name in a cross-platform manner -->
<property
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
new file mode 100644
index 0000000..bea21e3
--- /dev/null
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="runbuild" default="runbuild" basedir=".">
+
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
+
+ <target name="runbuild">
+ <dirname file="${ant.file}"
+ property="scripts.build.dir" />
+ <property name="wtp.builder.home"
+ value="${scripts.build.dir}/../.." />
+
+ <antcall target="runEclipseBuild">
+ <param name="wtp.builder.home"
+ value="${wtp.builder.home}" />
+ </antcall>
+ <antcall target="runEclipseBuildStamped">
+ <param name="wtp.builder.home"
+ value="${wtp.builder.home}" />
+ </antcall>
+ </target>
+
+
+
+ <target name="build" depends="init">
+
+ <!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
+ <property name="buildingOSGi" value="true" />
+
+ <!-- this generateFeatureVersionSuffix property causes feature
+ suffixes to be calcuated based on their
+ own CVS tag, plus the qualifier of their contained plugins -->
+ <!--
+ https://bugs.eclipse.org/bugs/show_bug.cgi?id=138825
+ false for builds intended for 3.1.2, since can generate underscores
+ true for builds instended for 3.2
+ -->
+ <property name="generateFeatureVersionSuffix"
+ value="true" />
+
+ <property name="outputUpdateJars" value="true" />
+
+ <!--run the build for the specified component-->
+ <echo message="basedir: ${basedir}" />
+ <echo message="component: ${component}" />
+ <echo message="buildDirectory: ${buildDirectory}" />
+ <echo message="wtp.builder.home: ${wtp.builder.home}" />
+
+ <ant antfile="build.xml" dir="${pde.build.scripts}">
+ <property name="builder"
+ value="${wtp.builder.home}/components/${component}" />
+ <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="${wtp.builder.home}/scripts/dependency/build.xml" />
+ <property name="local.cache.dir"
+ value="${env.LOCAL_PREREQS_CACHE}" />
+ <property name="baseLocation"
+ value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}/${base.location}" />
+ <property name="buildBranch"
+ value="${buildBranch}" />
+ <property name="build.pack-all-in-one"
+ value="${build.pack-all-in-one}" />
+ <property name="buildRoot"
+ value="${env.BUILD_HOME}/${build.current}-${build.distribution}-${buildBranch}-${buildType}" />
+ <property name="testRoot"
+ value="${env.BUILD_HOME}/${build.tests}-${build.distribution}-${buildBranch}-${buildType}" />
+ <property name="performanceRoot"
+ value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
+ </ant>
+ </target>
+
+ <target name="checkBaseBuilder">
+ <available property="basebuilderLocal"
+ file="${pde.builder.path}" />
+ </target>
+
+ <target name="getBaseBuilder"
+ depends="checkBaseBuilder"
+ unless="basebuilderLocal">
+ <!-- *** change the repo info -->
+ <property name="builderCvsRoot"
+ value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
+ <!-- note: the HEAD version of base builder is not good to use.
+ in some cases, won't run at all, in the best of cases, will simply
+ be unstable, as its the development version -->
+ <property name="eclipse.builder.version"
+ value="r311_vM20050914-1235" />
+ <mkdir dir="${env.BUILD_HOME}/builders/${eclipse.builder.version}" />
+ <cvs cvsRoot="${builderCvsRoot}"
+ package="org.eclipse.releng.basebuilder"
+ dest="${env.BUILD_HOME}/builders/${eclipse.builder.version}"
+ tag="${eclipse.builder.version}" />
+ </target>
+
+
+ <target name="init">
+
+
+ <condition property="buildBranch" value="R2.0">
+ <equals arg1="${mapVersionTag}" arg2="HEAD" />
+ </condition>
+ <condition property="buildBranch" value="R0.7">
+ <equals arg1="${mapVersionTag}"
+ arg2="R0_7_maintenance" />
+ </condition>
+ <condition property="buildBranch" value="R1.0">
+ <equals arg1="${mapVersionTag}"
+ arg2="R1_0_maintenance" />
+ </condition>
+ <condition property="buildBranch" value="R1.5">
+ <equals arg1="${mapVersionTag}"
+ arg2="R1_5_maintenance" />
+ </condition>
+
+
+ <property file="${wtp.builder.home}/build.properties" />
+ <touch file="${user.home}/.cvspass" />
+
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <property file="${buildDirectory}/label.properties" />
+
+ <!--fetch the HEAD stream of all projects if build type specified as N-->
+ <condition property="fetchTag" value="HEAD">
+ <equals arg1="${buildType}" arg2="N" />
+ </condition>
+
+ <condition property="tagMaps">
+ <equals arg1="${build.trial}" arg2="false" />
+ </condition>
+ </target>
+
+ <target name="runEclipseBuild" if="buildId">
+ <java taskname="build-${build.distribution}-${component}"
+ classpath="${pde.builder.path}/startup.jar"
+ fork="true"
+ classname="org.eclipse.core.launcher.Main"
+ failonerror="true">
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
+ <jvmarg value="-Dbuild.trial=${build.trial}" />
+ <jvmarg value="-DbuildType=${buildType}" />
+ <jvmarg value="-DbuildId=${buildId}" />
+ <jvmarg value="-DjavacDebugInfo=${javacDebugInfo}" />
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
+ <jvmarg value="-DcvsUser=${cvsUser}" />
+ <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
+ <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
+ <jvmarg value="-Dbuild.distribution=${build.distribution}" />
+ <jvmarg value="-Dcomponent=${component}" />
+ <jvmarg value="-DJ2SE-1.5=${env.J2SE15}" />
+ <jvmarg value="-DJ2SE-1.4=${env.J2SE14}" />
+ <arg value="-application" />
+ <arg value="org.eclipse.ant.core.antRunner" />
+ <arg value="-buildfile" />
+ <arg value="${ant.file}" />
+ <arg value="build" />
+ </java>
+ </target>
+
+ <target name="runEclipseBuildStamped" unless="buildId">
+ <java taskname="build-${build.distribution}-${component}"
+ classpath="${pde.builder.path}/startup.jar"
+ fork="true"
+ classname="org.eclipse.core.launcher.Main"
+ failonerror="true">
+ <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+ <jvmarg value="-Dosgi.os=${env.BASEOS}" />
+ <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+ <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
+ <jvmarg value="-Dbuild.trial=${build.trial}" />
+ <jvmarg value="-DbuildType=${buildType}" />
+ <jvmarg value="-DjavacDebugInfo=${javacDebugInfo}" />
+ <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
+ <jvmarg value="-DcvsUser=${cvsUser}" />
+ <jvmarg value="-DcvsProtocol=${cvsProtocol}" />
+ <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
+ <jvmarg value="-Dbuild.distribution=${build.distribution}" />
+ <jvmarg value="-Dcomponent=${component}" />
+ <jvmarg value="-DJ2SE-1.5=${env.J2SE15}" />
+ <jvmarg value="-DJ2SE-1.4=${env.J2SE14}" />
+ <arg value="-application" />
+ <arg value="org.eclipse.ant.core.antRunner" />
+ <arg value="-buildfile" />
+ <arg value="${ant.file}" />
+ <arg value="build" />
+ </java>
+ </target>
+</project>
diff --git a/releng.wtpbuilder/scripts/dependency/build.xml b/releng.wtpbuilder/scripts/dependency/build.xml
index 3326174..10b921b 100644
--- a/releng.wtpbuilder/scripts/dependency/build.xml
+++ b/releng.wtpbuilder/scripts/dependency/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
@@ -11,10 +11,10 @@
dependency.url : Url to a remote repository that will be used to download the library
dependency.file: Name of the library that is used. If the library is platform dependent
it must have suffixes such as: file.linux.gtk.x86
- These suffixes are the same as those useb by releng baseos,basews,basearch
+ These suffixes are the same as those used by releng baseos,basews,base arch
baseos= linux or win32
basews= gtk or win32
- basearch=x86
+ base arch=x86 or ppc
dependency.name: A short user readable name for the library.
dependency.description: One line description for the library.
dependency.autodownload: [optional] default true. Set this to false if the file cannot be
diff --git a/releng.wtpbuilder/scripts/dependency/template.xml b/releng.wtpbuilder/scripts/dependency/template.xml
index a3732b8..9d797a2 100644
--- a/releng.wtpbuilder/scripts/dependency/template.xml
+++ b/releng.wtpbuilder/scripts/dependency/template.xml
@@ -12,6 +12,24 @@
default="get">
<description>test dependencies</description>
+
+ <!-- Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Note: if baseos, basews, and basearch are "passed in" to this
+ file, then they take priority, and retain their value. Otherwise,
+ use the current environment. Normally, the current environment is
+ desired, but sometimes, such as for creating the "all in ones", it may
+ be desired to "get" packages for other combinations.
+ -->
+ <property name="baseos" value="${env.BASEOS}" />
+ <property name="basews" value="${env.BASEWS}" />
+ <property name="basearch" value="${env.BASEARCH}" />
+
<!-- =================================
target: get
================================= -->
diff --git a/releng.wtpbuilder/scripts/upload/upload.xml b/releng.wtpbuilder/scripts/upload/upload.xml
new file mode 100644
index 0000000..3e0c057
--- /dev/null
+++ b/releng.wtpbuilder/scripts/upload/upload.xml
@@ -0,0 +1,72 @@
+<project name="upload" default="upload" basedir=".">
+
+ <!-- if site-sub-dir not set by caller, assume its committers -->
+ <property name="site-sub-dir" value="committers" />
+
+ <!-- = = = standard properties pattern = = = -->
+ <!--
+ Note to be cross-platform, "environment variables" are only appropriate for
+ some variables, e.g. ones we set, since properties are case sensitive, even if
+ the environment variables on your operating system are not, e.g. it will
+ be ${env.Path} not ${env.PATH} on Windows -->
+ <property environment="env" />
+
+ <!--
+ Let users override standard properties, if desired.
+ If directory, file, or some properties do not exist,
+ then standard properties will be used.
+ -->
+ <property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+
+ <!-- load standard properties for production environment -->
+ <property file="${env.STANDARD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+ <!-- = = = end standard properties pattern = = = -->
+
+
+ <!-- if not otherwise set, these are standard properties -->
+ <property name="build.upload" value="true" />
+
+
+ <property name="uploadUser" value="david_williams" />
+ <property name="uploadPassword" value="This is not really used since ssh login is assumed (required)" />
+ <property name="uploadServer" value="download.eclipse.org" />
+ <property name="uploadRemoteDirectory" value="/home/data/users/${uploadUser}/downloads/webtools/${site-sub-dir}/drops/${buildBranch}" />
+ <!-- rsyncRootPrefix should be empty for Linux machines. -->
+ <!-- But, Windows using cygwin will need something like /cygdrive/G/ -->
+ <!-- for what ever drive or directory is parent of build home -->
+ <property name="rsyncRootPrefix" value="" />
+ <!-- end standard properties -->
+
+
+
+ <target name="upload"
+ depends="check.upload"
+ if="doUpload">
+
+
+
+ <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+ <property file="${buildDirectory}/label.properties" />
+
+ <echo message="chmod for ${buildDirectory}/${buildLabel}" />
+ <!-- synch on host is a tiny bit faster if permisions already set -->
+ <!-- and, remember, chmod ant task is implemented only for unix -->
+ <!-- TODO: put in windows logic here? -->
+ <exec executable="chmod">
+ <arg line="-Rc o+rx ${buildDirectory}/${buildLabel}" />
+ </exec>
+
+ <echo message="RSYNC to: ${uploadRemoteDirectory}/${buildLabel}" />
+
+ <exec executable="rsync">
+ <arg line="-e ssh -Cavz ${rsyncRootPrefix}${buildDirectory}/${buildLabel} ${uploadUser}@${uploadServer}:${uploadRemoteDirectory}" />
+ </exec>
+ </target>
+
+ <target name="check.upload">
+ <condition property="doUpload">
+ <equals arg1="${build.upload}" arg2="true" />
+ </condition>
+ </target>
+
+</project>