Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2015-10-04 20:08:24 -0400
committerDavid Williams2015-10-04 20:08:24 -0400
commitd13dbb906b92c5b09fa9b1e92d318ca17100e7aa (patch)
tree65204bbc1e34d316eedb18d1366d7273829a2f8e
parent63fbc7930d983fd05f5114c4f7fa2bf685c7eb32 (diff)
downloadeclipse.platform.releng.aggregator-d13dbb906b92c5b09fa9b1e92d318ca17100e7aa.tar.gz
eclipse.platform.releng.aggregator-d13dbb906b92c5b09fa9b1e92d318ca17100e7aa.tar.xz
eclipse.platform.releng.aggregator-d13dbb906b92c5b09fa9b1e92d318ca17100e7aa.zip
[releng] clean up and be consistent with JAVA_HOME definition
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests2
-rw-r--r--production/build_eclipse_org.shsource1
-rwxr-xr-xproduction/sdk/cleaners/cleanupNightlyRepo.sh2
-rwxr-xr-xproduction/sdk/collect.sh3
-rw-r--r--production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource2
-rwxr-xr-xproduction/sdk/promotion/runAntRunner.sh7
-rwxr-xr-xproduction/sdk/testsummaries/runAntRunner.sh2
-rw-r--r--production/sdk/testsummaries/standardVariables.shsource2
-rwxr-xr-xproduction/sdk/updaterepo/cleanComposite.sh2
-rwxr-xr-xproduction/sdk/updaterepo/updateGenericComposites.sh2
-rwxr-xr-xproduction/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh4
-rwxr-xr-xproduction/testScripts/test_runTests2.xml.sh6
-rwxr-xr-xproduction/testScripts/updateTestResultsPages.sh2
-rwxr-xr-xscripts/xsl/upVersionParents.sh6
14 files changed, 24 insertions, 19 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
index 668ad46d..0719c253 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests
@@ -17,7 +17,7 @@ $STREAM = "4.5.0";
$BUILD_TYPE = "N";
$TIMESTAMP = "20140707-2000";
$TMP_DIR = "/shared/eclipse/builds/4N/tmp";
-$JAVA_HOME = "/shared/common/jdk1.7.0-latest";
+$JAVA_HOME = "/shared/common/jdk1.8.0_x64-latest";
$MAVEN_OPTS = "-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore;
$MAVEN_PATH = "/shared/common/apache-maven-3.1.1/bin";
$AGGREGATOR_REPO = "file:///gitroot/platform/eclipse.platform.releng.aggregator.git";
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
index dcd9e6a0..7ecdaeef 100644
--- a/production/build_eclipse_org.shsource
+++ b/production/build_eclipse_org.shsource
@@ -47,7 +47,6 @@ export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp}
mkdir -p ${TMP_DIR}
# these could be machine specific
-#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
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?
diff --git a/production/sdk/cleaners/cleanupNightlyRepo.sh b/production/sdk/cleaners/cleanupNightlyRepo.sh
index d35e0e0a..2f3f918d 100755
--- a/production/sdk/cleaners/cleanupNightlyRepo.sh
+++ b/production/sdk/cleaners/cleanupNightlyRepo.sh
@@ -123,7 +123,7 @@ function cleanNightlyRepo ()
exit 1
fi
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
- export JAVA_HOME=${JAVA_8_HOME}
+ export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
javaexe=${JAVA_HOME}/jre/bin/java
if [[ ! -x ${javaexe} ]]
then
diff --git a/production/sdk/collect.sh b/production/sdk/collect.sh
index 2cb2ca6f..e5f8b56b 100755
--- a/production/sdk/collect.sh
+++ b/production/sdk/collect.sh
@@ -36,7 +36,8 @@ echo "umask explicitly set to 0002, old value was $oldumask"
source localBuildProperties.shsource 2>/dev/null
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-export JAVA_HOME=/shared/common/jdk1.7.0-latest
+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 PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH
diff --git a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource
index 65cf9c50..743bca65 100644
--- a/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource
+++ b/production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
+JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
export JAVA_HOME=/shared/common/jdk1.7.0-latest
export JAVA_EXEC_DIR=${JAVA_HOME}/bin
export JAVA_CMD=${JAVA_EXEC_DIR}/java
diff --git a/production/sdk/promotion/runAntRunner.sh b/production/sdk/promotion/runAntRunner.sh
index 19fd581f..1acfe407 100755
--- a/production/sdk/promotion/runAntRunner.sh
+++ b/production/sdk/promotion/runAntRunner.sh
@@ -69,10 +69,9 @@ then
exit 1
fi
-if [[ -z "${JAVA_HOME}" ]]
-then
- export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
-fi
+JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
+
if [[ ! -d "${JAVA_HOME}" ]]
then
echo "ERROR: JAVA_HOME did not exist."
diff --git a/production/sdk/testsummaries/runAntRunner.sh b/production/sdk/testsummaries/runAntRunner.sh
index d2841592..6a88df9e 100755
--- a/production/sdk/testsummaries/runAntRunner.sh
+++ b/production/sdk/testsummaries/runAntRunner.sh
@@ -35,7 +35,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
-export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
devJRE=$JAVA_HOME/jre/bin/java
diff --git a/production/sdk/testsummaries/standardVariables.shsource b/production/sdk/testsummaries/standardVariables.shsource
index 5880eb9c..e52257c2 100644
--- a/production/sdk/testsummaries/standardVariables.shsource
+++ b/production/sdk/testsummaries/standardVariables.shsource
@@ -33,7 +33,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk-1.6.0_26.x86_64}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
-export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
devJRE=$JAVA_HOME/jre/bin/java
diff --git a/production/sdk/updaterepo/cleanComposite.sh b/production/sdk/updaterepo/cleanComposite.sh
index 4d13b95a..514fecc7 100755
--- a/production/sdk/updaterepo/cleanComposite.sh
+++ b/production/sdk/updaterepo/cleanComposite.sh
@@ -9,7 +9,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
-export JAVA_HOME=${JAVA_8_HOME}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
devJRE="${JAVA_HOME}/bin/java"
diff --git a/production/sdk/updaterepo/updateGenericComposites.sh b/production/sdk/updaterepo/updateGenericComposites.sh
index 48ec931b..5a4023bc 100755
--- a/production/sdk/updaterepo/updateGenericComposites.sh
+++ b/production/sdk/updaterepo/updateGenericComposites.sh
@@ -19,7 +19,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
-export JAVA_HOME=${JAVA_8_HOME}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
devJRE="${JAVA_HOME}"/bin/java
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
index 373b3db3..4eba0c3a 100755
--- a/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
+++ b/production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh
@@ -43,9 +43,9 @@ export ANT_HOME=/shared/common/apache-ant-1.8.4/
#export JAVA_HOME=/shared/common/jdk1.5.0-latest
#export JAVA_HOME=/shared/common/jdk1.6.0-latest
#export JAVA_HOME=/shared/common/jdk1.7.0-latest
-#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
-export JAVA_HOME=/shared/common/jdk1.7.0-latest
+JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin
export TESTING_TEST_XML=true
diff --git a/production/testScripts/test_runTests2.xml.sh b/production/testScripts/test_runTests2.xml.sh
index e0b7d66e..63d7143b 100755
--- a/production/testScripts/test_runTests2.xml.sh
+++ b/production/testScripts/test_runTests2.xml.sh
@@ -44,10 +44,10 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2
#export JAVA_HOME=/shared/common/jdk1.5.0-latest
#export JAVA_HOME=/shared/common/jdk1.6.0-latest
#export JAVA_HOME=/shared/common/jdk1.7.0-latest
-#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
+JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
-export JAVA_HOME=/shared/common/jdk1.7.0-latest
-# added /opt/local/bin for 'port' versoin of wget, on Mac
+# added /opt/local/bin for 'port' version of wget, on Mac
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin:/opt/local/bin
# Be sure to set to a "fresh" non-cluttered area, so can be easily cleaned up.
diff --git a/production/testScripts/updateTestResultsPages.sh b/production/testScripts/updateTestResultsPages.sh
index abbb4b9b..045b2399 100755
--- a/production/testScripts/updateTestResultsPages.sh
+++ b/production/testScripts/updateTestResultsPages.sh
@@ -105,7 +105,7 @@ fi
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
-export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
devJRE=$JAVA_HOME/jre/bin/java
diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh
index a1473dfa..5d9cc10a 100755
--- a/scripts/xsl/upVersionParents.sh
+++ b/scripts/xsl/upVersionParents.sh
@@ -7,7 +7,11 @@ LOG=$(pwd)/log_$( date +%Y%m%d%H%M%S ).txt
exec >>$LOG 2>&1
LREPO=$(pwd)/../localMavenRepo
-export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
+
+JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
+JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
+export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
+
TMP_DIR=${TMP_DIR:-$(pwd)/../tmp}
mkdir -p $TMP_DIR
export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"}

Back to the top