aboutsummaryrefslogtreecommitdiffstats
path: root/make/scripts/setenv-build-jogl-x86.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-06-20 04:29:21 +0200
committerSven Gothel <[email protected]>2013-06-20 04:29:21 +0200
commit6704fab767307b89fa21250c20f1dab56323ffac (patch)
treeac7b5460d6f706188b2a8c75f8fa2adb592723df /make/scripts/setenv-build-jogl-x86.sh
parent6c30050195849cd385422fc6e65230c16b818215 (diff)
Bug 758: Fix scripts and ant build files to work w/ Java7 (default now) producing Java6 bytecode ; Apply JAR Manifest tags: Sealed, Permissions and Codebase
Diffstat (limited to 'make/scripts/setenv-build-jogl-x86.sh')
-rw-r--r--make/scripts/setenv-build-jogl-x86.sh40
1 files changed, 32 insertions, 8 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh
index 5c56da4..d203c09 100644
--- a/make/scripts/setenv-build-jogl-x86.sh
+++ b/make/scripts/setenv-build-jogl-x86.sh
@@ -19,18 +19,42 @@ if [ -z "$ANT_PATH" ] ; then
exit
fi
-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
+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
-if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then
- J2RE_HOME=/opt-solaris-x86/jre6
- JAVA_HOME=/opt-solaris-x86/j2se6
- PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
- export J2RE_HOME JAVA_HOME
+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
+ 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-solaris-x86/jre7 -a -e /opt-solaris-x86/j2se7 ] ; then
+ J2RE_HOME=/opt-solaris-x86/jre7
+ JAVA_HOME=/opt-solaris-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-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then
+ J2RE_HOME=/opt-solaris-x86/jre6
+ JAVA_HOME=/opt-solaris-x86/j2se6
+ PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH
+ export J2RE_HOME JAVA_HOME
+ FOUND_JAVA=1
+ fi
fi
export PATH