Changeset 8777 in josm for trunk/linux/tested/usr/bin/josm

Timestamp:

2015-09-21T23:48:29+02:00 (9 years ago)

Author:

Don-vip

Message:

Basic Java 9 support: make code compile, and Linux scripts detect it

File:

• trunk/linux/tested/usr/bin/josm (modified) (2 diffs)

trunk/linux/tested/usr/bin/josm

@@ -12 +12 @@
 # If OpenJDK is only available headless, do not try it
 if dpkg --get-selections 'openjdk-*-jre' | grep install$ > /dev/null ; then
+        JAVA9_CMDS="/usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java /usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java /usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-openjdk/bin/java /usr/lib/jvm/java-7-openjdk-$ARCH/bin/java /usr/lib/jvm/java-7-oracle/bin/java"
 else
+        JAVA9_CMDS="/usr/lib/jvm/java-9-oracle/bin/java"
         JAVA8_CMDS="/usr/lib/jvm/java-8-oracle/bin/java"
         JAVA7_CMDS="$JAVA_HOME/bin/java /usr/lib/jvm/java-7-oracle/bin/java /usr/bin/java"
@@ -45 +47 @@
 done
 
+for jcmd in $JAVA9_CMDS; do
+        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
+for jcmd in $JAVA9_CMDS; do
+    if [ -x "$jcmd" -a -z "${JAVACMD}" ]; then
+        JAVACMD="$jcmd"
+    fi
+done
+
 if [ "$JAVACMD" ]; then
     echo "Using $JAVACMD to execute josm." || true