diff options
| author | Sven Gothel <[email protected]> | 2023-01-15 04:08:18 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-15 04:08:18 +0100 |
| commit | af39597583ec0c9783e343cb5f3defdd2c211971 (patch) | |
| tree | cd52c3a67ccbb50fb84d5b167e6b3ace6e8ca04e | |
| parent | 0ee82236f503008d8421804760eda4750ee77d3a (diff) | |
Build scripts: MacOS + Windows: Use JDK-17 to build our Java-1.8 API
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.ios.amd64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.ios.arm64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.macosx.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.win32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.gluegen.all.win64.bat | 4 |
6 files changed, 8 insertions, 7 deletions
@@ -3,3 +3,4 @@ make/GnuCTreeParserTokenTypes.txt make/STDCTokenTypes.txt build*/ build-temp +*.log diff --git a/make/scripts/make.gluegen.all.ios.amd64.sh b/make/scripts/make.gluegen.all.ios.amd64.sh index bda783d..ddc0fd7 100755 --- a/make/scripts/make.gluegen.all.ios.amd64.sh +++ b/make/scripts/make.gluegen.all.ios.amd64.sh @@ -16,7 +16,7 @@ fi export SDKROOT=iphonesimulator13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.gluegen.all.ios.arm64.sh b/make/scripts/make.gluegen.all.ios.arm64.sh index a4e811d..13c9469 100755 --- a/make/scripts/make.gluegen.all.ios.arm64.sh +++ b/make/scripts/make.gluegen.all.ios.arm64.sh @@ -16,7 +16,7 @@ fi export SDKROOT=iphoneos13.2 xcrun --show-sdk-path -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH which java diff --git a/make/scripts/make.gluegen.all.macosx.sh b/make/scripts/make.gluegen.all.macosx.sh index d61843a..9d30807 100755 --- a/make/scripts/make.gluegen.all.macosx.sh +++ b/make/scripts/make.gluegen.all.macosx.sh @@ -13,7 +13,7 @@ fi # Force OSX SDK 10.6, if desired # export SDKROOT=macosx10.6 -JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH diff --git a/make/scripts/make.gluegen.all.win32.bat b/make/scripts/make.gluegen.all.win32.bat index caaf7f0..f04d786 100755 --- a/make/scripts/make.gluegen.all.win32.bat +++ b/make/scripts/make.gluegen.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre-11.0.4+11_x32
-set JAVA_HOME=c:\jdk-11.0.4+11_x32
+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
diff --git a/make/scripts/make.gluegen.all.win64.bat b/make/scripts/make.gluegen.all.win64.bat index 239f8e2..710b0ae 100755 --- a/make/scripts/make.gluegen.all.win64.bat +++ b/make/scripts/make.gluegen.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JogAmp"
-set J2RE_HOME=c:\jre-11.0.4+11_x64
-set JAVA_HOME=c:\jdk-11.0.4+11_x64
+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
|