On Thu, Jul 10, 2003 at 01:04:52PM +0200, Stefan Bodewig wrote:
> On Thu, 10 Jul 2003, Paul Nasrat <[EMAIL PROTECTED]> wrote:
> 
> > Here is a small patch to add the javacc.jar to the search list for
> > the javacc task.
 
Take two - I've actually tested this one rather than thinking I have :)

Apologies for wrapping:

[EMAIL PROTECTED] xjavadoc-1.0]$ ant -Djavacchome=/usr/share/java jjtree
Buildfile: build.xml
 
...
 
jjtree:
 
copy-grammar:
     [copy] Copying 1 file to
/local/home/paul/rpm/BUILD/xjavadoc-1.0/target/src/xjavadoc
   [jjtree] Java Compiler Compiler Version 3.1 (Tree Builder)
   [jjtree] (type "jjtree" with no arguments for help)
   [jjtree] Reading from file
/local/home/paul/rpm/BUILD/xjavadoc-1.0/target/src/xjavadoc/nodeparser.jjt

...

Paul
Index: ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
===================================================================
RCS file: 
/home/cvspublic/ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java,v
retrieving revision 1.23
diff -u -r1.23 JavaCC.java
--- ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java      
7 Jul 2003 09:08:44 -0000       1.23
+++ ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java      
10 Jul 2003 11:14:23 -0000
@@ -114,7 +114,7 @@
 
     protected static final String[] ARCHIVE_LOCATIONS = 
         new String[] {"JavaCC.zip", "bin/lib/JavaCC.zip", 
-                      "bin/lib/javacc.jar"};
+                      "bin/lib/javacc.jar", "javacc.jar" };
 
     protected static final String COM_PACKAGE = "COM.sun.labs.";
     protected static final String COM_JAVACC_CLASS = "javacc.Main";
@@ -395,6 +395,7 @@
             break;
 
         case 3:
+        case 4:
             /* 
              * This is where the fun starts, JavaCC 3.0 uses
              * org.netbeans.javacc, 3.1 uses org.javacc - I wonder

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to