aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-08-28 06:28:27 +0200
committerSven Gothel <[email protected]>2014-08-28 06:28:27 +0200
commitfcde400cccd352cc13ff1f21945f330fcd94fbb7 (patch)
treed7fff05bee5951e85628af6ada06deb33ea50dd9 /make/scripts/setenv-build-jogl-x86.sh
parent9bc3d3f78bb2fb1aa0ccfb02ffb5bdda74420cac (diff)
scripts: favor java8 on 32bit like we do on 64bit
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86.sh16
1 files changed, 13 insertions, 3 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index ce055ba..5e4e542 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -19,15 +19,25 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-if [ -e /opt-linux-x86/jre7 -a -e /opt-linux-x86/j2se7 ] ; then
- J2RE_HOME=/opt-linux-x86/jre7
- JAVA_HOME=/opt-linux-x86/j2se7
+if [ -e /opt-linux-x86/jre8 -a -e /opt-linux-x86/j2se8 ] ; then
+ J2RE_HOME=/opt-linux-x86/jre8
+ JAVA_HOME=/opt-linux-x86/j2se8
PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
export J2RE_HOME JAVA_HOME
FOUND_JAVA=1
fi
if [ -z "$FOUND_JAVA" ] ; then
+ if [ -e /opt-linux-x86/jre7 -a -e /opt-linux-x86/j2se7 ] ; then
+ J2RE_HOME=/opt-linux-x86/jre7
+ JAVA_HOME=/opt-linux-x86/j2se7
+ PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+ export J2RE_HOME JAVA_HOME
+ FOUND_JAVA=1
+ fi
+fi
+
+if [ -z "$FOUND_JAVA" ] ; then
if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then
J2RE_HOME=/opt-linux-x86/jre6
JAVA_HOME=/opt-linux-x86/j2se6