You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/01 07:22:48 UTC
git commit: make sure c* returns the correct version when running
inside an IDE (for cqlsh) patch by dbrosius reviewed by jbellis for
cassandra-5964
Updated Branches:
refs/heads/cassandra-2.0 7375c03aa -> d4884c76c
make sure c* returns the correct version when running inside an IDE (for cqlsh)
patch by dbrosius reviewed by jbellis for cassandra-5964
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4884c76
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4884c76
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d4884c76
Branch: refs/heads/cassandra-2.0
Commit: d4884c76c7b6112e3cd2fa6ecf8bc6e0c8ed67f7
Parents: 7375c03
Author: Dave Brosius <db...@apache.org>
Authored: Sun Sep 1 01:20:29 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Sun Sep 1 01:20:29 2013 -0400
----------------------------------------------------------------------
build.xml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d4884c76/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 254cc2d..f37080f 100644
--- a/build.xml
+++ b/build.xml
@@ -67,7 +67,7 @@
</condition>
<property name="version" value="${base.version}-SNAPSHOT"/>
<property name="version.properties.dir"
- value="${build.classes.main}/org/apache/cassandra/config/" />
+ value="${build.src.resources}/org/apache/cassandra/config/" />
<property name="final.name" value="${ant.project.name}-${version}"/>
<!-- details of what version of Maven ANT Tasks to fetch -->
@@ -167,6 +167,7 @@
<delete dir="${build.classes}" />
<delete dir="${cobertura.classes.dir}" />
<delete dir="${build.src.gen-java}" />
+ <delete dir="${version.properties.dir}" />
</target>
<target depends="clean" name="cleanall"/>
@@ -603,6 +604,7 @@
<!-- create properties file with C version -->
<target name="createVersionPropFile">
<taskdef name="propertyfile" classname="org.apache.tools.ant.taskdefs.optional.PropertyFile"/>
+ <mkdir dir="${version.properties.dir}"/>
<propertyfile file="${version.properties.dir}/version.properties">
<entry key="CassandraVersion" value="${version}"/>
</propertyfile>
@@ -643,10 +645,10 @@
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
</javac>
+ <antcall target="createVersionPropFile"/>
<copy todir="${build.classes.main}">
<fileset dir="${build.src.resources}" />
</copy>
- <antcall target="createVersionPropFile"/>
</target>
<!-- Stress build file -->