7846c0f
From c119c7d20b46c91f2c661e4f3789194041c4ba16 Mon Sep 17 00:00:00 2001
7846c0f
From: Michael Simacek <msimacek@redhat.com>
7846c0f
Date: Tue, 4 Apr 2017 16:56:33 +0200
7846c0f
Subject: [PATCH] Fix compatibility with javacc 7
7846c0f
7846c0f
---
7846c0f
 build.xml                                        | 16 +++++++++++++++-
7846c0f
 src/main/java/freemarker/core/TokenMgrError.java |  5 +++++
7846c0f
 2 files changed, 20 insertions(+), 1 deletion(-)
7846c0f
2a29d10
diff --git a/build.xml b/build.xml
7846c0f
index 6542da9..20d1d56 100644
2a29d10
--- a/build.xml
2a29d10
+++ b/build.xml
2a29d10
@@ -160,13 +160,26 @@
7846c0f
 
7846c0f
     <mkdir dir="${_javaccOutputDir}" />
7846c0f
     <ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
7846c0f
+    
7846c0f
+    <copy file="src/main/javacc/FTL.jj" tofile="${_javaccOutputDir}/FTL.jj"/>
7846c0f
+    
7846c0f
+      file="${_javaccOutputDir}/FTL.jj"
7846c0f
+      token="template"
7846c0f
+      value="xtemplate"
2a29d10
+      />
7846c0f
     
7846c0f
-      target="src/main/javacc/FTL.jj"
7846c0f
+      target="${_javaccOutputDir}/FTL.jj"
7846c0f
       outputdirectory="${_javaccOutputDir}"
2a29d10
       javacchome="build/javacc-home.tmp"
7846c0f
     />
7846c0f
     <delete dir="build/javacc-home.tmp" />
2a29d10
-    
7846c0f
+    
7846c0f
+    
7846c0f
+      dir="${_javaccOutputDir}"
7846c0f
+      token="xtemplate"
7846c0f
+      value="template"
7846c0f
+    />
7846c0f
+
7846c0f
     
7846c0f
       file="${_javaccOutputDir}/FMParser.java"
7846c0f
       token="private final LookaheadSuccess"
7846c0f
-- 
7846c0f
2.9.3
7846c0f