Update etc/test* scripts: Remove native lib config, use native-jars. Remove old JOGL jars in classpath

4 files changed, 14 insertions, 34 deletions

diff --git a/etc/test.bat b/etc/test.bat
index aa19ad970..0c82233ca 100755
--- a/etc/test.bat
+++ b/etc/test.bat
@@ -1,19 +1,18 @@
 

 set BLD_DIR=jar

-set LIB_DIR=lib

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\nativewindow.all.jar;%BLD_DIR%\jogl.all.jar;%BLD_DIR%\newt.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

 echo CP_ALL %CP_ALL%

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

 

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% javax.media.opengl.awt.GLCanvas > java-win64.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% javax.media.opengl.awt.GLCanvas > java-win64.log 2>&1

 

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.common.GlueGenVersion > test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.nativewindow.NativeWindowVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.opengl.JoglVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.NewtVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLCanvas >> test.log 2>&1

-java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLWindow >> test.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.common.GlueGenVersion > test.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.nativewindow.NativeWindowVersion >> test.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.opengl.JoglVersion >> test.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.newt.NewtVersion >> test.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% com.jogamp.newt.opengl.GLCanvas >> test.log 2>&1

+java -classpath %CP_ALL% %X_ARGS% com.jogamp.newt.opengl.GLWindow >> test.log 2>&1

 

 type test.log

diff --git a/etc/test.sh b/etc/test.sh
index dcef0f488..1912a9514 100755
--- a/etc/test.sh
+++ b/etc/test.sh
@@ -12,15 +12,9 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $logfile
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $logfile
 echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a $logfile
 
-CLASSPATH=jar/gluegen-rt.jar:jar/nativewindow.all.jar:jar/jogl.all.jar:jar/newt.all.jar
+CLASSPATH=jar/gluegen-rt.jar:jar/jogl.all.jar
 export CLASSPATH
 
-export LD_LIBRARY_PATH=./lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=./lib:$DYLD_LIBRARY_PATH
-echo LD_LIBRARY PATH: $LD_LIBRARY_PATH
-echo DYLD_LIBRARY PATH: $DYLD_LIBRARY_PATH
-echo
-
 echo CLASSPATH: $CLASSPATH
 echo
 
diff --git a/etc/test_dbg.bat b/etc/test_dbg.bat
index 4d21cc23a..33bbb912b 100755
--- a/etc/test_dbg.bat
+++ b/etc/test_dbg.bat
@@ -1,20 +1,13 @@
 

 set BLD_DIR=jar

-set LIB_DIR=lib

 

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\nativewindow.all.jar;%BLD_DIR%\jogl.all.jar;%BLD_DIR%\newt.all.jar

+set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\jogl.all.jar

 echo CP_ALL %CP_ALL%

 

 set D_ARGS="-Djogamp.debug=all" "-Dnativewindow.debug=all" "-Djogl.debug=all" "-Dnewt.debug=all"

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

 

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% javax.media.opengl.awt.GLCanvas > java-win64.log 2>&1

+REM java -classpath %CP_ALL% %X_ARGS% %D_ARGS% com.jogamp.newt.opengl.GLCanvas >> test.log 2>&1

+java -classpath %CP_ALL% %X_ARGS% %D_ARGS% com.jogamp.newt.opengl.GLWindow >> test_dbg.log 2>&1

 

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.common.GlueGenVersion > test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.nativewindow.NativeWindowVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.opengl.JoglVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.NewtVersion >> test.log 2>&1

-REM java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% com.jogamp.newt.opengl.GLCanvas >> test.log 2>&1

-java -classpath %CP_ALL% "-Djava.library.path=%LIB_DIR%" %X_ARGS% %D_ARGS% com.jogamp.newt.opengl.GLWindow >> test_dbg.log 2>&1

-

-type test.log

+type test_dbg.log

diff --git a/etc/test_dbg.sh b/etc/test_dbg.sh
index 49c0a0554..f7d0fd2b3 100755
--- a/etc/test_dbg.sh
+++ b/etc/test_dbg.sh
@@ -12,15 +12,9 @@ echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a $logfile
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a $logfile
 echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a $logfile
 
-CLASSPATH=jar/gluegen-rt.jar:jar/nativewindow.all.jar:jar/jogl.all.jar:jar/newt.all.jar
+CLASSPATH=jar/gluegen-rt.jar:jar/jogl.all.jar
 export CLASSPATH
 
-export LD_LIBRARY_PATH=./lib:$LD_LIBRARY_PATH
-export DYLD_LIBRARY_PATH=./lib:$DYLD_LIBRARY_PATH
-echo LD_LIBRARY PATH: $LD_LIBRARY_PATH
-echo DYLD_LIBRARY PATH: $DYLD_LIBRARY_PATH
-echo
-
 echo CLASSPATH: $CLASSPATH
 echo