Changeset 19146 in josm

Timestamp:

2024-07-16T22:26:07+02:00 (6 months ago)

Author:

taylor.smock

Message:

Fix #23811: ant jdeps was broken (patch by mfloryan)

File:

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

trunk/build.xml

@@ -1002 +1002 @@
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-spi.jar" includes="org/openstreetmap/josm/spi/**/*.class"/>
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
+        <path id="jar.files">
+            <fileset dir="${modules.dir}" includes="*.jar"/>
+        </path>
+        <pathconvert property="jar.files.string" refid="jar.files" pathsep=" "/>
         <exec executable="jdeps" dir="${modules.dir}">
             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.openstreetmap.gui.*'"/>
-            <arg line="-dotoutput dots *.jar"/>
+            <arg line="-dotoutput dots" />
+            <arg line="${jar.files.string}" />
         </exec>
         <exec executable="dot" dir="${modules.dir}/dots">
@@ -1010 +1015 @@
         </exec>
         <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-without-dependencies.png"/>
+
         <!-- Direct dependencies -->
         <copy todir="${modules.dir}" flatten="true">
             <fileset refid="runtime.fileset" />
         </copy>
+        <path id="jar-direct.files">
+            <fileset dir="${modules.dir}" includes="*.jar"/>
+        </path>
+        <pathconvert property="jar-direct.files.string" refid="jar-direct.files" pathsep=" "/>
         <exec executable="jdeps" dir="${modules.dir}">
             <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*'"/>
-            <arg line="-dotoutput dots *.jar"/>
+            <arg line="-dotoutput dots"/>
+            <arg line="--multi-release 11"/>
+            <arg line="${jar-direct.files.string}" />
         </exec>
         <exec executable="dot" dir="${modules.dir}/dots">
@@ -1024 +1036 @@
         <!-- All dependencies -->
         <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/google-gdata.jar" includes="com/google/**/*.class"/>
+        <path id="jar-all.files">
+            <fileset dir="${modules.dir}" includes="*.jar"/>
+        </path>
+        <pathconvert property="jar-all.files.string" refid="jar-direct.files" pathsep=" "/>
         <exec executable="jdeps" dir="${modules.dir}">
-            <arg line="-dotoutput dots *.jar"/>
+            <arg line="-dotoutput dots"/>
+            <arg line="--multi-release 11"/>
+            <arg line="${jar-all.files.string}" />
         </exec>
         <exec executable="dot" dir="${modules.dir}/dots">