Changeset 5392 in josm for trunk


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r5362 r5392  
    109109        </zip>
    110110    </target>
    111     <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
    112         <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
    113     </uptodate>
    114     <target name="javacc" unless="javacc.notRequired">
     111    <target name="javacc" depends="init" unless="javacc.notRequired">
    115112        <mkdir dir="${mapcss.dir}/parsergen"/>
    116113        <exec append="false" executable="java" failifexecutionfails="true">
    … …  
    123120<!--        <javacc target="${mapcss.dir}/MapCSSParser.jj" javacchome="${javacc.home}" outputdirectory="${mapcss.dir}/parsergen"/>-->
    124121    </target>
    125     <target name="compile" depends="javacc,init">
     122    <target name="compile" depends="init,javacc">
    126123        <javac srcdir="src" includes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="iso-8859-1"/>
    127124        <javac srcdir="src" excludes="com/**,oauth/**,org/apache/commons/codec/**" destdir="build" target="1.5" source="1.5" debug="on" encoding="UTF-8">
    … …  
    131128    </target>
    132129    <target name="init">
     130        <uptodate property="javacc.notRequired" targetfile="${mapcss.dir}/parsergen/MapCSSParser.java" >
     131            <srcfiles dir="${mapcss.dir}" includes="MapCSSParser.jj"/>
     132        </uptodate>
    133133        <mkdir dir="build"/>
    134134        <mkdir dir="dist"/>
Note: See TracChangeset for help on using the changeset viewer.