Changeset 34376 in osm for applications


Ignore:
Timestamp:
2018-06-30T23:21:36+02:00 (6 years ago)
Author:
donvip
Message:

see #josm15560, see #josm16047 - fix JAXB build

Location:
applications/editors/josm/plugins
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r34375 r34376  
    5959        </not>
    6060    </condition>
    61     <target name="-jaxb">
    62         <property name="xjc" value="..${file.separator}00_tools${file.separator}jaxb-ri${file.separator}bin${file.separator}xjc" />
     61    <target name="-jaxb_windows" if="isWindows">
     62        <property name="xjc" value="..${file.separator}00_tools${file.separator}jaxb-ri${file.separator}bin${file.separator}xjc.bat" />
     63    </target>
     64    <target name="-jaxb_linux" unless="isWindows">
     65        <property name="xjc" value="..${file.separator}00_tools${file.separator}jaxb-ri${file.separator}bin${file.separator}xjc.sh" />
    6366    </target>
    6467

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

    r34375 r34376  
    2222    <import file="../build-common.xml"/>
    2323
    24     <target name="pre-compile" depends="-jaxb" unless="jaxb.notRequired">
     24    <target name="pre-compile" depends="-jaxb_linux, -jaxb_windows" unless="jaxb.notRequired">
    2525        <exec executable="${xjc}" failonerror="true">
    2626            <arg value="-d"/>

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

    r34375 r34376  
    8989    </target>
    9090   
    91     <target name="xjc_neptune" depends="init, -jaxb" unless="jaxb.notRequired">
     91    <target name="xjc_neptune" depends="init, -jaxb_linux, -jaxb_windows" unless="jaxb.notRequired">
    9292        <exec executable="${xjc}" failonerror="true">
    9393            <arg value="-d"/>
Note: See TracChangeset for help on using the changeset viewer.