From fcde400cccd352cc13ff1f21945f330fcd94fbb7 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 28 Aug 2014 06:28:27 +0200
Subject: scripts: favor java8 on 32bit like we do on 64bit
---
make/scripts/setenv-build-jogl-x86.sh | 16 +++++++++++++---
1 file 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,14 +19,24 @@ 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
--
cgit v1.2.3