svn commit: r1170872 - in /zookeeper/trunk: ./ src/java/main/org/apache/jute/compiler/generated/

[ph...@apache.org]

Author: phunt
Date: Wed Sep 14 22:37:06 2011
New Revision: 1170872

URL: http://svn.apache.org/viewvc?rev=1170872&view=rev
Log:
ZOOKEEPER-96. The jute parser should get generated from the jj files instead of checking in the generated sources (Thomas Koch via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/build.xml
    zookeeper/trunk/ivy.xml
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/ParseException.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Rcc.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccConstants.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/RccTokenManager.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/SimpleCharStream.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/Token.java
    zookeeper/trunk/src/java/main/org/apache/jute/compiler/generated/TokenMgrError.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1170872&r1=1170871&r2=1170872&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Wed Sep 14 22:37:06 2011
@@ -13,6 +13,9 @@ IMPROVEMENTS:
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,
   unused variables, missing generics (Thomas Koch via phunt)
 
+  ZOOKEEPER-96. The jute parser should get generated from the jj files
+  instead of checking in the generated sources (Thomas Koch via phunt)
+
 
 Release 3.4.0 - 
 

Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1170872&r1=1170871&r2=1170872&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Wed Sep 14 22:37:06 2011
@@ -234,7 +234,20 @@
         </tstamp>
     </target>
     
-    <target name="jute" depends="init">
+	
+    <target name="generate_jute_parser" depends="init,ivy-retrieve">
+      <property name="jute_javacc.dir" value="${java.src.dir}/org/apache/jute/compiler/generated" />
+      <!-- the javacc task expects a "javacc.jar" file... -->
+      <ivy:artifactproperty name="[artifact].revision" value="[revision]" />
+      <move file="${ivy.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.lib}/javacc.jar" failonerror="false"/>
+      <javacc
+          target="${jute_javacc.dir}/rcc.jj"
+          outputdirectory="${jute_javacc.dir}/"
+          javacchome="${ivy.lib}"
+          />
+    </target>
+     
+    <target name="jute" depends="generate_jute_parser">
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
             includes="org/apache/jute/**" debug="on" />

Modified: zookeeper/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/ivy.xml?rev=1170872&r1=1170871&r2=1170872&view=diff
==============================================================================
--- zookeeper/trunk/ivy.xml (original)
+++ zookeeper/trunk/ivy.xml Wed Sep 14 22:37:06 2011
@@ -67,6 +67,8 @@
                 rev="2.4" conf="releaseaudit->default"/>
     <dependency org="commons-collections" name="commons-collections" 
                 rev="3.1" conf="releaseaudit->default"/>
+
+    <dependency org="net.java.dev.javacc" name="javacc" rev="5.0" />
   </dependencies>
 
 </ivy-module>