diff options
| author | Sven Gothel <[email protected]> | 2014-10-03 03:13:42 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-10-03 03:13:42 +0200 |
| commit | 9b4656a2b676bcad43e67e5ee47f4ed00399a83a (patch) | |
| tree | e876c184765f76788f44174f762b5831feda5318 /make/scripts | |
| parent | a7a3d5ab98ee0ad33fdef50bf081afeb8295ebe4 (diff) | |
Make Scripts OSX: Remove -java7 script, add -java6 script (default uses java8)
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/make.gluegen.all.macosx-java6.sh (renamed from make/scripts/make.gluegen.all.macosx-java7.sh) | 13 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.macosx.sh | 5 |
2 files changed, 14 insertions, 4 deletions
diff --git a/make/scripts/make.gluegen.all.macosx-java7.sh b/make/scripts/make.gluegen.all.macosx-java6.sh index 3ea0cc3..0a5a8f2 100755 --- a/make/scripts/make.gluegen.all.macosx-java7.sh +++ b/make/scripts/make.gluegen.all.macosx-java6.sh @@ -10,13 +10,20 @@ 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.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-java7 \ - $* 2>&1 | tee make.gluegen.all.macosx-java7.log + -Drootrel.build=build-macosx \ + $* 2>&1 | tee make.gluegen.all.macosx.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 |