svn commit: r761384 - in /incubator/cassandra/trunk: ./ lib/ src/org/apache/cassandra/cli/ src/org/apache/cassandra/cql/compiler/parse/

[jbellis]

Author: jbellis
Date: Thu Apr  2 19:17:04 2009
New Revision: 761384

URL: http://svn.apache.org/viewvc?rev=761384&view=rev
Log:
r/m generated files from svn and modify build.xml to build them.  added back 
required jars for generation (antlr 2.7.7 and stringtemplate).  patch by Per 
Mellqvist for #40

Added:
    incubator/cassandra/trunk/lib/antlr-2.7.7.jar
    incubator/cassandra/trunk/lib/stringtemplate-3.0.jar
Removed:
    incubator/cassandra/trunk/src/org/apache/cassandra/cli/Cli.tokens
    incubator/cassandra/trunk/src/org/apache/cassandra/cli/CliLexer.java
    incubator/cassandra/trunk/src/org/apache/cassandra/cli/CliParser.java
    incubator/cassandra/trunk/src/org/apache/cassandra/cli/Cli__.g
    
incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/parse/Cql.tokens
    
incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/parse/CqlLexer.java
    
incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/parse/CqlParser.java
    
incubator/cassandra/trunk/src/org/apache/cassandra/cql/compiler/parse/Cql__.g
Modified:
    incubator/cassandra/trunk/build.xml

Modified: incubator/cassandra/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=761384&r1=761383&r2=761384&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Thu Apr  2 19:17:04 2009
@@ -33,6 +33,14 @@
     </target>
     <target name="clean">
         <delete dir="${build.dir}" />
+        <delete file="${build.src}/org/apache/cassandra/cli/Cli__.g" />
+        <delete file="${build.src}/org/apache/cassandra/cli/CliLexer.java" />
+        <delete file="${build.src}/org/apache/cassandra/cli/CliParser.java" />
+        <delete file="${build.src}/org/apache/cassandra/cli/Cli.tokens" />
+        <delete 
file="${build.src}/org/apache/cassandra/cql/compiler/parse/Cql__.g" />
+        <delete 
file="${build.src}/org/apache/cassandra/cql/compiler/parse/CqlLexer.java" />
+        <delete 
file="${build.src}/org/apache/cassandra/cql/compiler/parse/CqlParser.java" />
+        <delete 
file="${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.tokens" />
     </target>
     <target depends="clean" name="cleanall"/>
 
@@ -42,11 +50,11 @@
        This generates the CLI grammar files from Cli.g
     -->
     <target name="gen-cli-grammar">
-      <echo>Building Grammar 
${build.src}/org/apache/cassandra/infrastructure/cli/Cli.g  ....</echo>
+      <echo>Building Grammar ${build.src}/org/apache/cassandra/cli/Cli.g  
....</echo>
       <java classname="org.antlr.Tool"
             
classpath="${build.lib}/antlr-3.0.1.jar:${build.lib}/stringtemplate-3.0.jar:${build.lib}/antlr-2.7.7.jar"
             fork="true">
-         <arg 
value="${build.src}/org/apache/cassandra/infrastructure/cli/Cli.g" />
+         <arg value="${build.src}/org/apache/cassandra/cli/Cli.g" />
       </java>
     </target>
 
@@ -54,11 +62,11 @@
        This generates the CQL grammar files from Cql.g
     -->
     <target name="gen-cql-grammar">
-      <echo>Building Grammar 
${build.src}/org/apache/cassandra/infrastructure/cql/compiler/parse/Cql.g  
....</echo>
+      <echo>Building Grammar 
${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.g  ....</echo>
       <java classname="org.antlr.Tool"
             
classpath="${build.lib}/antlr-3.0.1.jar:${build.lib}/stringtemplate-3.0.jar:${build.lib}/antlr-2.7.7.jar"
             fork="true">
-         <arg 
value="${build.src}/org/apache/cassandra/infrastructure/cql/compiler/parse/Cql.g"
 />
+         <arg 
value="${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.g" />
       </java>
     </target>
 
@@ -67,7 +75,7 @@
     -->
     <target depends="build-subprojects,build-project" name="build"/>
     <target name="build-subprojects"/>
-    <target depends="init" name="build-project">
+    <target depends="init,gen-cli-grammar,gen-cql-grammar" 
name="build-project">
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" 
destdir="${build.classes}">
             <src path="${build.src}"/>

Added: incubator/cassandra/trunk/lib/antlr-2.7.7.jar
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/antlr-2.7.7.jar?rev=761384&view=auto
==============================================================================
Files incubator/cassandra/trunk/lib/antlr-2.7.7.jar (added) and 
incubator/cassandra/trunk/lib/antlr-2.7.7.jar Thu Apr  2 19:17:04 2009 differ

Added: incubator/cassandra/trunk/lib/stringtemplate-3.0.jar
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/trunk/lib/stringtemplate-3.0.jar?rev=761384&view=auto
==============================================================================
Files incubator/cassandra/trunk/lib/stringtemplate-3.0.jar (added) and 
incubator/cassandra/trunk/lib/stringtemplate-3.0.jar Thu Apr  2 19:17:04 2009 
differ