From 32c3fbccac055b3fc878f53dfb385d00d6789c7d Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Sun, 15 Jan 2023 03:13:30 +0100
Subject: 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.
---
 make/scripts/make.gluegen.all.linux-x86_64.sh |  3 +++
 make/scripts/setenv-build-jogamp-x86.sh       | 10 ++++++++++
 make/scripts/setenv-build-jogamp-x86_64.sh    | 10 ++++++++++
 3 files changed, 23 insertions(+)

(limited to 'make/scripts')

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
@@ -27,6 +27,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
     fi 
 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
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
@@ -27,6 +27,16 @@ if [ ! -z "$J2RE_HOME" -a ! -z "$JAVA_HOME" ] ; then
     fi 
 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
-- 
cgit v1.2.3