summaryrefslogtreecommitdiff
blob: 5aa346303dc03556cae672071c7e690b0955ad46 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
From 1488926a5731b17a577a1fd161eb95b88458a09b Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Fri, 7 Aug 2015 21:42:29 +0200
Subject: [PATCH] Bundled JFlex.jar also contains java_cup/runtime/Scanner, our
 replacement does not

---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 33f0c60..89c9793 100644
--- a/build.xml
+++ b/build.xml
@@ -53,7 +53,7 @@
   </target>
 
   <taskdef name="cup" classname="java_cup.anttask.CUPTask" classpath="${bin}/java-cup-11.jar" />
-  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar" />
+  <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${bin}/JFlex.jar:${bin}/java-cup-11.jar" />
 
   <target name="cup" depends="init">
     <cup srcfile="${cup}/parser.cup" interface="on" destdir="${java}" parser="parser" symbols="sym" quiet="false" nonterms="true"/>
-- 
2.5.0