diff options
| author | Sven Gothel <[email protected]> | 2019-01-23 02:13:44 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-01-23 02:13:44 +0100 |
| commit | cc157b6a7dfbdefbbfc31085b4013e395cfecd13 (patch) | |
| tree | d818f2d71b0af6ba784135974df149aa2b7b0017 | |
| parent | 347271ffdd09153a2334fda593774d49050f84e0 (diff) | |
osx test scripts using latest Java
| -rwxr-xr-x | make/scripts/make.jogl.all.macosx.sh | 4 | ||||
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index aa85b9213..94b7f13b3 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -7,7 +7,9 @@ fi # Force OSX SDK 10.6, if desired # export SDKROOT=macosx10.6 -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#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 diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 8fa8f4aea..d58b4d465 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -4,7 +4,8 @@ #export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH -JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` #JAVA_HOME=`/usr/libexec/java_home -version 1.7` #JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` #JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` |