Changeset 7215 in josm for trunk/netbeans


Ignore:
Timestamp:
2014-06-04T17:50:32+02:00 (5 years ago)
Author:
akks
Message:

update Netbeans project, skip jaxb build target if not needed (see #10040)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/netbeans/nbbuild.xml

    r7182 r7215  
    1414    <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/>
    1515    <property name="imagerytypes.dir" location="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
     16    <!-- For Windows-specific stuff -->
     17    <condition property="isWindows">
     18        <os family="Windows"/>
     19    </condition>
    1620
    1721    <import file="nbproject/build-impl.xml"/>
     
    105109            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
    106110        </uptodate>
     111        <uptodate property="jaxb.notRequired" targetfile="${src.dir}/org/openstreetmap/josm/data/imagery/types/package-info.java" >
     112            <srcfiles dir="../data_nodist" includes="wms-cache.xsd"/>
     113        </uptodate>
    107114    </target>   
    108115    <target name="javacc" depends="check-javacc" unless="javacc.notRequired">
     
    120127        </exec>
    121128    </target>
    122     <target name="jaxb" depends="init" unless="jaxb.notRequired">
    123         <taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
    124             <classpath>
    125                 <fileset dir="${src.dir}/../tools/jaxb" includes="*.jar"/>
    126             </classpath>
    127         </taskdef>
    128         <xjc schema="../data_nodist/wms-cache.xsd" destdir="${src.dir}" encoding="UTF-8">
    129             <depends dir="${src.dir}/org/openstreetmap/josm/data/imagery" includes="WmsCache.java"/>
    130             <produces dir="${imagerytypes.dir}" includes="*.java"/>
    131         </xjc>
     129    <target name="-jaxb_win" if="isWindows">
     130        <property name="xjc" value="${java.home}\..\bin\xjc.exe" />
    132131    </target>
    133 
     132    <target name="-jaxb_nix" unless="isWindows">
     133        <property name="xjc" value="${java.home}/../bin/xjc" />
     134    </target>
     135    <target name="jaxb" depends="init, -jaxb_win, -jaxb_nix" unless="jaxb.notRequired">
     136        <exec executable="${xjc}" failonerror="true">
     137            <arg value="-d"/>
     138            <arg value="${src.dir}"/>
     139            <arg value="-encoding"/>
     140            <arg value="UTF-8"/>
     141            <arg value="../data_nodist/wms-cache.xsd"/>
     142        </exec>
     143    </target>
    134144    <target name="-pre-compile" depends="javacc,jaxb">
    135145<!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
Note: See TracChangeset for help on using the changeset viewer.