diff options
Diffstat (limited to 'make')
24 files changed, 35 insertions, 171 deletions
diff --git a/make/scripts/make.jogl.all.ios.amd64.sh b/make/scripts/make.jogl.all.ios.amd64.sh index 733103712..6aed9b533 100755 --- a/make/scripts/make.jogl.all.ios.amd64.sh +++ b/make/scripts/make.jogl.all.ios.amd64.sh @@ -5,10 +5,6 @@ if [ -e /opt-share/etc/profile.ant ] ; then 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 diff --git a/make/scripts/make.jogl.all.ios.arm64.sh b/make/scripts/make.jogl.all.ios.arm64.sh index 3349262cd..a7ac79be3 100755 --- a/make/scripts/make.jogl.all.ios.arm64.sh +++ b/make/scripts/make.jogl.all.ios.arm64.sh @@ -5,10 +5,6 @@ if [ -e /opt-share/etc/profile.ant ] ; then 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 diff --git a/make/scripts/make.jogl.all.linux-x86_64.java7.sh b/make/scripts/make.jogl.all.linux-x86_64.java7.sh deleted file mode 100755 index 17865bd37..000000000 --- a/make/scripts/make.jogl.all.linux-x86_64.java7.sh +++ /dev/null @@ -1,61 +0,0 @@ -#! /bin/sh - -SDIR=`dirname $0` - -if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then - . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh -fi - - -if [ "$1" = "-libdir" ] ; then - shift - if [ -z "$1" ] ; then - echo libdir argument missing - print_usage - exit - fi - CUSTOMLIBDIR="-Dcustom.libdir=$1" - shift -fi - -# -Dc.compiler.debug=true \ - -# -Dgluegen.cpptasks.detected.os=true \ -# -DisUnix=true \ -# -DisLinux=true \ -# -DisLinuxAMD64=true \ -# -DisX11=true \ -# -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -# -# -Dsetup.addNativeOpenMAX=true \ -# -Dsetup.addNativeKD=true \ - - -#LD_LIBRARY_PATH=/opt-linux-x86_64/mesa-7.8.1/lib64 -#export LD_LIBRARY_PATH - -LOGF=make.jogl.all.linux-x86_64.java7.log -rm -f $LOGF - -# export LIBGL_DRIVERS_PATH=/usr/lib/fglrx/dri:/usr/lib32/fglrx/dri -# export LIBGL_DEBUG=verbose -echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a $LOGF -echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $LOGF -echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $LOGF - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -# -Dc.compiler.debug=true \ -# -Djavacdebug="true" \ -# -Djavacdebuglevel="source,lines,vars" \ - -# BUILD_ARCHIVE=true \ -ant \ - $CUSTOMLIBDIR \ - -Drootrel.build=build-x86_64.java7 \ - $* 2>&1 | tee -a $LOGF - diff --git a/make/scripts/make.jogl.all.macosx-java6.sh b/make/scripts/make.jogl.all.macosx-java6.sh deleted file mode 100755 index 4dd4a2619..000000000 --- a/make/scripts/make.jogl.all.macosx-java6.sh +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/sh - -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant -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 -version 1.6` -PATH=$JAVA_HOME/bin:$PATH -export JAVA_HOME PATH - - -# -Dc.compiler.debug=true \ -# -Djavacdebug="true" \ -# -Djavacdebuglevel="source,lines,vars" \ -# - -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" - -# BUILD_ARCHIVE=true \ -ant \ - -Drootrel.build=build-macosx-java6 \ - $* 2>&1 | tee make.jogl.all.macosx-java6.log diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh index e46aee628..1f9cd4941 100755 --- a/make/scripts/make.jogl.all.macosx.sh +++ b/make/scripts/make.jogl.all.macosx.sh @@ -8,7 +8,7 @@ fi # export SDKROOT=macosx10.6 #JAVA_HOME=`/usr/libexec/java_home` -JAVA_HOME=`/usr/libexec/java_home -version 1.11` +JAVA_HOME=`/usr/libexec/java_home -version 11` #JAVA_HOME=`/usr/libexec/java_home -version 1.8` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH diff --git a/make/scripts/setvc9-jogl.bat b/make/scripts/setvc9-jogl.bat deleted file mode 100755 index 26cdf8ff4..000000000 --- a/make/scripts/setvc9-jogl.bat +++ /dev/null @@ -1,9 +0,0 @@ -
-
-set PATH=C:\apache-ant-1.8.2\bin;%PATH%
-set ANT_PATH=C:\apache-ant-1.8.2
-
-c:
-cd C:\SUN\JOGL2\jogl\make
-
-"C:\Program Files\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat"
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat index 58f37e243..deb8451ec 100755 --- a/make/scripts/test-win32-smb_share.bat +++ b/make/scripts/test-win32-smb_share.bat @@ -1,11 +1,11 @@ set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp
-set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.8.0_121_x32
-set JAVA_HOME=c:\jdk1.8.0_121_x32
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
+set BLD_SUB=build-win32
set PROJECT_ROOT=%SMB_ROOT%\jogl
set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB%
diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat index 428d9ad6d..7253c7cb4 100755 --- a/make/scripts/tests-javaws-x64.bat +++ b/make/scripts/tests-javaws-x64.bat @@ -1,4 +1,5 @@ -set JRE_HOME=c:\jre1.8.0_121_x64 +set JRE_HOME=c:\jre-11.0.4+11_x64 +REM set JRE_HOME=c:\jre1.8.0_121_x64 set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log %JRE_PATH%\javaws -uninstall diff --git a/make/scripts/tests-macosx64-junit-java7.sh b/make/scripts/tests-macosx64-junit-java7.sh deleted file mode 100644 index 12be91bdf..000000000 --- a/make/scripts/tests-macosx64-junit-java7.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash - -export JAVA7_EXE=`/usr/libexec/java_home -version 1.7.0_12`/bin/java - -SDIR=`dirname $0` - -. $SDIR/make.jogl.all.macosx.sh -f build-test.xml junit.run.settings junit.run.local.java7 - diff --git a/make/scripts/tests-osx-x32.sh b/make/scripts/tests-osx-x32.sh index 12678d966..b060c44bf 100755 --- a/make/scripts/tests-osx-x32.sh +++ b/make/scripts/tests-osx-x32.sh @@ -4,14 +4,12 @@ export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH #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` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH spath=`dirname $0` -. $spath/tests.sh $JAVA_HOME/bin/java -d32 ../build-macosx-java6 $* +. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx-java6 $* diff --git a/make/scripts/tests-osx-x64-custom.sh b/make/scripts/tests-osx-x64-custom.sh index 201c36f41..38d1c445c 100755 --- a/make/scripts/tests-osx-x64-custom.sh +++ b/make/scripts/tests-osx-x64-custom.sh @@ -6,6 +6,6 @@ export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` -. $spath/tests.sh "`which java`" -d64 ../build-macosx $* +. $spath/tests.sh "`which java`" -DummyArg ../build-macosx $* diff --git a/make/scripts/tests-osx-x64-java6.sh b/make/scripts/tests-osx-x64-java6.sh deleted file mode 100755 index 93ca77a6b..000000000 --- a/make/scripts/tests-osx-x64-java6.sh +++ /dev/null @@ -1,16 +0,0 @@ -#! /bin/bash - -#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH -export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH - -#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` -PATH=$JAVA_HOME/bin:$PATH -export JAVA_HOME PATH - -spath=`dirname $0` - -. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx-java6 $* - diff --git a/make/scripts/tests-osx-x64-mainthread.sh b/make/scripts/tests-osx-x64-mainthread.sh index e21449887..cb5884fb0 100644 --- a/make/scripts/tests-osx-x64-mainthread.sh +++ b/make/scripts/tests-osx-x64-mainthread.sh @@ -1,11 +1,11 @@ export CLASSPATH=.:../../gluegen/make/../build-macosx/gluegen-rt.jar:../build-macosx/jar/jogl-all-noawt.jar:../build-macosx/jar/jogl-test.jar:../build-macosx/../make/lib/swt/cocoa-macosx-x86_64/swt.jar:../../gluegen/make/../make/lib/junit.jar:/opt-share/apache-ant/lib/ant.jar:/opt-share/apache-ant/lib/ant-junit.jar:../build-macosx/jar/atomic/jogl-swt.jar:../build-macosx/jar/jogl-test.jar -/usr/bin/java -d64 -XstartOnFirstThread -Djava.awt.headless=true com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn -#/usr/bin/java -d64 -XstartOnFirstThread -Djava.awt.headless=false com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn +/usr/bin/java -XstartOnFirstThread -Djava.awt.headless=true com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn +#/usr/bin/java -XstartOnFirstThread -Djava.awt.headless=false com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn # # Not working! -#/usr/bin/java -d64 -Djava.awt.headless=true com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn -#/usr/bin/java -d64 -Djava.awt.headless=false com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn +#/usr/bin/java -Djava.awt.headless=true com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn +#/usr/bin/java -Djava.awt.headless=false com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 949adc045..d0f244e93 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -5,10 +5,8 @@ export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH #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.7.0_25` -#JAVA_HOME=`/usr/libexec/java_home -version 1.6.0` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH @@ -16,5 +14,5 @@ export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` -. $spath/tests.sh $JAVA_HOME/bin/java -d64 ../build-macosx $* +. $spath/tests.sh $JAVA_HOME/bin/java -DummyArg ../build-macosx $* diff --git a/make/scripts/tests-solx32.sh b/make/scripts/tests-solx32.sh index 996dcc606..b95a612c3 100755 --- a/make/scripts/tests-solx32.sh +++ b/make/scripts/tests-solx32.sh @@ -6,5 +6,5 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86.sh fi -. $SDIR/tests.sh `which java` -d32 ../build-solaris-x86 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-solaris-x86 $* diff --git a/make/scripts/tests-solx64.sh b/make/scripts/tests-solx64.sh index 3500f1b14..9f20e6a47 100755 --- a/make/scripts/tests-solx64.sh +++ b/make/scripts/tests-solx64.sh @@ -6,5 +6,5 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -. $SDIR/tests.sh `which java` -d64 ../build-solaris-x86_64 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-solaris-x86_64 $* diff --git a/make/scripts/tests-x32-dbg.bat b/make/scripts/tests-x32-dbg.bat index 2b3e851b1..73e13c173 100755 --- a/make/scripts/tests-x32-dbg.bat +++ b/make/scripts/tests-x32-dbg.bat @@ -5,9 +5,9 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp REM set TMP=C:\Documents and Settings\jogamp\temp
set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.8.0_121_x32
-set JAVA_HOME=c:\jdk1.8.0_121_x32
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
set PROJECT_ROOT=D:\projects\jogamp\jogl
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index 900c27ba1..9f50e0346 100755 --- a/make/scripts/tests-x32.bat +++ b/make/scripts/tests-x32.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win32
-set J2RE_HOME=c:\jre1.8.0_121_x32
-set JAVA_HOME=c:\jdk1.8.0_121_x32
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
REM set TEMP=C:\Documents and Settings\jogamp\temp
REM set TMP=C:\Documents and Settings\jogamp\temp
diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh index 0d4644f4f..84d49257e 100755 --- a/make/scripts/tests-x32.sh +++ b/make/scripts/tests-x32.sh @@ -8,6 +8,6 @@ fi export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86/swt.jar -. $SDIR/tests.sh `which java` -d32 ../build-x86 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-x86 $* diff --git a/make/scripts/tests-x64-custom.sh b/make/scripts/tests-x64-custom.sh index 87f330dbe..cc5c31efb 100755 --- a/make/scripts/tests-x64-custom.sh +++ b/make/scripts/tests-x64-custom.sh @@ -8,5 +8,5 @@ SDIR=`dirname $0` # . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh #fi -. $SDIR/tests.sh `which java` -d64 ../build-x86_64 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-x86_64 $* diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index 438b1ae07..c2777d6c7 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -5,9 +5,9 @@ REM set TEMP=C:\Documents and Settings\jogamp\temp REM set TMP=C:\Documents and Settings\jogamp\temp
set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.8.0_121_x64
-set JAVA_HOME=c:\jdk1.8.0_121_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
set PROJECT_ROOT=D:\projects\jogamp\jogl
set BLD_DIR=..\%BLD_SUB%
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 7404529df..268700508 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -1,8 +1,8 @@ set BLD_SUB=build-win64
-set J2RE_HOME=c:\jre1.8.0_121_x64
-set JAVA_HOME=c:\jdk1.8.0_121_x64
-set ANT_PATH=C:\apache-ant-1.9.4
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
REM set TEMP=C:\Documents and Settings\jogamp\temp
REM set TMP=C:\Documents and Settings\jogamp\temp
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index e7301aef5..19dd95221 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -32,5 +32,5 @@ fi export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar #export SWT_CLASSPATH=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.jar -. $SDIR/tests.sh `which java` -d64 ../build-x86_64 $* +. $SDIR/tests.sh `which java` -DummyArg ../build-x86_64 $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index abb03238f..e0fb6d55d 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -112,7 +112,7 @@ function jrun() { #D_ARGS="-Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all" - #D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + D_ARGS="-Djogamp.debug=all -Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Djogamp.debug.NativeLibrary=true -Djogamp.debug.JNILibLoader=true" #D_ARGS="-Djogl.debug.GLContext -Djogamp.debug.NativeLibrary -Djogamp.debug.JNILibLoader -Djogl.debug.DebugGL -Djogl.debug.GLDebugMessageHandler" |