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

Merge branch 'cassandra-1.0' into cassandra-1.1

This commit is contained in:
Dave Brosius 2013-05-02 10:12:19 -04:00
parent de212e59a6 f8567d15fe
commit d5754ab223
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build.xml
View File

@ -59,6 +59,10 @@
<property name="test.unit.src" value="${test.dir}/unit"/>
<property name="test.long.src" value="${test.dir}/long"/>
<property name="dist.dir" value="${build.dir}/dist"/>
<property name="source.version" value="1.6"/>
<property name="target.version" value="1.6"/>
<condition property="version" value="${base.version}">
<isset property="release"/>
</condition>
@ -674,12 +678,12 @@
<echo message="${ant.project.name}: ${ant.file}"/>
<!-- Order matters! -->
<javac debug="true" debuglevel="${debuglevel}"
destdir="${build.classes.thrift}" includeantruntime="false">
destdir="${build.classes.thrift}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${interface.thrift.dir}/gen-java"/>
<classpath refid="cassandra.classpath"/>
</javac>
<javac debug="true" debuglevel="${debuglevel}"
destdir="${build.classes.main}" includeantruntime="false">
destdir="${build.classes.main}" includeantruntime="false" source="${source.version}" target="${target.version}">
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<classpath refid="cassandra.classpath"/>
@ -1010,7 +1014,9 @@
<javac
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}">
destdir="${test.classes}"
source="${source.version}"
target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>