freemarker/javacc-7.patch
cherry530 573d11c36c Upgrade to 2.3.32
Signed-off-by: cherry530 <707078654@qq.com>
2023-07-26 15:18:47 +08:00

32 lines
973 B
Diff

diff --git a/build.xml b/build.xml
index 084b359..75c07fe 100644
--- a/build.xml
+++ b/build.xml
@@ -147,12 +147,25 @@
<mkdir dir="${_javaccOutputDir}" />
<ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
+ <!-- avoid usage of word template which is now a keyword in javacc -->
+ <copy file="src/main/javacc/FTL.jj" tofile="${_javaccOutputDir}/FTL.jj"/>
+ <replace
+ file="${_javaccOutputDir}/FTL.jj"
+ token="template"
+ value="xtemplate"
+ />
<javacc:generate
- target="src/main/javacc/FTL.jj"
+ target="${_javaccOutputDir}/FTL.jj"
outputdirectory="${_javaccOutputDir}"
javacchome="build/javacc-home.tmp"
/>
<delete dir="build/javacc-home.tmp" />
+ <!-- undo template keyword replacement -->
+ <replace
+ dir="${_javaccOutputDir}"
+ token="xtemplate"
+ value="template"
+ />
<replace
file="${_javaccOutputDir}/FMParser.java"