scripts: osx make/test java7/6 fixes

6 files changed, 4 insertions, 46 deletions

diff --git a/make/scripts/make.jogl.all.macosx-java7.sh b/make/scripts/make.jogl.all.macosx-java7.sh
index ad1e7afe1..ee82bbc91 100755
--- a/make/scripts/make.jogl.all.macosx-java7.sh
+++ b/make/scripts/make.jogl.all.macosx-java7.sh
@@ -9,9 +9,6 @@ fi
 #    -Djavacdebug="true" \
 #    -Djavacdebuglevel="source,lines,vars" \
 #
-#    -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
@@ -21,8 +18,5 @@ export JAVA_HOME PATH
 export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
 
 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 \
     $* 2>&1 | tee make.jogl.all.macosx-java7.log
diff --git a/make/scripts/tests-osx-x64-java7OnJava6build.sh b/make/scripts/tests-osx-x64-java6.sh
index e1b07202b..fe2d2c4ec 100755
--- a/make/scripts/tests-osx-x64-java7OnJava6build.sh
+++ b/make/scripts/tests-osx-x64-java6.sh
@@ -2,11 +2,11 @@
 
 export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+JAVA_HOME=`/usr/libexec/java_home -version 1.6`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
 spath=`dirname $0`
 
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
+. $spath/tests.sh  /usr/bin/java -d64 ../build-macosx $*
 
diff --git a/make/scripts/tests-osx-x64-java7.sh b/make/scripts/tests-osx-x64-java7.sh
deleted file mode 100755
index e870d0752..000000000
--- a/make/scripts/tests-osx-x64-java7.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-spath=`dirname $0`
-
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx-java7 $*
-
diff --git a/make/scripts/tests-osx-x64-java7u12ea.sh b/make/scripts/tests-osx-x64-java7u12ea.sh
deleted file mode 100755
index a8c9bed77..000000000
--- a/make/scripts/tests-osx-x64-java7u12ea.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_12`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-spath=`dirname $0`
-
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx-java7 $*
-
diff --git a/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh b/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh
deleted file mode 100755
index dad9c430e..000000000
--- a/make/scripts/tests-osx-x64-java7u12eaOnJava6Build.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
-
-JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_12`
-PATH=$JAVA_HOME/bin:$PATH
-export JAVA_HOME PATH
-
-spath=`dirname $0`
-
-. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*
-
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index fe2d2c4ec..e1b07202b 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -2,11 +2,11 @@
 
 export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
 
-JAVA_HOME=`/usr/libexec/java_home -version 1.6`
+JAVA_HOME=`/usr/libexec/java_home -version 1.7`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
 spath=`dirname $0`
 
-. $spath/tests.sh  /usr/bin/java -d64 ../build-macosx $*
+. $spath/tests.sh  $JAVA_HOME/bin/java -d64 ../build-macosx $*