Changeset 30699 in osm for applications/editors/josm


Ignore:
Timestamp:
2014-10-04T16:12:51+02:00 (10 years ago)
Author:
donvip
Message:

[josm_opendata] remove generated source files

Location:
applications/editors/josm/plugins
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

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

    r30562 r30699  
    2525    <property name="ant.build.javac.source" value="1.7"/>
    2626    <property name="plugin.jar"             location="${plugin.dist.dir}/${ant.project.name}.jar"/>
     27
     28    <!-- For Windows-specific stuff -->
     29    <condition property="isWindows">
     30        <os family="Windows"/>
     31    </condition>
     32    <target name="-jaxb_win" if="isWindows">
     33        <property name="xjc" value="${java.home}\..\bin\xjc.exe" />
     34    </target>
     35    <target name="-jaxb_nix" unless="isWindows">
     36        <property name="xjc" value="${java.home}/../bin/xjc" />
     37    </target>
    2738
    2839    <!--

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

    r30573 r30699  
    7777    **********************************************************
    7878    -->
    79     <target name="compile_neptune" depends="init">
     79    <target name="compile_neptune" depends="init, xjc_neptune">
    8080        <echo message="compiling Neptune ... "/>
    8181        <javac srcdir="includes/neptune" debug="false" destdir="${plugin.build.dir}" includeAntRuntime="false" encoding="UTF-8" />
    … …  
    100100    </target>
    101101   
    102     <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
    103           <classpath>
    104             <fileset dir="lib/jaxb" includes="*.jar" />
    105           </classpath>
    106     </taskdef>
    107    
    108     <target name="xjc_neptune">
    109         <xjc schema="resources/neptune/neptune.xsd" destdir="includes" package="neptune" target="2.1" />
     102    <target name="xjc_neptune" depends="init, -jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
     103        <exec executable="${xjc}" failonerror="true">
     104            <arg value="-d"/>
     105            <arg value="includes"/>
     106            <arg value="-p"/>
     107            <arg value="neptune"/>
     108            <arg value="-encoding"/>
     109            <arg value="UTF-8"/>
     110            <arg value="resources/neptune/neptune.xsd"/>
     111        </exec>
    110112    </target>
    111113</project>
Note: See TracChangeset for help on using the changeset viewer.