Skip to content

Commit d13dbb9

Browse files
DavidWilliamsDavidWilliams
committed
[releng] clean up and be consistent with JAVA_HOME definition
1 parent 63fbc79 commit d13dbb9

File tree

14 files changed

+24
-19
lines changed

14 files changed

+24
-19
lines changed

‎eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/buildproperties.phpHoldForLocalTests

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ $STREAM = "4.5.0";
1717
$BUILD_TYPE = "N";
1818
$TIMESTAMP = "20140707-2000";
1919
$TMP_DIR = "/shared/eclipse/builds/4N/tmp";
20-
$JAVA_HOME = "/shared/common/jdk1.7.0-latest";
20+
$JAVA_HOME = "/shared/common/jdk1.8.0_x64-latest";
2121
$MAVEN_OPTS = "-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=/shared/eclipse/builds/4N/tmp -Dtycho.localArtifacts=ignore;
2222
$MAVEN_PATH = "/shared/common/apache-maven-3.1.1/bin";
2323
$AGGREGATOR_REPO = "file:///gitroot/platform/eclipse.platform.releng.aggregator.git";

‎production/build_eclipse_org.shsource

-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp}
4747
mkdir -p ${TMP_DIR}
4848

4949
# these could be machine specific
50-
#export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
5150
export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.8.0_x64-latest}
5251
# required for when ant is used. Unclear how maven's "antrun" finds its version of Ant,
5352
# built in? Or system path?

‎production/sdk/cleaners/cleanupNightlyRepo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ function cleanNightlyRepo ()
123123
exit 1
124124
fi
125125
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
126-
export JAVA_HOME=${JAVA_8_HOME}
126+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
127127
javaexe=${JAVA_HOME}/jre/bin/java
128128
if [[ ! -x ${javaexe} ]]
129129
then

‎production/sdk/collect.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ echo "umask explicitly set to 0002, old value was $oldumask"
3636
source localBuildProperties.shsource 2>/dev/null
3737
export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
3838

39-
export JAVA_HOME=/shared/common/jdk1.7.0-latest
39+
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
40+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
4041
export ANT_HOME=/shared/common/apache-ant-1.9.2
4142

4243
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:$PATH

‎production/sdk/promoteStableRelease/promoteImpl/promoteUtilities.shsource

+2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
22

3+
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
4+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
35
export JAVA_HOME=/shared/common/jdk1.7.0-latest
46
export JAVA_EXEC_DIR=${JAVA_HOME}/bin
57
export JAVA_CMD=${JAVA_EXEC_DIR}/java

‎production/sdk/promotion/runAntRunner.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,9 @@ then
6969
exit 1
7070
fi
7171

72-
if [[ -z "${JAVA_HOME}" ]]
73-
then
74-
export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
75-
fi
72+
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
73+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
74+
7675
if [[ ! -d "${JAVA_HOME}" ]]
7776
then
7877
echo "ERROR: JAVA_HOME did not exist."

‎production/sdk/testsummaries/runAntRunner.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
3535
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
3636
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
3737

38-
export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
38+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
3939

4040
devJRE=$JAVA_HOME/jre/bin/java
4141

‎production/sdk/testsummaries/standardVariables.shsource

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk-1.6.0_26.x86_64}
3333
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
3434
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
3535

36-
export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
36+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
3737

3838
devJRE=$JAVA_HOME/jre/bin/java
3939

‎production/sdk/updaterepo/cleanComposite.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
99
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
1010
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
1111

12-
export JAVA_HOME=${JAVA_8_HOME}
12+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
1313

1414
devJRE="${JAVA_HOME}/bin/java"
1515

‎production/sdk/updaterepo/updateGenericComposites.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ JAVA_6_HOME=${JAVA_6_HOME:-/shared/common/jdk1.6.0-latest}
1919
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
2020
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
2121

22-
export JAVA_HOME=${JAVA_8_HOME}
22+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
2323

2424
devJRE="${JAVA_HOME}"/bin/java
2525

‎production/testScripts/configuration/sdk.tests/testScripts/testTestXMLScript.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ export ANT_HOME=/shared/common/apache-ant-1.8.4/
4343
#export JAVA_HOME=/shared/common/jdk1.5.0-latest
4444
#export JAVA_HOME=/shared/common/jdk1.6.0-latest
4545
#export JAVA_HOME=/shared/common/jdk1.7.0-latest
46-
#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
47-
export JAVA_HOME=/shared/common/jdk1.7.0-latest
4846

47+
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
48+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
4949
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin
5050

5151
export TESTING_TEST_XML=true

‎production/testScripts/test_runTests2.xml.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ export ANT_HOME=/shared/common/apache-ant-1.9.2
4444
#export JAVA_HOME=/shared/common/jdk1.5.0-latest
4545
#export JAVA_HOME=/shared/common/jdk1.6.0-latest
4646
#export JAVA_HOME=/shared/common/jdk1.7.0-latest
47-
#export JAVA_HOME=/shared/common/jdk1.8.0_x64-latest
47+
JAVA_8_HOME=/shared/common/jdk1.8.0_x64-latest
48+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
4849

49-
export JAVA_HOME=/shared/common/jdk1.7.0-latest
50-
# added /opt/local/bin for 'port' versoin of wget, on Mac
50+
# added /opt/local/bin for 'port' version of wget, on Mac
5151
export PATH=${JAVA_HOME}/bin:${ANT_HOME}/bin:/usr/local/bin:/usr/bin:/bin:${HOME}/bin:/opt/local/bin
5252

5353
# Be sure to set to a "fresh" non-cluttered area, so can be easily cleaned up.

‎production/testScripts/updateTestResultsPages.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ fi
105105
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
106106
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
107107

108-
export JAVA_HOME=${JAVA_HOME:-${JAVA_7_HOME}}
108+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
109109

110110
devJRE=$JAVA_HOME/jre/bin/java
111111

‎scripts/xsl/upVersionParents.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ LOG=$(pwd)/log_$( date +%Y%m%d%H%M%S ).txt
77
exec >>$LOG 2>&1
88

99
LREPO=$(pwd)/../localMavenRepo
10-
export JAVA_HOME=${JAVA_HOME:-/shared/common/jdk1.7.0-latest}
10+
11+
JAVA_7_HOME=${JAVA_7_HOME:-/shared/common/jdk1.7.0-latest}
12+
JAVA_8_HOME=${JAVA_8_HOME:-/shared/common/jdk1.8.0_x64-latest}
13+
export JAVA_HOME=${JAVA_HOME:-${JAVA_8_HOME}}
14+
1115
TMP_DIR=${TMP_DIR:-$(pwd)/../tmp}
1216
mkdir -p $TMP_DIR
1317
export MAVEN_OPTS=${MAVEN_OPTS:-"-Xmx2560m -XX:MaxPermSize=256M -Djava.io.tmpdir=${TMP_DIR}"}

0 commit comments

Comments
 (0)