Author: toad
Date: 2007-05-19 15:13:02 +0000 (Sat, 19 May 2007)
New Revision: 13271

Modified:
   trunk/freenet/build.xml
Log:
Apply juiceman's patch to make ant work better on windows with jflex

Modified: trunk/freenet/build.xml
===================================================================
--- trunk/freenet/build.xml     2007-05-19 15:11:46 UTC (rev 13270)
+++ trunk/freenet/build.xml     2007-05-19 15:13:02 UTC (rev 13271)
@@ -19,7 +19,10 @@
        <property name="CSSTokenizerFilter.relative.jflex" 
value="freenet/clients/http/filter/CSSTokenizerFilter.jflex"/>
        <property name="CSSTokenizerFilter.java" 
value="${src}/freenet/clients/http/filter/CSSTokenizerFilter.java"/>
        <property name="junit.location" value="/usr/share/java/junit.jar"/>
-
+       <condition property="executable" value="jflex.bat" else="jflex">
+               <os family="windows"/>
+       </condition>
+               
        <assertions>
                <enable/>
        </assertions>
@@ -38,7 +41,7 @@

        <target name="generate-CSSTokenizerFilter" depends="env" 
unless="CSSTokenizerFilter.present">
                <echo message="Generating CSSTokenizerFilter.java"/>
-               <exec dir="${src}" executable="jflex" failonerror="true" 
resolveexecutable="true">
+               <exec dir="${src}" executable="${executable}" 
failonerror="true" resolveexecutable="true">
                        <arg value="-q"/>
                        <arg value="--nobak"/>
                        <arg value="${CSSTokenizerFilter.relative.jflex}"/>


Reply via email to