Ticket #23811: josm.19138.patch

File josm.19138.patch, 3.1 KB (added by mfloryan, 4 months ago)

Patch with the build.xml changes that fixes ant jdeps task

  • build.xml

     
    10011001        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-plugins.jar" includes="org/openstreetmap/josm/plugins/**/*.class"/>
    10021002        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-spi.jar" includes="org/openstreetmap/josm/spi/**/*.class"/>
    10031003        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
     1004        <path id="jar.files">
     1005            <fileset dir="${modules.dir}" includes="*.jar"/>
     1006        </path>
     1007        <pathconvert property="jar.files.string" refid="jar.files" pathsep=" "/>
    10041008        <exec executable="jdeps" dir="${modules.dir}">
    10051009            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.openstreetmap.gui.*'"/>
    1006             <arg line="-dotoutput dots *.jar"/>
     1010            <arg line="-dotoutput dots" />
     1011            <arg line="${jar.files.string}" />
    10071012        </exec>
    10081013        <exec executable="dot" dir="${modules.dir}/dots">
    10091014            <arg line="-O -Tpng summary.dot"/>
    10101015        </exec>
    10111016        <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-without-dependencies.png"/>
     1017
    10121018        <!-- Direct dependencies -->
    10131019        <copy todir="${modules.dir}" flatten="true">
    10141020            <fileset refid="runtime.fileset" />
    10151021        </copy>
     1022        <path id="jar-direct.files">
     1023            <fileset dir="${modules.dir}" includes="*.jar"/>
     1024        </path>
     1025        <pathconvert property="jar-direct.files.string" refid="jar-direct.files" pathsep=" "/>
    10161026        <exec executable="jdeps" dir="${modules.dir}">
    10171027            <arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.sun.*|com.google.*|org.tukaani.*'"/>
    1018             <arg line="-dotoutput dots *.jar"/>
     1028            <arg line="-dotoutput dots"/>
     1029            <arg line="--multi-release 11"/>
     1030            <arg line="${jar-direct.files.string}" />
    10191031        </exec>
    10201032        <exec executable="dot" dir="${modules.dir}/dots">
    10211033            <arg line="-O -Tpng summary.dot"/>
    … …  
    10231035        <move file="${modules.dir}/dots/summary.dot.png" tofile="${modules.dir}/josm-with-direct-dependencies.png"/>
    10241036        <!-- All dependencies -->
    10251037        <jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/google-gdata.jar" includes="com/google/**/*.class"/>
     1038        <path id="jar-all.files">
     1039            <fileset dir="${modules.dir}" includes="*.jar"/>
     1040        </path>
     1041        <pathconvert property="jar-all.files.string" refid="jar-direct.files" pathsep=" "/>
    10261042        <exec executable="jdeps" dir="${modules.dir}">
    1027             <arg line="-dotoutput dots *.jar"/>
     1043            <arg line="-dotoutput dots"/>
     1044            <arg line="--multi-release 11"/>
     1045            <arg line="${jar-all.files.string}" />
    10281046        </exec>
    10291047        <exec executable="dot" dir="${modules.dir}/dots">
    10301048            <arg line="-O -Tpng summary.dot"/>