svn commit: r769888 - /incubator/cassandra/trunk/build.xml

[jb...@apache.org]

Author: jbellis
Date: Wed Apr 29 19:23:47 2009
New Revision: 769888

URL: http://svn.apache.org/viewvc?rev=769888&view=rev
Log:
move antlr output to src/gen-java.  patch by johano; reviewed by jbellis for CASSANDRA-105

Modified:
    incubator/cassandra/trunk/build.xml

Modified: incubator/cassandra/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/cassandra/trunk/build.xml?rev=769888&r1=769887&r2=769888&view=diff
==============================================================================
--- incubator/cassandra/trunk/build.xml (original)
+++ incubator/cassandra/trunk/build.xml Wed Apr 29 19:23:47 2009
@@ -5,6 +5,7 @@
 
     <property name="basedir" value="."/>
     <property name="build.src" value="${basedir}/src/java"/>
+    <property name="build.src.gen-java" value="${basedir}/src/gen-java"/>
     <property name="build.lib" value="${basedir}/lib"/>
     <property name="build.dir" value="${basedir}/build"/>
     <property name="build.test.dir" value="${build.dir}/test"/>
@@ -45,22 +46,15 @@
     <target name="init">
         <mkdir dir="${build.classes}"/>
         <mkdir dir="${test.classes}"/>
+        <mkdir dir="${build.src.gen-java}"/>
     </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" />
+        <delete dir="${build.src.gen-java}" />
     </target>
     <target depends="clean" name="cleanall"/>
 
-
-
     <!--
        This generates the CLI grammar files from Cli.g
     -->
@@ -77,7 +71,7 @@
             fork="true">
          <arg value="${build.src}/org/apache/cassandra/cli/Cli.g" />
          <arg value="-o" />
-         <arg value="${build.src}/org/apache/cassandra/cli/" />
+         <arg value="${build.src.gen-java}/org/apache/cassandra/cli/" />
       </java> 
     </target>
 
@@ -97,7 +91,7 @@
             fork="true">
          <arg value="${build.src}/org/apache/cassandra/cql/compiler/parse/Cql.g" />
          <arg value="-o" />
-         <arg value="${build.src}/org/apache/cassandra/cql/compiler/parse/" />
+         <arg value="${build.src.gen-java}/org/apache/cassandra/cql/compiler/parse/" />
       </java> 
     </target>
 
@@ -112,6 +106,7 @@
         <echo message="${ant.project.name}: ${ant.file}"/>
         <javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}">
             <src path="${build.src}"/>
+            <src path="${build.src.gen-java}"/>
             <src path="${interface.src.dir}"/>
             <classpath refid="cassandra.classpath"/>
         </javac>