Changeset 10580 in josm for trunk/linux/latest

Timestamp:

2016-07-21T01:57:41+02:00 (8 years ago)

Author:

Don-vip

Message:

see #11390 - switch to Java 8

Location:

trunk/linux/latest

Files:

• DEBIAN/control (modified) (1 diff)
• usr/bin/josm-latest (modified) (3 diffs)
• usr/share/man/man1/josm-latest.1 (modified) (2 diffs)

trunk/linux/latest/DEBIAN/control

@@ -6 +6 @@
 Priority: extra
 Architecture: all
-Depends: openjdk-8-jre | java7-runtime
+Depends: openjdk-8-jre | java8-runtime
 Description: Editor for OpenStreetMap (daily development snapshot)
  JOSM is an editor for OpenStreetMap (OSM) written in Java.

trunk/linux/latest/usr/bin/josm-latest

@@ -3 +3 @@
 set -e
 
-# First, users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
+# First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK or Oracle's proprietary JDK.
 # Override to a specific one using $JAVACMD
+ALTERNATIVE_JDK="`readlink -n -f /etc/alternatives/java`"
+
 # Let's get the current architecture -- needed for multiarchified Java
 ARCH="`dpkg --print-architecture 2> /dev/null || true`"
@@ -12 +14 @@
         JAVA_CMDS="$JAVA_HOME/bin/java"
         JAVA_CMDS="${JAVA_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"
-        JAVA_CMDS="${JAVA_CMDS} /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"
         JAVA_CMDS="${JAVA_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"
 else
         JAVA_CMDS="$JAVA_HOME/bin/java /usr/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-8-oracle/bin/java"
-        JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-7-oracle/bin/java"
         JAVA_CMDS="${JAVA_CMDS} /usr/lib/jvm/java-9-oracle/bin/java"
 fi
@@ -26 +26 @@
 
 JAVA_OPTS="-Djosm.restart=true -Djosm.home=$HOME/.josm-latest -Djava.net.useSystemProxies=true $JAVA_OPTS"
+
+if [ -z "${JAVACMD}" ]; then
+    for jcmd in $JAVA_CMDS; do
+        if [ "z$ALTERNATIVE_JDK" = "z`readlink -n -f $jcmd`" ] && [ -z "${JAVACMD}" ]; then
+            JAVACMD="$jcmd"
+            break
+        fi
+    done
+fi
 
 if [ -z "${JAVACMD}" ]; then

trunk/linux/latest/usr/share/man/man1/josm-latest.1

@@ -1 @@
-.TH JOSM 1 "December 20, 2014"
+.TH JOSM 1 "July 21, 2016"
 .\" Please adjust this date whenever revising the manpage.
 .SH NAME
@@ -7 +7 @@
 .SH DESCRIPTION
 .B JOSM 
-is an editor for OpenStreetMap written in Java 7. 
+is an editor for OpenStreetMap written in Java 8. 
 .PP
 .B OpenStreetMap