Blob Blame History Raw
Description: Use JavaCC from Fedora
Forwarded: no
Author: Damien Raude-Morvan <drazzib@debian.org>
Last-Update: 2009-09-27
--- freemarker-2.3.23/source/build.xml
+++ freemarker-2.3.23/source/build.xml
@@ -123,7 +123,6 @@
     <ivy:cachepath conf="parser" pathid="ivy.dep" />
     <taskdef name="generate" classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
       uri="http://javacc.dev.java.net/"
-      classpathref="ivy.dep"
     />
     
     <property name="_javaccOutputDir"
@@ -135,7 +134,7 @@
     <javacc:generate
       target="src/main/javacc/FTL.jj"
       outputdirectory="${_javaccOutputDir}"
-      javacchome="build/javacc-home.tmp"
+      javacchome="/usr/share/java/" jdkversion="1.3"
     />
     <delete dir="build/javacc-home.tmp" />
     
@@ -157,7 +156,7 @@
     <replace
       file="${_javaccOutputDir}/Token.java"
       token="public class Token"
-      value="class Token implements java.io.Serializable"
+      value="class Token"
     />
     <replace
       file="${_javaccOutputDir}/SimpleCharStream.java"