From 9b4656a2b676bcad43e67e5ee47f4ed00399a83a Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 3 Oct 2014 03:13:42 +0200
Subject: Make Scripts OSX: Remove -java7 script, add -java6 script (default
 uses java8)

---
 make/scripts/make.gluegen.all.macosx-java6.sh | 29 +++++++++++++++++++++++++++
 make/scripts/make.gluegen.all.macosx-java7.sh | 22 --------------------
 make/scripts/make.gluegen.all.macosx.sh       |  5 ++++-
 3 files changed, 33 insertions(+), 23 deletions(-)
 create mode 100755 make/scripts/make.gluegen.all.macosx-java6.sh
 delete mode 100755 make/scripts/make.gluegen.all.macosx-java7.sh

diff --git a/make/scripts/make.gluegen.all.macosx-java6.sh b/make/scripts/make.gluegen.all.macosx-java6.sh
new file mode 100755
index 0000000..0a5a8f2
--- /dev/null
+++ b/make/scripts/make.gluegen.all.macosx-java6.sh
@@ -0,0 +1,29 @@
+#! /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 \
+
+# Force OSX SDK 10.6, if desired
+# export SDKROOT=macosx10.6
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.6`
+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"
+export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
+
+ant \
+    -Drootrel.build=build-macosx \
+    $* 2>&1 | tee make.gluegen.all.macosx.log
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java7.sh
deleted file mode 100755
index 3ea0cc3..0000000
--- a/make/scripts/make.gluegen.all.macosx-java7.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
-
-#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org"
-export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet"
-
-ant \
-    -Drootrel.build=build-macosx-java7 \
-    $* 2>&1 | tee make.gluegen.all.macosx-java7.log
diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh
index aa81ee9..808afac 100755
--- a/make/scripts/make.gluegen.all.macosx.sh
+++ b/make/scripts/make.gluegen.all.macosx.sh
@@ -10,7 +10,10 @@ 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`
+# Force OSX SDK 10.6, if desired
+# export SDKROOT=macosx10.6
+
+JAVA_HOME=`/usr/libexec/java_home -version 1.8`
 PATH=$JAVA_HOME/bin:$PATH
 export JAVA_HOME PATH
 
-- 
cgit v1.2.3