test scripts: Bump JRE, add TEMP/TMP settings

8 files changed, 36 insertions, 22 deletions

diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
index 4cae57e..2441740 100755
--- a/make/scripts/java-win32.bat
+++ b/make/scripts/java-win32.bat
@@ -1,21 +1,23 @@
 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.7.0_67_x32

-set JAVA_HOME=c:\jdk1.7.0_67_x32

+set J2RE_HOME=c:\jre1.8.0_25_x32

+set JAVA_HOME=c:\jdk1.8.0_25_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set BLD_DIR=..\%BLD_SUB%

 REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives

-set LIB_DIR=..\%BLD_SUB%\test\build\natives

+REM set LIB_DIR=..\%BLD_SUB%\test\build\natives

 

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

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

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

 

 set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar

 

 echo CP_ALL %CP_ALL%

 

-set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary"

+REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary"

 REM set D_ARGS="-Djogamp.debug.IOUtil"

-REM set D_ARGS="-Djogamp.debug=all"

+set D_ARGS="-Djogamp.debug=all"

 

-%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1

+REM %J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1

+%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win32.log 2>&1

diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat
index b467458..d58cb4e 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -1,23 +1,25 @@
 

 set BLD_SUB=build-win64

-set J2RE_HOME=c:\jre1.7.0_67_x64

-set JAVA_HOME=c:\jdk1.7.0_67_x64

+set J2RE_HOME=c:\jre1.8.0_25_x64

+set JAVA_HOME=c:\jdk1.8.0_25_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

 set BLD_DIR=..\%BLD_SUB%

 REM set LIB_DIR=..\%BLD_SUB%\obj;..\%BLD_SUB%\test\build\natives

-set LIB_DIR=..\%BLD_SUB%\test\build\natives

+REM set LIB_DIR=..\%BLD_SUB%\test\build\natives

 

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

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

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

 

 set CP_ALL=.;lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar;lib/semantic-versioning/semver.jar;lib\TestJarsInJar.jar;%BLD_DIR%\gluegen-rt.jar;%BLD_DIR%\gluegen.jar;%BLD_DIR%\gluegen-test-util.jar;%BLD_DIR%\test\build\gluegen-test.jar

 

 echo CP_ALL %CP_ALL%

 

-set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.JNILibLoader" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.JarUtil" "-Djogamp.debug.TempJarCache"

+REM set D_ARGS="-Djogamp.debug.IOUtil" "-Djogamp.debug.JNILibLoader" "-Djogamp.debug.TempFileCache" "-Djogamp.debug.JarUtil" "-Djogamp.debug.TempJarCache"

 REM set D_ARGS="-Djogamp.debug.Platform" "-Djogamp.debug.NativeLibrary" "-Djogamp.debug.IOUtil"

 REM set D_ARGS="-Djogamp.debug.IOUtil"

-REM set D_ARGS="-Djogamp.debug=all"

+set D_ARGS="-Djogamp.debug=all"

 

-%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1

+REM %J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Djava.library.path=%LIB_DIR%" "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1

+%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% "-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true" %1 %2 %3 %4 %5 %6 %7 %8 %9 > java-win64.log 2>&1

 

diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
index a1f0bac..b421d4c 100755
--- a/make/scripts/make.gluegen.all.win32.bat
+++ b/make/scripts/make.gluegen.all.win32.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_20_x32

-set JAVA_HOME=c:\jdk1.8.0_20_x32

+set J2RE_HOME=c:\jre1.8.0_25_x32

+set JAVA_HOME=c:\jdk1.8.0_25_x32

 set ANT_PATH=C:\apache-ant-1.9.4

 

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

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index cfd2d16..faba4c3 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,7 +1,7 @@
 set THISDIR="C:\JOGL"

 

-set J2RE_HOME=c:\jre1.8.0_20_x64

-set JAVA_HOME=c:\jdk1.8.0_20_x64

+set J2RE_HOME=c:\jre1.8.0_25_x64

+set JAVA_HOME=c:\jdk1.8.0_25_x64

 set ANT_PATH=C:\apache-ant-1.9.4

 

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

diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat
index d532ff6..9297d9a 100755
--- a/make/scripts/runtest-x32.bat
+++ b/make/scripts/runtest-x32.bat
@@ -1,3 +1,8 @@
+REM set TEMP=C:\Documents and Settings\jogamp\temp-exec
+REM set TMP=C:\Documents and Settings\jogamp\temp-exec
+REM set TEMP=C:\Users\jogamp\temp-exec
+REM set TMP=C:\Users\jogamp\temp-exec
+
 scripts\java-win32.bat com.jogamp.common.GlueGenVersion 
 REM scripts\java-win32.bat com.jogamp.common.util.TestVersionInfo
 REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter
diff --git a/make/scripts/runtest-x64.bat b/make/scripts/runtest-x64.bat
index 769ee84..199122a 100755
--- a/make/scripts/runtest-x64.bat
+++ b/make/scripts/runtest-x64.bat
@@ -1,3 +1,8 @@
+REM set TEMP=C:\Documents and Settings\jogamp\temp-exec
+REM set TMP=C:\Documents and Settings\jogamp\temp-exec
+REM set TEMP=C:\Users\jogamp\temp-exec
+REM set TMP=C:\Users\jogamp\temp-exec
+
 scripts\java-win64.bat com.jogamp.common.GlueGenVersion 
 REM scripts\java-win64.bat com.jogamp.common.util.TestVersionInfo
 REM scripts\java-win64.bat com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index d44688a..6a5bee9 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -58,7 +58,7 @@ rm -f $LOG
 #D_ARGS="-Djogamp.debug.IOUtil"
 #D_ARGS="-Djogamp.debug.ByteBufferInputStream"
 #D_ARGS="-Djogamp.debug.Bitstream"
-#D_ARGS="-Djogamp.debug=all"
+D_ARGS="-Djogamp.debug=all"
 
 function onetest() {
     #USE_CLASSPATH=lib/junit.jar:$ANT_JARS:lib/semantic-versioning/semver.jar:"$builddir"/../make/lib/TestJarsInJar.jar:"$builddir"/gluegen-rt.jar:"$builddir"/gluegen.jar:"$builddir"/gluegen-test-util.jar:"$builddir"/test/build/gluegen-test.jar
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
index 5f55583..a6d3cc1 100755
--- a/make/scripts/test-win32-smb_share.bat
+++ b/make/scripts/test-win32-smb_share.bat
@@ -2,9 +2,9 @@
 set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp

 

 set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre1.7.0_45_x32

-set JAVA_HOME=c:\jdk1.7.0_45_x32

-set ANT_PATH=C:\apache-ant-1.8.2

+set J2RE_HOME=c:\jre1.8.0_25_x32

+set JAVA_HOME=c:\jdk1.8.0_25_x32

+set ANT_PATH=C:\apache-ant-1.9.4

 

 set PROJECT_ROOT=%SMB_ROOT%\gluegen

 set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB%