Changeset 5392 in josm for trunk

Timestamp:

2012-08-04T18:45:29+02:00 (12 years ago)

Author:

bastiK

Message:

applied #7922 - "ant clean dist" doesn't work (patch by AlfonZ)

File:

• trunk/build.xml (modified) (3 diffs)

trunk/build.xml

@@ -109 +109 @@
         </zip>
     </target>
-    <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
-        <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
-    </uptodate>
-    <target name="javacc" unless="javacc.notRequired">
+    <target name="javacc" depends="init" unless="javacc.notRequired">
         <mkdir dir="${mapcss.dir}/parsergen"/>
         <exec append="false" executable="java" failifexecutionfails="true">
@@ -123 +120 @@
 <!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
     </target>
-    <target name="compile" depends="javacc,init">
+    <target name="compile" depends="init,javacc">
         <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
         <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
@@ -131 +128 @@
     </target>
     <target name="init">
+        <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
+            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
+        </uptodate>
         <mkdir dir="build"/>
         <mkdir dir="dist"/>