aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2023-01-15 03:13:30 +0100
committerSven Gothel <[email protected]>2023-01-15 03:13:30 +0100
commit32c3fbccac055b3fc878f53dfb385d00d6789c7d (patch)
tree9980f7264500e35e7aa1a13322c1853d949e28c7 /make
parent853361a9fecdf1def9e7c25c8917207ca3e70a3b (diff)
Default build is JDK-17, prepare up to Java-21 (next LTS); PlatformPropsImpl: Remove static OSXVersion and Version* vars, add JAVA_17 and JAVA_21 flag.
PlatformPropsImpl's static OSXVersion is JOGL specific and will be moved into its GLContextImpl. PlatformPropsImpl's static Version are not required and eats up memory where it can be used transitionary.
Diffstat (limited to 'make')
-rwxr-xr-xmake/jogamp-env.xml4
-rwxr-xr-xmake/scripts/make.gluegen.all.linux-x86_64.sh3
-rw-r--r--make/scripts/setenv-build-jogamp-x86.sh10
-rw-r--r--make/scripts/setenv-build-jogamp-x86_64.sh10
4 files changed, 27 insertions, 0 deletions
diff --git a/make/jogamp-env.xml b/make/jogamp-env.xml
index b49d1f4..2f036fa 100755
--- a/make/jogamp-env.xml
+++ b/make/jogamp-env.xml
@@ -91,6 +91,8 @@
<equals arg1="${ant.java.version}" arg2="17"/>
<equals arg1="${ant.java.version}" arg2="18"/>
<equals arg1="${ant.java.version}" arg2="19"/>
+ <equals arg1="${ant.java.version}" arg2="20"/>
+ <equals arg1="${ant.java.version}" arg2="21"/>
</or>
</not>
</condition>
@@ -119,6 +121,8 @@
<equals arg1="${ant.java.version}" arg2="17"/>
<equals arg1="${ant.java.version}" arg2="18"/>
<equals arg1="${ant.java.version}" arg2="19"/>
+ <equals arg1="${ant.java.version}" arg2="20"/>
+ <equals arg1="${ant.java.version}" arg2="21"/>
</or>
</condition>
<echo message="javadoc.xarg1 ${javadoc.xarg1}"/>
diff --git a/make/scripts/make.gluegen.all.linux-x86_64.sh b/make/scripts/make.gluegen.all.linux-x86_64.sh
index b0bbed7..aaac667 100755
--- a/make/scripts/make.gluegen.all.linux-x86_64.sh
+++ b/make/scripts/make.gluegen.all.linux-x86_64.sh
@@ -2,6 +2,9 @@
SDIR=`dirname $0`
+# export J2RE_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+# export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64
+
if [ -e $SDIR/setenv-build-jogamp-x86_64.sh ] ; then
. $SDIR/setenv-build-jogamp-x86_64.sh
fi
diff --git a/make/scripts/setenv-build-jogamp-x86.sh b/make/scripts/setenv-build-jogamp-x86.sh
index 5c7ba06..c25474c 100644
--- a/make/scripts/setenv-build-jogamp-x86.sh
+++ b/make/scripts/setenv-build-jogamp-x86.sh
@@ -28,6 +28,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
fi
if [ -z "$FOUND_JAVA" ] ; then
+ if [ -e /usr/lib/jvm/java-17-openjdk-i386 ] ; then
+ J2RE_HOME=/usr/lib/jvm/java-17-openjdk-i386
+ JAVA_HOME=/usr/lib/jvm/java-17-openjdk-i386
+ PATH=$JAVA_HOME/bin:$PATH
+ export J2RE_HOME JAVA_HOME
+ FOUND_JAVA=1
+ fi
+fi
+
+if [ -z "$FOUND_JAVA" ] ; then
if [ -e /usr/lib/jvm/java-11-openjdk-i386 ] ; then
J2RE_HOME=/usr/lib/jvm/java-11-openjdk-i386
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-i386
diff --git a/make/scripts/setenv-build-jogamp-x86_64.sh b/make/scripts/setenv-build-jogamp-x86_64.sh
index e9bf313..26dc5d0 100644
--- a/make/scripts/setenv-build-jogamp-x86_64.sh
+++ b/make/scripts/setenv-build-jogamp-x86_64.sh
@@ -28,6 +28,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
fi
if [ -z "$FOUND_JAVA" ] ; then
+ if [ -e /usr/lib/jvm/java-17-openjdk-amd64 ] ; then
+ J2RE_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ PATH=$JAVA_HOME/bin:$PATH
+ export J2RE_HOME JAVA_HOME
+ FOUND_JAVA=1
+ fi
+fi
+
+if [ -z "$FOUND_JAVA" ] ; then
if [ -e /usr/lib/jvm/java-11-openjdk-amd64 ] ; then
J2RE_HOME=/usr/lib/jvm/java-11-openjdk-amd64
JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64