From 6704fab767307b89fa21250c20f1dab56323ffac Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 20 Jun 2013 04:29:21 +0200
Subject: 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

---
 .../make.gluegen.all.android-armv6-cross.sh        |  6 +++
 .../make.gluegen.all.android-armv7-cross.sh        |  6 +++
 make/scripts/make.gluegen.all.linux-armv6-cross.sh |  6 +++
 make/scripts/make.gluegen.all.linux-armv6.sh       |  2 +
 .../make.gluegen.all.linux-armv6hf-cross.sh        |  5 ++
 make/scripts/make.gluegen.all.linux-armv6hf.sh     |  2 +
 make/scripts/make.gluegen.all.linux-x86.sh         |  6 +++
 .../scripts/make.gluegen.all.linux-x86_64.java7.sh | 25 ----------
 make/scripts/make.gluegen.all.linux-x86_64.sh      | 13 ++++--
 make/scripts/make.gluegen.all.macosx-java7.sh      |  2 +
 .../make.gluegen.all.macosx-java7_target16.sh      | 22 ---------
 make/scripts/make.gluegen.all.macosx.sh            | 16 +++++--
 make/scripts/make.gluegen.all.win32.bat            | 10 +++-
 make/scripts/make.gluegen.all.win64.bat            | 10 +++-
 make/scripts/runtest.sh                            |  4 +-
 make/scripts/setenv-build-jogl-x86.sh              | 40 ++++++++++++----
 make/scripts/setenv-build-jogl-x86_64.java7.sh     | 52 ---------------------
 make/scripts/setenv-build-jogl-x86_64.sh           | 54 +++++++++++++++-------
 18 files changed, 142 insertions(+), 139 deletions(-)
 delete mode 100755 make/scripts/make.gluegen.all.linux-x86_64.java7.sh
 delete mode 100755 make/scripts/make.gluegen.all.macosx-java7_target16.sh
 delete mode 100644 make/scripts/setenv-build-jogl-x86_64.java7.sh

(limited to 'make/scripts')

diff --git a/make/scripts/make.gluegen.all.android-armv6-cross.sh b/make/scripts/make.gluegen.all.android-armv6-cross.sh
index 55fea49..9186ff7 100755
--- a/make/scripts/make.gluegen.all.android-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv6-cross.sh
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -88,6 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv6.xml"
 
 which gcc 2>&1 | tee make.gluegen.all.android-armv6-cross.log
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv6 \
diff --git a/make/scripts/make.gluegen.all.android-armv7-cross.sh b/make/scripts/make.gluegen.all.android-armv7-cross.sh
index 4aff879..e811339 100755
--- a/make/scripts/make.gluegen.all.android-armv7-cross.sh
+++ b/make/scripts/make.gluegen.all.android-armv7-cross.sh
@@ -1,5 +1,9 @@
 #! /bin/sh
 
+if [ -e $SDIR/setenv-build-jogl-x86_64.sh ] ; then
+    . $SDIR/setenv-build-jogl-x86_64.sh
+fi
+
 export NODE_LABEL=.
 
 export HOST_UID=jogamp
@@ -88,6 +92,8 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-android-armv7.xml"
 
 which gcc 2>&1 | tee make.gluegen.all.android-armv7-cross.log
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 #BUILD_ARCHIVE=true \
 ant \
     -Drootrel.build=build-android-armv7 \
diff --git a/make/scripts/make.gluegen.all.linux-armv6-cross.sh b/make/scripts/make.gluegen.all.linux-armv6-cross.sh
index 7c1dee4..f5f5c18 100755
--- a/make/scripts/make.gluegen.all.linux-armv6-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6-cross.sh
@@ -37,6 +37,12 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml"
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6 \
     $* 2>&1 | tee make.gluegen.all.linux-armv6-cross.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6.sh b/make/scripts/make.gluegen.all.linux-armv6.sh
index 1fc6656..1399f72 100755
--- a/make/scripts/make.gluegen.all.linux-armv6.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6.sh
@@ -13,6 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/default-java/jre/lib/arm
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6.xml"
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6 \
     $* 2>&1 | tee make.gluegen.all.linux-armv6.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
index 331a97b..5817b7f 100755
--- a/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6hf-cross.sh
@@ -37,6 +37,11 @@ export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml"
 #export JUNIT_DISABLED="true"
 export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode"
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6hf \
     $* 2>&1 | tee make.gluegen.all.linux-armv6hf-cross.log
diff --git a/make/scripts/make.gluegen.all.linux-armv6hf.sh b/make/scripts/make.gluegen.all.linux-armv6hf.sh
index e922c2d..60f6708 100755
--- a/make/scripts/make.gluegen.all.linux-armv6hf.sh
+++ b/make/scripts/make.gluegen.all.linux-armv6hf.sh
@@ -13,6 +13,8 @@ export TARGET_JAVA_LIBS=/usr/lib/jvm/java-6-openjdk-armhf/jre/lib/arm
 
 export GLUEGEN_CPPTASKS_FILE="lib/gluegen-cpptasks-linux-armv6hf.xml"
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-linux-armv6hf \
     $* 2>&1 | tee make.gluegen.all.linux-armv6hf.log
diff --git a/make/scripts/make.gluegen.all.linux-x86.sh b/make/scripts/make.gluegen.all.linux-x86.sh
index 58685d7..f0eec7c 100755
--- a/make/scripts/make.gluegen.all.linux-x86.sh
+++ b/make/scripts/make.gluegen.all.linux-x86.sh
@@ -15,6 +15,12 @@ fi
 #    -Dgluegen-cpptasks.file=`pwd`/lib/gluegen-cpptasks-linux-32bit.xml \
 #
 
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-x86 \
     $* 2>&1 | tee make.gluegen.all.linux-x86.log
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.java7.sh b/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
deleted file mode 100755
index 967a21e..0000000
--- a/make/scripts/make.gluegen.all.linux-x86_64.java7.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-
-SDIR=`dirname $0` 
-
-if [ -e $SDIR/setenv-build-jogl-x86_64.java7.sh ] ; then
-    . $SDIR/setenv-build-jogl-x86_64.java7.sh
-fi
-
-#    -Dc.compiler.debug=true 
-#    -Dgluegen.cpptasks.detected.os=true \
-#    -DisUnix=true \
-#    -DisLinux=true \
-#    -DisLinuxAMD64=true \
-#    -DisX11=true \
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-# BUILD_ARCHIVE=true \
-ant \
-    -Dc.compiler.debug=true  \
-    -Djavacdebuglevel="source,lines,vars" \
-    -Drootrel.build=build-x86_64.java7 \
-    $* 2>&1 | tee make.gluegen.all.linux-x86_64.java7.log
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh
index 0ed640e..2465911 100755
--- a/make/scripts/make.gluegen.all.linux-x86_64.sh
+++ b/make/scripts/make.gluegen.all.linux-x86_64.sh
@@ -16,12 +16,17 @@ fi
 #    -Dtarget.sourcelevel=1.6 \
 #    -Dtarget.targetlevel=1.6 \
 #    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
+#
+#    -Dc.compiler.debug=true  \
+#    -Djavacdebuglevel="source,lines,vars" \
+
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
 # BUILD_ARCHIVE=true \
 ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Djavacdebuglevel="source,lines,vars" \
     -Drootrel.build=build-x86_64 \
     $* 2>&1 | tee make.gluegen.all.linux-x86_64.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh
index f88341b..73e3d1c 100755
--- a/make/scripts/make.gluegen.all.macosx-java7.sh
+++ b/make/scripts/make.gluegen.all.macosx-java7.sh
@@ -14,6 +14,8 @@ JAVA_HOME=`/usr/libexec/java_home -version 1.7`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant \
     -Drootrel.build=build-macosx-java7 \
     $* 2>&1 | tee make.gluegen.all.macosx-java7.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7_target16.sh b/make/scripts/make.gluegen.all.macosx-java7_target16.sh
deleted file mode 100755
index 4e9e04a..0000000
--- a/make/scripts/make.gluegen.all.macosx-java7_target16.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-
-if [ -e /opt-share/etc/profile.ant ] ; then
-    . /opt-share/etc/profile.ant
-fi
-
-#    -Dc.compiler.debug=true 
-#
-#    -Dtarget.sourcelevel=1.6 \
-#    -Dtarget.targetlevel=1.6 \
-#    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Drootrel.build=build-macosx-java7_target16 \
-    $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log
diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh
index 94bcd4e..56e2eba 100755
--- a/make/scripts/make.gluegen.all.macosx.sh
+++ b/make/scripts/make.gluegen.all.macosx.sh
@@ -10,10 +10,16 @@ fi
 #    -Dtarget.targetlevel=1.6 \
 #    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
 
+JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+PATH=$JAVA_HOME/bin:$PATH
+export JAVA_HOME PATH
+
+export SOURCE_LEVEL=1.6
+export TARGET_LEVEL=1.6
+export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar
+
+export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
 
 ant \
-    -Dtarget.sourcelevel=1.6 \
-    -Dtarget.targetlevel=1.6 \
-    -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \
-    -Drootrel.build=build-macosx \
-    $* 2>&1 | tee make.gluegen.all.macosx.log
+    -Drootrel.build=build-macosx-java7_target16 \
+    $* 2>&1 | tee make.gluegen.all.macosx-java7_target16.log
diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index a1d9216..750915a 100755
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"
 
-set J2RE_HOME=c:\jre1.6.0_35_x32
-set JAVA_HOME=c:\jdk1.6.0_35_x32
+set J2RE_HOME=c:\jre1.7.0_25_x32
+set JAVA_HOME=c:\jdk1.7.0_25_x32
 set ANT_PATH=C:\apache-ant-1.8.2
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%
@@ -13,5 +13,11 @@ REM    -DuseOpenMAX=true
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.gluegen.all.win32.log 2>&1
 
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 19733fe..9c6ffc9 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"
 
-set J2RE_HOME=c:\jre1.6.0_35_x64
-set JAVA_HOME=c:\jdk1.6.0_35_x64
+set J2RE_HOME=c:\jre1.7.0_25_x64
+set JAVA_HOME=c:\jdk1.7.0_25_x64
 set ANT_PATH=C:\apache-ant-1.8.2
 
 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%
@@ -13,5 +13,11 @@ REM    -DuseOpenMAX=true
 REM    -DuseKD=true
 REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2
 
+set SOURCE_LEVEL=1.6
+set TARGET_LEVEL=1.6
+set TARGET_RT_JAR=C:\jre1.6.0_30\lib\rt.jar
+
+set JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
+
 ant -Drootrel.build=build-win64 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.gluegen.all.win64.log 2>&1
 
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index a049a8f..9772316 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -75,7 +75,7 @@ function onetest() {
     echo
 }
 #
-#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
+onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG
@@ -107,5 +107,5 @@ function onetest() {
 #onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG
-onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
+#onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.junit.sec.TestSecIOUtil01 2>&1 | tee -a $LOG
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
diff --git a/make/scripts/setenv-build-jogl-x86_64.java7.sh b/make/scripts/setenv-build-jogl-x86_64.java7.sh
deleted file mode 100644
index 6d293a0..0000000
--- a/make/scripts/setenv-build-jogl-x86_64.java7.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-echo $0
-
-if [ -e /opt-share/apache-ant ] ; then
-    ANT_PATH=/opt-share/apache-ant
-    PATH=$ANT_PATH/bin:$PATH
-    export ANT_PATH
-fi
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    if [ -e /usr/share/ant/bin/ant -a -e /usr/share/ant/lib/ant.jar ] ; then
-        ANT_PATH=/usr/share/ant
-        export ANT_PATH
-        echo autosetting ANT_PATH to $ANT_PATH
-    fi
-fi
-if [ -z "$ANT_PATH" ] ; then
-    echo ANT_PATH does not exist, set it
-    exit
-fi
-
-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
-fi
-
-export PATH
-
-
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
-- 
cgit v1.2.3