Changeset 14244 in josm

Timestamp:

2018-09-10T21:27:45+02:00 (6 years ago)

Author:

Don-vip

Message:

see #11924, see #15560, see #16047, see #16682 - fixes to make work proguard (OK) and animal_sniffer (still KO) with Java 9+

File:

• trunk/build.xml (modified) (6 diffs)

trunk/build.xml

@@ -68 +68 @@
             </not>
         </condition>
+        <condition property="java.library.dir" value="jmods" else="lib">
+            <isset property="isJava9"/>
+        </condition>
         <path id="groovy.classpath">
             <fileset dir="${tools.dir}/groovy">
@@ -613 +616 @@
         -outjars ${dist-optimized.jar}
 
-        -libraryjars ${java.home}/lib
+        -libraryjars ${java.home}/${java.library.dir}
 
         -dontoptimize
@@ -659 +662 @@
         </proguard>
     </target>
-    <!-- Proguard does not support Java 9 : http://sourceforge.net/p/proguard/bugs/551/ -->
-    <target name="dist-optimized-report" depends="dist-optimized" unless="isJava9">
+    <target name="dist-optimized-report" depends="dist-optimized">
         <!-- generate difference report between optimized jar and normal one -->
         <exec executable="perl" dir="${basedir}">
@@ -706 +708 @@
                 <linecontainsregexp negate="true">
                     <regexp pattern="${deprecated-plugins}"/>
+                </linecontainsregexp>
+                <linecontainsregexp negate="true" unless:set="isJava10">
+                    <!-- Skip openjfx on Java 8/9, built for Java 10+ only -->
+                    <regexp pattern="openjfx"/>
                 </linecontainsregexp>
                 <tokenfilter>
@@ -743 +749 @@
             <path>
                 <fileset file="${dist-optimized.jar}"/>
-                <fileset file="${java.home}/lib/rt.jar"/>
-                <fileset file="${java.home}/lib/jce.jar"/>
-                <fileset file="${java.home}/lib/ext/jfxrt.jar"/>
+                <fileset file="${java.home}/lib/rt.jar" unless:set="isJava9"/>
+                <fileset file="${java.home}/lib/jce.jar" unless:set="isJava9"/>
+                <fileset file="${java.home}/lib/ext/jfxrt.jar" unless:set="isJava9"/>
+                <fileset dir="${java.home}/jmods" if:set="isJava9"/>
             </path>
         </as:build-signatures>
@@ -806 +813 @@
             <!-- plugins used by another ones -->
             <ignore classname="org.openstreetmap.josm.plugins.geotools.*"/>
+            <ignore classname="org.openstreetmap.josm.plugins.jaxb.*"/>
             <ignore classname="org.openstreetmap.josm.plugins.jna.*"/>
             <ignore classname="org.openstreetmap.josm.plugins.jts.*"/>
             <ignore classname="org.openstreetmap.josm.plugins.log4j.*"/>
+            <ignore classname="org.openstreetmap.josm.plugins.openjfx.*"/>
             <ignore classname="org.openstreetmap.josm.plugins.utilsplugin2.*"/>
             <ignore classname="sun.*"/>