Changeset 7215 in josm
- Timestamp:
- 2014-06-04T17:50:32+02:00 (10 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/build.xml
r7209 r7215 247 247 <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" > 248 248 <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/> 249 </uptodate> 250 <uptodate property="jaxb.notRequired" targetfile="${src.dir}/org/openstreetmap/josm/data/imagery/types/package-info.java" > 251 <srcfiles dir="data_nodist" includes="wms-cache.xsd"/> 249 252 </uptodate> 250 253 <mkdir dir="build"/> -
trunk/netbeans/nbbuild.xml
r7182 r7215 14 14 <property name="mapcss.dir" location="../src/org/openstreetmap/josm/gui/mappaint/mapcss"/> 15 15 <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> 16 20 17 21 <import file="nbproject/build-impl.xml"/> … … 105 109 <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/> 106 110 </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> 107 114 </target> 108 115 <target name="javacc" depends="check-javacc" unless="javacc.notRequired"> … … 120 127 </exec> 121 128 </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" /> 132 131 </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> 134 144 <target name="-pre-compile" depends="javacc,jaxb"> 135 145 <!-- <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
Note:
See TracChangeset
for help on using the changeset viewer.