diff options
| author | Sven Gothel <[email protected]> | 2013-06-20 04:29:21 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-06-20 04:29:21 +0200 |
| commit | 6704fab767307b89fa21250c20f1dab56323ffac (patch) | |
| tree | ac7b5460d6f706188b2a8c75f8fa2adb592723df /make/scripts/setenv-build-jogl-x86_64.sh | |
| parent | 6c30050195849cd385422fc6e65230c16b818215 (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_64.sh')
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index 6b2a66e..7b71378 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -26,25 +26,45 @@ if [ -z "$ANT_PATH" ] ; then exit fi -if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then - J2RE_HOME=/opt-linux-x86_64/jre6 - JAVA_HOME=/opt-linux-x86_64/j2se6 +if [ -e /opt-linux-x86_64/jre7 -a -e /opt-linux-x86_64/j2se7 ] ; then + J2RE_HOME=/opt-linux-x86_64/jre7 + JAVA_HOME=/opt-linux-x86_64/j2se7 PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH export J2RE_HOME JAVA_HOME -elif [ -e /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then - # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin - # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM - J2RE_HOME=/usr/java/jre/bin/amd64 - JAVA_HOME=/usr/java/bin/amd64 - PATH=$J2RE_HOME:$JAVA_HOME:$PATH - export J2RE_HOME JAVA_HOME -elif [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then - # make a symbolic link: /opt-solaris-x86_64/jre6/bin/amd64/bin$ ln -s . bin - # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM - J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64 - JAVA_HOME=/opt-solaris-x86_64/j2se6/bin/amd64 - PATH=$J2RE_HOME:$JAVA_HOME:$PATH - export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 +fi + +if [ -z "$FOUND_JAVA" ] ; then + if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then + J2RE_HOME=/opt-linux-x86_64/jre6 + JAVA_HOME=/opt-linux-x86_64/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 /usr/java/jre/bin/amd64 -a -e /usr/java/bin/amd64 ] ; then + # make a symbolic link: /usr/java/bin/amd64/bin$ ln -s . bin + # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM + J2RE_HOME=/usr/java/jre/bin/amd64 + JAVA_HOME=/usr/java/bin/amd64 + PATH=$J2RE_HOME:$JAVA_HOME:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi +fi +if [ -z "$FOUND_JAVA" ] ; then + if [ -e /opt-solaris-x86_64/jre7 -a -e /opt-solaris-x86_64/j2se7 ] ; then + # make a symbolic link: /opt-solaris-x86_64/jre7/bin/amd64/bin$ ln -s . bin + # since ant looks for $JAVA_HOME/bin/java and we need to force the 64bit JVM + J2RE_HOME=/opt-solaris-x86_64/jre7/bin/amd64 + JAVA_HOME=/opt-solaris-x86_64/j2se7/bin/amd64 + PATH=$J2RE_HOME:$JAVA_HOME:$PATH + export J2RE_HOME JAVA_HOME + FOUND_JAVA=1 + fi fi export PATH |