bump scripts to 6u24

14 files changed, 48 insertions, 31 deletions

diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat
index ef117db82..2b15410ff 100755
--- a/make/scripts/java-win32-dbg.bat
+++ b/make/scripts/java-win32-dbg.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.6.0_23_x32

-set JAVA_HOME=c:\jdk1.6.0_23_x32

+set J2RE_HOME=c:\jre1.6.0_24_x32

+set JAVA_HOME=c:\jdk1.6.0_24_x32

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index a7697d75c..368501cb4 100755
--- a/make/scripts/java-win32.bat
+++ b/make/scripts/java-win32.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.6.0_23_x32

-set JAVA_HOME=c:\jdk1.6.0_23_x32

+set J2RE_HOME=c:\jre1.6.0_24_x32

+set JAVA_HOME=c:\jdk1.6.0_24_x32

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat
index 3aeee346e..34a2fdc4c 100755
--- a/make/scripts/java-win64-dbg.bat
+++ b/make/scripts/java-win64-dbg.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.6.0_23_x64

-set JAVA_HOME=c:\jdk1.6.0_23_x64

+set J2RE_HOME=c:\jre1.6.0_24_x64

+set JAVA_HOME=c:\jdk1.6.0_24_x64

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index e931bb38e..320db5725 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -1,7 +1,7 @@
 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.6.0_23_x64

-set JAVA_HOME=c:\jdk1.6.0_23_x64

+set J2RE_HOME=c:\jre1.6.0_24_x64

+set JAVA_HOME=c:\jdk1.6.0_24_x64

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/make.jogl.all.macosx.sh b/make/scripts/make.jogl.all.macosx.sh
index a85f9344f..f8c147cd6 100755
--- a/make/scripts/make.jogl.all.macosx.sh
+++ b/make/scripts/make.jogl.all.macosx.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if [ -e /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
 fi
 
 
diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat
index 6b66ff1c8..0585808cb 100755
--- a/make/scripts/make.jogl.all.win32.bat
+++ b/make/scripts/make.jogl.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_23_x32

-set JAVA_HOME=c:\jdk1.6.0_23_x32

+set J2RE_HOME=c:\jre1.6.0_24_x32

+set JAVA_HOME=c:\jdk1.6.0_24_x32

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat
index 8dbcd01e7..54c00187d 100755
--- a/make/scripts/make.jogl.all.win64.bat
+++ b/make/scripts/make.jogl.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.6.0_23_x64

-set JAVA_HOME=c:\jdk1.6.0_23_x64

+set J2RE_HOME=c:\jre1.6.0_24_x64

+set JAVA_HOME=c:\jdk1.6.0_24_x64

 set ANT_PATH=C:\apache-ant-1.8.2

 

 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH%

diff --git a/make/scripts/make.jogl.cdcfp.macosx.sh b/make/scripts/make.jogl.cdcfp.macosx.sh
index d36f0bb7e..88ec8750d 100755
--- a/make/scripts/make.jogl.cdcfp.macosx.sh
+++ b/make/scripts/make.jogl.cdcfp.macosx.sh
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-if [ -e /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
 fi
 
 
diff --git a/make/scripts/setenv-jogl.sh b/make/scripts/setenv-jogl.sh
index 964bbc5f8..586b667e3 100755
--- a/make/scripts/setenv-jogl.sh
+++ b/make/scripts/setenv-jogl.sh
@@ -10,8 +10,8 @@ if [ -z "$1" ] ; then
     exit
 fi
 
-if [ -e /devtools/etc/profile.ant ] ; then
-    . /devtools/etc/profile.ant
+if [ -e /opt-share/etc/profile.ant ] ; then
+    . /opt-share/etc/profile.ant
 fi
 
 JOGL_BUILDDIR=$1
diff --git a/make/scripts/setvc9-jogl.bat b/make/scripts/setvc9-jogl.bat
index 6ff16053e..26cdf8ff4 100755
--- a/make/scripts/setvc9-jogl.bat
+++ b/make/scripts/setvc9-jogl.bat
@@ -1,7 +1,7 @@
 

 

-set PATH=C:\cygwin\devtools\share\apache-ant-1.8.2\bin;%PATH%

-set ANT_PATH=C:\cygwin\devtools\share\apache-ant-1.8.2

+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

diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 0bc8272fe..c25ccf335 100644
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,4 +1,4 @@
-set JRE_PATH=C:\jre1.6.0_23_x64\bin
+set JRE_PATH=C:\jre1.6.0_24_x64\bin
 set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
 
 %JRE_PATH%\javaws -uninstall
diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index 9b44dc178..84d7f2d9b 100644
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -33,5 +33,5 @@ REM scripts\java-win32.bat com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT
 REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT -time 10000
 REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleNEWT -time 10000
 
-scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
+scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4
 REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index 246826fd6..43cc8ccbb 100644
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -47,7 +47,7 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingPr
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $*
 REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT $*
 
-scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
+scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $*
 
 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT -time 5000
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 9a5e6fb20..816c691a4 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -1,6 +1,23 @@
 #! /bin/bash
 
-bdir=../build-x86_64
+if [ -z "$1" -o -z "$2" ] ; then
+    echo Usage $0 java-exe build-dir
+    exit 0
+fi
+
+javaexe=$1
+shift
+bdir=$1
+shift
+
+if [ ! -x $javaexe ] ; then
+    echo java-exe $javaexe is not an executable
+    exit 1
+fi
+if [ ! -d $bdir ] ; then
+    echo build-dir $bdir is not a directory
+    exit 1
+fi
 
 rm -f java-run.log
 
@@ -8,13 +25,13 @@ spath=`dirname $0`
 
 . $spath/setenv-jogl.sh $bdir JOGL_ALL
 
-which java 2>&1 | tee -a java-run.log
-java -version 2>&1 | tee -a java-run.log
+which $javaexe 2>&1 | tee -a java-run.log
+$javaexe -version 2>&1 | tee -a java-run.log
 echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log
 echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log
 echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log
 echo SWT_CLASSPATH: $SWT_CLASSPATH 2>&1 | tee -a java-run.log
-echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
+echo $javaexe $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log
 
 function jrun() {
     awtarg=$1
@@ -50,7 +67,7 @@ function jrun() {
     echo
     echo "Test Start: $*"
     echo
-    java $awtarg $X_ARGS $D_ARGS $*
+    $javaexe $awtarg $X_ARGS $D_ARGS $*
     echo
     echo "Test End: $*"
     echo
@@ -87,7 +104,7 @@ function testawt() {
 #testawt com.jogamp.opengl.test.junit.newt.parenting.TestParenting02NEWT
 #testawt com.jogamp.opengl.test.junit.newt.TestScreenMode00NEWT
 #testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode01NEWT
-#testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT
+testnoawt com.jogamp.opengl.test.junit.newt.TestScreenMode02NEWT
 #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT -time 1000000
 #testawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT
 #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated
@@ -108,9 +125,9 @@ function testawt() {
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.gears.TestGearsGLJPanelAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.texture.TestTexture01AWT
 #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT
-#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn
+#testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
 #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT
-testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
+#testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417
 
 #
 # newt.awt (testawt)