diff options
8 files changed, 20 insertions, 18 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml index 8e912cf76..193f25527 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml @@ -25,13 +25,13 @@ value="${TMP_DIR}"> <isset property="TMP_DIR" /> </condition> - + <condition property="TMP" value="${env.BUILD_ROOT}/tmp"> <isset property="${env.BUILD_ROOT}" /> </condition> - + <condition property="TMP" value="${BUILD_ROOT}/tmp"> @@ -126,6 +126,8 @@ name="folderName" value="org.eclipse.releng.basebuilder" /> + <property name="java8vmbindir" value="/shared/common/jdk1.8.0_x64-latest/bin/" /> + <property name="getBaseBuilderInitialized" value="true" /> @@ -149,27 +151,25 @@ dest="${TMP}/${platformFile}" src="${platformURL}/${platformFile}" usetimestamp="true" /> - <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641 - <untar + <untar compression="gzip" src="${TMP}/${platformFile}" dest="${TMP}"> - </untar> - --> - <exec + </untar> + <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641 + <exec executable="/bin/tar" dir="${TMP}"> <arg value="-xf" /> <arg value="${TMP}/${platformFile}" /> - </exec> - + </exec> + --> <chmod perm="ugo+x"> <fileset dir="${TMP}/eclipse"> <include name="eclipse" /> <include name="*.so*" /> </fileset> </chmod> - <!-- TODO: We should specify concrete JAVA_HOME (or, JRE directory) --> <exec dir="${TMP}/eclipse" failonerror="true" @@ -186,6 +186,8 @@ <arg value="-installIU" /> <arg value="${apiTools.iu}/${apiTools.iu.version},${buildTools.feature}/${buildTools.feature.version},${webtools.feature}/${webtools.feature.version}" /> + <arg value="-vm" /> + <arg value="${java8vmbindir}" /> <!-- vmargs must come last --> <arg value="-vmargs" /> <arg value="-Djava.io.tmpdir=${TMP}" /> diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests index 0719c253d..9bfff04c6 100644 --- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests +++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests @@ -9,7 +9,7 @@ // a recent copy. This was copied circa July 8, 2014. // properties written for N20140707-2000 -$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.2/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; +$PATH = "/shared/common/jdk1.7.0-latest/bin:/shared/common/apache-maven-3.1.1/bin:/shared/common/apache-ant-1.9.6/bin:/usr/local/bin:/usr/bin:/bin:/opt/buildhomes/e4Build/bin"; $INITIAL_ENV_FILE = "/shared/eclipse/builds/4N/production/build_eclipse_org.shsource"; $BUILD_ROOT = "/shared/eclipse/builds/4N"; $BRANCH = "master"; diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource index 58ee9f61c..e83283eac 100644 --- a/production/build_eclipse_org.shsource +++ b/production/build_eclipse_org.shsource @@ -51,7 +51,7 @@ export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest} # required for when ant is used. Unclear how maven's "antrun" finds its version of Ant, # built in? Or system path? # But, without the ANT_OPTS, we do get messages about "to get repeatable builds, to ignore sysclasspath" -export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.2} +export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.6} export ANT_OPTS=${ANT_OPTS:-"-Dbuild.sysclasspath=ignore -Dincludeantruntime=false"} # # remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden) diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh index e5f8b56be..68ece2235 100755 --- a/production/sdk/collect.sh +++ b/production/sdk/collect.sh @@ -38,7 +38,7 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}} -export ANT_HOME=/shared/common/apache-ant-1.9.2 +export ANT_HOME=/shared/common/apache-ant-1.9.6 export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH @@ -59,7 +59,7 @@ echo "eclipseStream: $eclipseStream" echo "EBUILDER_HASH: $EBUILDER_HASH" ${ANT_HOME}/bin/ant -version -# -lib /shared/common/apache-ant-1.9.2/lib/ \ +# -lib /shared/common/apache-ant-1.9.6/lib/ \ ${ANT_HOME}/bin/ant -f /shared/eclipse/sdk/collectTestResults.xml \ -Djob=${job} \ -DbuildNumber=${buildNumber} \ diff --git a/production/sdk/promotion/startTests.sh b/production/sdk/promotion/startTests.sh index 6a77af887..b89cbb7e5 100755 --- a/production/sdk/promotion/startTests.sh +++ b/production/sdk/promotion/startTests.sh @@ -10,7 +10,7 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} # need to be running Java 6 and Ant 1.8 for <script> to work in invokeTestsJSON # and, default on current build system is Ant 1.7 ... so ... -export ANT_HOME=/shared/common/apache-ant-1.9.2 +export ANT_HOME=/shared/common/apache-ant-1.9.6 function usage () { printf "\t\t%s\n" "usage: " diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh index 4eba0c3aa..8c45a8ead 100755 --- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh +++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh @@ -36,7 +36,7 @@ unset JRE_HOME # have ant 1.6 set as 'default'!) #export ANT_HOME=/shared/common/apache-ant-1.7.1 export ANT_HOME=/shared/common/apache-ant-1.8.4/ -#export ANT_HOME=/shared/common/apache-ant-1.9.2 +#export ANT_HOME=/shared/common/apache-ant-1.9.6 # JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, # it also becomes the instance that runs the tests. diff --git a/production/testScripts/startTests.sh b/production/testScripts/startTests.sh index f5a22e0b3..d29c63532 100755 --- a/production/testScripts/startTests.sh +++ b/production/testScripts/startTests.sh @@ -10,7 +10,7 @@ export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds} # need to be running Java 6 and Ant 1.8 for <script> to work in invokeTestsJSON # and, default on current build system is Ant 1.7 ... so ... -export ANT_HOME=/shared/common/apache-ant-1.9.2 +export ANT_HOME=/shared/common/apache-ant-1.9.6 function usage () { diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh index 63d7143b6..3222d6a1d 100755 --- a/production/testScripts/test_runTests2.xml.sh +++ b/production/testScripts/test_runTests2.xml.sh @@ -37,7 +37,7 @@ source localBuildProperties.shsource 2>/dev/null # have ant 1.6 set as 'default'!) #export ANT_HOME=/shared/common/apache-ant-1.7.1 #export ANT_HOME=/shared/common/apache-ant-1.8.4/ -export ANT_HOME=/shared/common/apache-ant-1.9.2 +export ANT_HOME=/shared/common/apache-ant-1.9.6 # JAVA_HOME is, at least, what runs the ant instance. If no 'jvm' option is specified, # it also becomes the instance that runs the tests. |