Update Windows build/test scripts, remove 32-bit windows scripts

6 files changed, 4 insertions, 98 deletions

diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat
deleted file mode 100755
index 436d68b..0000000
--- a/make/scripts/java-win32.bat
+++ /dev/null
@@ -1,25 +0,0 @@
-

-set BLD_SUB=build-win32

-

-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_DIR=..\%BLD_SUB%

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

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

-

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

-REM set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\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 X_ARGS="-Drootrel.build=%BLD_SUB%" "-Dgluegen.root=.."

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

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

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

-

-%J2RE_HOME%\bin\java -classpath %CP_ALL% %X_ARGS% %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% %X_ARGS% %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 575d937..65032cd 100755
--- a/make/scripts/java-win64.bat
+++ b/make/scripts/java-win64.bat
@@ -1,8 +1,8 @@
 

 set BLD_SUB=build-win64

 

-set J2RE_HOME=c:\jre-11.0.4+11_x64

-set JAVA_HOME=c:\jdk-11.0.4+11_x64

+set J2RE_HOME=c:\jdk-17

+set JAVA_HOME=c:\jdk-17

 set ANT_PATH=C:\apache-ant-1.10.5

 

 set BLD_DIR=..\%BLD_SUB%

diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat
deleted file mode 100755
index f04d786..0000000
--- a/make/scripts/make.gluegen.all.win32.bat
+++ /dev/null
@@ -1,29 +0,0 @@
-set THISDIR="C:\JogAmp"

-

-set J2RE_HOME=c:\jre-17

-set JAVA_HOME=c:\jdk-17

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

-set GIT_PATH=C:\cygwin64\bin

-set SEVENZIP=C:\Program Files\7-Zip

-

-set CMAKE_PATH=C:\cmake-3.15.2-win32-x86

-set CMAKE_C_COMPILER=c:\mingw32\bin\gcc

-

-set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

-

-set LIB_GEN=%THISDIR%\lib

-set CLASSPATH=.;%THISDIR%\build-win32\classes

-REM    -Dc.compiler.debug=true 

-REM    -DuseOpenMAX=true 

-REM    -DuseKD=true

-REM    -Djogl.cg=1 -D-Dwindows.cg.lib=C:\Cg-2.2

-

-set SOURCE_LEVEL=1.8

-set TARGET_LEVEL=1.8

-set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar

-

-REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org

-set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet

-

-ant -Drootrel.build=build-win32 %1 %2 %3 %4 %5 %6 %7 %8 %9 > make.gluegen.all.win32.log 2>&1

-

diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat
index 710b0ae..6f3716e 100755
--- a/make/scripts/make.gluegen.all.win64.bat
+++ b/make/scripts/make.gluegen.all.win64.bat
@@ -1,12 +1,12 @@
 set THISDIR="C:\JogAmp"

 

-set J2RE_HOME=c:\jre-17

+set J2RE_HOME=c:\jdk-17

 set JAVA_HOME=c:\jdk-17

 set ANT_PATH=C:\apache-ant-1.10.5

 set GIT_PATH=C:\cygwin64\bin

 set SEVENZIP=C:\Program Files\7-Zip

 

-set CMAKE_PATH=C:\cmake-3.15.2-win64-x64

+set CMAKE_PATH=C:\cmake-3.25.1-windows-x64_64

 set CMAKE_C_COMPILER=c:\mingw64\bin\gcc

 

 set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%

diff --git a/make/scripts/runtest-x32.bat b/make/scripts/runtest-x32.bat
deleted file mode 100755
index 6f169d5..0000000
--- a/make/scripts/runtest-x32.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-
-REM 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
-REM scripts\java-win32.bat com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter
-REM scripts\java-win32.bat com.jogamp.common.util.TestTempJarCache
-scripts\java-win32.bat com.jogamp.common.util.TestPlatform01
-REM scripts\java-win32.bat com.jogamp.common.os.TestElfReader01
-REM scripts\java-win32.bat com.jogamp.common.util.TestIOUtilURIHandling
-REM scripts\java-win32.bat com.jogamp.common.nio.TestByteBufferInputStream
-REM scripts\java-win32.bat com.jogamp.common.nio.TestByteBufferOutputStream
-
diff --git a/make/scripts/test-win32-smb_share.bat b/make/scripts/test-win32-smb_share.bat
deleted file mode 100755
index ce1ab1f..0000000
--- a/make/scripts/test-win32-smb_share.bat
+++ /dev/null
@@ -1,24 +0,0 @@
-

-set SMB_ROOT=\\risa.goethel.localnet\deployment\test\jogamp

-

-set BLD_SUB=build-win32

-set J2RE_HOME=c:\jre8u202-b08_x32

-set JAVA_HOME=c:\jdk8u202-b08_x32

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

-

-set PROJECT_ROOT=%SMB_ROOT%\gluegen

-set BLD_DIR=%PROJECT_ROOT%\%BLD_SUB%

-

-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;%PATH%

-

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

-

-set LIB_DIR=

-

-set CP_ALL=.;%BLD_DIR%\gluegen-rt.jar;%PROJECT_ROOT%\make\lib\junit.jar;%ANT_PATH%\lib\ant.jar;%ANT_PATH%\lib\ant-junit.jar

-

-echo CP_ALL %CP_ALL%

-

-%J2RE_HOME%\bin\java -classpath %CP_ALL% %D_ARGS% %X_ARGS% com.jogamp.common.GlueGenVersion > java-win.log 2>&1

-tail java-win.log

-