Changeset 32900 in osm for applications/editors/josm

Timestamp:

2016-09-03T01:48:19+02:00 (9 years ago)

Author:

donvip

Message:

add java 9 compatibility for locating jaxb compiler (xjc)

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (1 diff)
• dataimport/build.xml (modified) (1 diff)
• opendata/build.xml (modified) (1 diff)

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

@@ -35 +35 @@
         <os family="Windows"/>
     </condition>
-    <target name="-jaxb_win" if="isWindows">
-        <property name="xjc" value="${java.home}\..\bin\xjc.exe" />
-    </target>
-    <target name="-jaxb_nix" unless="isWindows">
-        <property name="xjc" value="${java.home}/../bin/xjc" />
+    <!-- For Java9-specific stuff -->
+    <condition property="isJava9">
+        <equals arg1="${ant.java.version}" arg2="1.9" />
+    </condition>
+    <target name="-jaxb_before9" unless="isJava9">
+        <property name="xjc" value="${java.home}${file.separator}..${file.separator}bin${file.separator}xjc" />
+    </target>
+    <target name="-jaxb_after9" if="isJava9">
+        <property name="xjc" value="${java.home}${file.separator}bin${file.separator}xjc" />
     </target>
 

applications/editors/josm/plugins/dataimport/build.xml

@@ -22 +22 @@
     <import file="../build-common.xml"/>
 
-    <target name="pre-compile" depends="-jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
+    <target name="pre-compile" depends="-jaxb_before9, -jaxb_after9" unless="jaxb.notRequired">
         <exec executable="${xjc}" failonerror="true">
             <arg value="-d"/>

applications/editors/josm/plugins/opendata/build.xml

@@ -89 +89 @@
     </target>
     
-    <target name="xjc_neptune" depends="init, -jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
+    <target name="xjc_neptune" depends="init, -jaxb_before9, -jaxb_after9" unless="jaxb.notRequired">
         <exec executable="${xjc}" failonerror="true">
             <arg value="-d"/>