diff options
| author | David Williams | 2015-10-05 00:08:24 +0000 |
|---|---|---|
| committer | David Williams | 2015-10-05 00:08:24 +0000 |
| commit | d13dbb906b92c5b09fa9b1e92d318ca17100e7aa (patch) | |
| tree | 65204bbc1e34d316eedb18d1366d7273829a2f8e /scripts | |
| parent | 63fbc7930d983fd05f5114c4f7fa2bf685c7eb32 (diff) | |
| download | eclipse.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
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/xsl/upVersionParents.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/xsl/upVersionParents.sh b/scripts/xsl/upVersionParents.sh index a1473dfa4..5d9cc10a0 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}"} |