natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

split out uptodate checks for cql2 and cql3 so they actually work

This commit is contained in:
Jonathan Ellis 2012-06-16 10:15:45 -05:00
parent a21307a277
commit 6dddf360e0
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.xml
View File

@ -189,15 +189,19 @@
<!-- <!--
This generates the CQL grammar files from Cql.g This generates the CQL grammar files from Cql.g
--> -->
<target name="check-gen-cql-grammar"> <target name="check-gen-cql2-grammar">
<uptodate property="cqlcurrent"> <uptodate property="cql2current"
<srcfiles dir="${build.src.java}" includes="org/apache/cassandra/cql*/Cql.g"/> srcfile="${build.src.java}/org/apache/cassandra/cql/Cql.g"
<mapper type="glob" from="*.g" to="*.tokens"/> targetfile="${build.src.gen-java}/org/apache/cassandra/cql/Cql.tokens"/>
</uptodate> </target>
<target name="check-gen-cql3-grammar">
<uptodate property="cql3current"
srcfile="${build.src.java}/org/apache/cassandra/cql3/Cql.g"
targetfile="${build.src.gen-java}/org/apache/cassandra/cql3/Cql.tokens"/>
</target> </target>
<target name="gen-cql-grammar" depends="check-gen-cql-grammar" unless="cqlcurrent"> <target name="gen-cql2-grammar" depends="check-gen-cql2-grammar" unless="cql2current">
<echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql*/Cql.g ...</echo> <echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql/Cql.g ...</echo>
<java classname="org.antlr.Tool" <java classname="org.antlr.Tool"
classpath="${build.lib}/antlr-3.2.jar" classpath="${build.lib}/antlr-3.2.jar"
fork="true" fork="true"
@ -206,6 +210,9 @@
<arg value="-fo" /> <arg value="-fo" />
<arg value="${build.src.gen-java}/org/apache/cassandra/cql/" /> <arg value="${build.src.gen-java}/org/apache/cassandra/cql/" />
</java> </java>
</target>
<target name="gen-cql3-grammar" depends="check-gen-cql3-grammar" unless="cql3current">
<echo>Building Grammar ${build.src.java}/org/apache/cassandra/cql3/Cql.g ...</echo>
<java classname="org.antlr.Tool" <java classname="org.antlr.Tool"
classpath="${build.lib}/antlr-3.2.jar" classpath="${build.lib}/antlr-3.2.jar"
fork="true" fork="true"
@ -660,7 +667,7 @@
<target name="build-subprojects" description="Compile Cassandra contrib projects"/> <target name="build-subprojects" description="Compile Cassandra contrib projects"/>
<target name="codecoverage" depends="cobertura-instrument,test,cobertura-report" description="Create code coverage report"/> <target name="codecoverage" depends="cobertura-instrument,test,cobertura-report" description="Create code coverage report"/>
<target depends="init,avro-generate,gen-cli-grammar,gen-cql-grammar" <target depends="init,avro-generate,gen-cli-grammar,gen-cql2-grammar,gen-cql3-grammar"
name="build-project"> name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/> <echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! --> <!-- Order matters! -->