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


Ignore:
Timestamp:
2019-05-28T02:23:26+02:00 (8 months ago)
Author:
Don-vip
Message:

see #16047, see #16498, see #17516, fix #17723

  • add java.scripting module when loading JOSM with Java 11+
  • detect java 12/13 on Linux
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/linux/tested/usr/bin/josm

    r14110 r15128  
    1515        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-11-openjdk/bin/java /usr/lib/jvm/java-11-openjdk-$ARCH/bin/java"
    1616        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-openjdk/bin/java /usr/lib/jvm/java-8-openjdk-$ARCH/bin/java"
     17        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-12-openjdk/bin/java /usr/lib/jvm/java-12-openjdk-$ARCH/bin/java"
    1718        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-10-openjdk/bin/java /usr/lib/jvm/java-10-openjdk-$ARCH/bin/java"
    1819        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-openjdk/bin/java /usr/lib/jvm/java-9-openjdk-$ARCH/bin/java"
     20        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-13-openjdk/bin/java /usr/lib/jvm/java-13-openjdk-$ARCH/bin/java"
    1921else
    2022        JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
     
    4951    if [ "`expr match \"${JAVACMD}\" 'java-9'`" != "0" ] || [ "`expr match \"${JAVACMD}\" 'java-10'`" != "0" ]; then
    5052        JAVA_OPTS="--add-modules java.activation,java.se.ee $JAVA_OPTS"
     53    elif [ "`expr match \"${JAVACMD}\" 'java-1'`" != "0" ]; then
     54        JAVA_OPTS="--add-modules java.scripting $JAVA_OPTS"
    5155    fi
    5256    set +e
Note: See TracChangeset for help on using the changeset viewer.