Changeset 35374 in osm

Timestamp:

2020-03-17T13:32:15+01:00 (5 years ago)

Author:

donvip

Message:

build JavaFX plugins only with Java 11+, enable Jacoco coverage on Java 13/14/15

Location:

applications/editors/josm/plugins

Files:

• SaudiNationalAddress (modified) (1 prop)
• build-common.xml (modified) (1 diff)
• build.xml (modified) (4 diffs)
• comfort0 (modified) (1 prop)

applications/editors/josm/plugins/build-common.xml

@@ -65 +65 @@
     <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
     <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
-    <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
+    <condition property="isJava16"><matches string="${ant.java.version}" pattern="1[6-9]" /></condition>
+    <!-- Disable jacoco on Java 16+, see https://github.com/jacoco/jacoco/pull/992 -->
     <condition property="coverageByDefault">
         <not>
-            <isset property="isJava13"/>
+            <isset property="isJava16"/>
         </not>
     </condition>

applications/editors/josm/plugins/build.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project name="josm-plugins" default="dist" basedir=".">
+<project name="josm-plugins" default="dist" basedir="." xmlns:if="ant:if" xmlns:unless="ant:unless">
     <target name="compile_josm" unless="skip-josm">
         <ant dir="../core" target="dist"/>
@@ -7 +7 @@
         <ant dir="../core" target="test-compile"/>
     </target>
+    <!-- For Java specific stuff by version -->
+    <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
+    <!-- Specific plugins -->
     <property name="ordered_plugins" value="jaxb/build.xml
                                             jna/build.xml
                                             jts/build.xml
                                             gson/build.xml
-                                            javafx/build.xml
                                             ejml/build.xml
                                             geotools/build.xml
@@ -19 +21 @@
                                             apache-http/build.xml
                                                                                         austriaaddresshelper/build.xml"/>
+    <property name="javafx_plugins" value="javafx/build.xml
+                                                                                        Mapillary/build.xml
+                                                                                        MicrosoftStreetside/build.xml"/>
     <macrodef name="iterate">
         <attribute name="target"/>
@@ -24 +29 @@
             <subant target="@{target}" inheritall="true">
                 <filelist dir="." files="${ordered_plugins}"/>
-                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${ordered_plugins}"/>
+                <!-- Build JavaFX plugins only with Java 11+ -->
+                <filelist dir="." files="${javafx_plugins}" if:set="isJava11"/>
+                <fileset  dir="." includes="*/build.xml" excludes="00_*/build.xml *.wip/build.xml ${javafx_plugins} ${ordered_plugins}"/>
             </subant>
         </sequential>

applications/editors/josm/plugins/comfort0

@@ -1 +1 @@
 build
 javadoc
+bin
+bintest

@@ -1 +1 @@
 build
 javadoc
+bin
+bintest

@@ -1 +1 @@
 build
 javadoc
+bin
+bintest