summaryrefslogtreecommitdiffstats
path: root/src/test-native/bug1398/make-bug1398.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2020-02-21 19:23:52 +0100
committerSven Gothel <[email protected]>2020-02-21 19:23:52 +0100
commitff780fc11602fb79a7ce1dcf879fdaeb865b9fa8 (patch)
tree564828be0d590538cdd3434505f14aa88233f0aa /src/test-native/bug1398/make-bug1398.sh
parentf4f92cdc0eb89c62070a865601527097e6d5cc72 (diff)
Bug 1398: Refine test case: Make classpath and libpath runtime configurable + show JOGL version
Diffstat (limited to 'src/test-native/bug1398/make-bug1398.sh')
-rwxr-xr-xsrc/test-native/bug1398/make-bug1398.sh25
1 files changed, 9 insertions, 16 deletions
diff --git a/src/test-native/bug1398/make-bug1398.sh b/src/test-native/bug1398/make-bug1398.sh
index d410f7066..7ec9935d9 100755
--- a/src/test-native/bug1398/make-bug1398.sh
+++ b/src/test-native/bug1398/make-bug1398.sh
@@ -2,25 +2,18 @@
set -x
-USE_232=1
+JOGAMP_VERSION=v2.3.2
+#JOGAMP_VERSION=v2.2.4
+
+CLASSPATH=".:/Users/jogamp/projects/JogAmp/builds/$JOGAMP_VERSION/jogamp-all-platforms/jar/gluegen-rt.jar:/Users/jogamp/projects/JogAmp/builds/$JOGAMP_VERSION/jogamp-all-platforms/jar/jogl-all.jar"
+
ok=0
-if [ $USE_232 -eq 0 ] ; then
- xcrun clang -x objective-c -framework Cocoa \
- -DCLASSPATH="\".:/Users/jogamp/projects/JogAmp/gluegen/build/gluegen-rt.jar:/Users/jogamp/projects/JogAmp/jogl/build/jar/jogl-all.jar\"" \
- -DLIBPATH="\"/Users/jogamp/projects/JogAmp/gluegen/build/obj:/Users/jogamp/projects/JogAmp/jogl/build/lib\"" \
- -o Bug1398macOSContextOpsOnMainThread Bug1398macOSContextOpsOnMainThread.c \
- && ok=1
-else
- xcrun clang -x objective-c -framework Cocoa \
- -DCLASSPATH="\".:/Users/jogamp/projects/JogAmp/builds/v2.3.2/jogamp-all-platforms/jar/gluegen-rt.jar:/Users/jogamp/projects/JogAmp/builds/v2.3.2/jogamp-all-platforms/jar/jogl-all.jar\"" \
- -DLIBPATH="\"/Users/jogamp/projects/JogAmp/builds/v2.3.2/jogamp-all-platforms/lib/macosx-universal\"" \
- -o Bug1398macOSContextOpsOnMainThread Bug1398macOSContextOpsOnMainThread.c \
- && ok=1
-fi
+xcrun clang -x objective-c -framework Cocoa \
+ -o Bug1398macOSContextOpsOnMainThread Bug1398macOSContextOpsOnMainThread.c \
+ && ok=1
if [ $ok -eq 1 ] ; then
- javac -source 1.8 -target 1.8 -classpath ../../../../gluegen/build/gluegen-rt.jar:../../../build/jar/jogl-all.jar RedSquareES2.java Bug1398macOSContextOpsOnMainThread.java
+ javac -source 1.8 -target 1.8 -classpath $CLASSPATH RedSquareES2.java Bug1398macOSContextOpsOnMainThread.java
fi
-# ./Bug1398macOSContextOpsOnMainThread /Users/jogamp/projects/JogAmp/gluegen/build/obj:/Users/jogamp/projects/JogAmp/jogl/build/lib/lib