From f857d3f86be221fb5f8488a8419c4cac8d65fc89 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 24 Jun 2013 09:48:11 +0200 Subject: scripts: osx make/test java7/6 fixes --- make/scripts/tests-osx-x64-java6.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 make/scripts/tests-osx-x64-java6.sh (limited to 'make/scripts/tests-osx-x64-java6.sh') diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh new file mode 100755 index 000000000..fe2d2c4ec --- /dev/null +++ b/make/scripts/tests-osx-x64-java6.sh @@ -0,0 +1,12 @@ +#! /bin/bash + +export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH + +JAVA_HOME=`/usr/libexec/java_home -version 1.6` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH + +spath=`dirname $0` + +. $spath/tests.sh /usr/bin/java -d64 ../build-macosx $* + -- cgit v1.2.3 From d066602cf50f54f83b22b1b2c214100f1c34cc35 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Mon, 30 Dec 2013 21:30:04 +0100 Subject: OSX Test Scripts: Use dedicated location for libav/ffmpeg libraries for DYLD_LIBRARY_PATH '/usr/local/lib' may cause hacoc w/ other preinstalled libs, see: http://forum.jogamp.org/JTabbedPane-Canvas3D-bug-tp4030983p4031081.html --- make/scripts/tests-osx-x64-custom.sh | 2 +- make/scripts/tests-osx-x64-java6.sh | 2 +- make/scripts/tests-osx-x64.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'make/scripts/tests-osx-x64-java6.sh') diff --git a/make/scripts/tests-osx-x64-custom.sh b/make/scripts/tests-osx-x64-custom.sh index 88587f086..16a56285b 100755 --- a/make/scripts/tests-osx-x64-custom.sh +++ b/make/scripts/tests-osx-x64-custom.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH spath=`dirname $0` diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh index fe2d2c4ec..b8190f0d7 100755 --- a/make/scripts/tests-osx-x64-java6.sh +++ b/make/scripts/tests-osx-x64-java6.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH JAVA_HOME=`/usr/libexec/java_home -version 1.6` PATH=$JAVA_HOME/bin:$PATH diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 1204b8a7b..5d9cd6f66 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -1,6 +1,6 @@ #! /bin/bash -export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=/usr/local/libav:$DYLD_LIBRARY_PATH JAVA_HOME=`/usr/libexec/java_home -version 1.7` #JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25` -- cgit v1.2.3