diff options
| author | Sven Gothel <[email protected]> | 2023-01-15 04:08:38 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2023-01-15 04:08:38 +0100 |
| commit | 30368d69ec33f006b901c6888ce9876c12b0e6af (patch) | |
| tree | a210b3bfe7148b762ffb2ca23ae908962a87dac1 | |
| parent | 7e6319105d606706cc3154af2213125b72e85066 (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.joal.all.ios.amd64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.ios.arm64.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.macosx.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.win32.bat | 4 | ||||
| -rwxr-xr-x | make/scripts/make.joal.all.win64.bat | 4 |
6 files changed, 8 insertions, 7 deletions
@@ -5,3 +5,4 @@ test/classes test/results nbproject/private javadoc_public/ +*.log diff --git a/make/scripts/make.joal.all.ios.amd64.sh b/make/scripts/make.joal.all.ios.amd64.sh index c3c5495..dfc7e13 100755 --- a/make/scripts/make.joal.all.ios.amd64.sh +++ b/make/scripts/make.joal.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.joal.all.ios.arm64.sh b/make/scripts/make.joal.all.ios.arm64.sh index 8ab3b27..40742a7 100755 --- a/make/scripts/make.joal.all.ios.arm64.sh +++ b/make/scripts/make.joal.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.joal.all.macosx.sh b/make/scripts/make.joal.all.macosx.sh index 6248273..4ff6613 100755 --- a/make/scripts/make.joal.all.macosx.sh +++ b/make/scripts/make.joal.all.macosx.sh @@ -4,7 +4,7 @@ if [ -e /usr/local/etc/profile.ant ] ; then . /usr/local/etc/profile.ant fi -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.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat index 202fc6e..d3ae0b7 100755 --- a/make/scripts/make.joal.all.win32.bat +++ b/make/scripts/make.joal.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-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.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat index 2cb1340..f2f9183 100755 --- a/make/scripts/make.joal.all.win64.bat +++ b/make/scripts/make.joal.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL"
-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
|