Changeset 7209 in josm for trunk

Timestamp:

2014-06-02T20:24:59+02:00 (11 years ago)

Author:

Don-vip

Message:

see #10040 - call JDK xjc native executable instead of ant task to avoid problems with JDK8 and OpenSUSE systems

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• tools/jaxb (deleted)

trunk/build.xml

@@ -22 +22 @@
         <isset property="clevel"/>
     </condition>
+    <!-- For Windows-specific stuff -->
+    <condition property="isWindows">
+        <os family="Windows"/>
+    </condition>
     <!-- Java classpath addition (all jar files to compile tests with this) -->
     <path id="classpath">
@@ -95 +99 @@
       ** Check internal XML files against their XSD
     -->
-    <target name="check-schemas">
+    <target name="check-schemas" unless="check-schemas.notRequired">
         <schemavalidate file="data/defaultpresets.xml" >
             <schema namespace="http://josm.openstreetmap.de/tagging-preset-1.0" file="data/tagging-preset.xsd" />
@@ -199 +203 @@
         </exec>
     </target>
-    <target name="jaxb" depends="init" unless="jaxb.notRequired">
-        <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
-            <classpath>
-                <fileset dir="tools/jaxb" includes="*.jar"/>
-            </classpath>
-        </taskdef>
-        <xjc schema="data_nodist/wms-cache.xsd" destdir="${src.dir}" encoding="UTF-8">
-            <depends dir="${src.dir}/org/openstreetmap/josm/data/imagery" includes="WmsCache.java"/>
-            <produces dir="${imagerytypes.dir}" includes="*.java"/>
-        </xjc>
+    <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" />
+    </target>
+    <target name="jaxb" depends="init, -jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
+        <exec executable="${xjc}" failonerror="true">
+            <arg value="-d"/>
+            <arg value="${src.dir}"/>
+            <arg value="-encoding"/>
+            <arg value="UTF-8"/>
+            <arg value="data_nodist/wms-cache.xsd"/>
+        </exec>
     </target>
     <target name="compile" depends="init,javacc,jaxb">