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.2' into trunk

This commit is contained in:
Dave Brosius 2013-05-02 10:24:19 -04:00
parent e2506f1d0f 2ef11b4b6d
commit bcd80487a4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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>
@ -693,12 +697,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"/>
@ -723,7 +727,7 @@
</path>
<target name="stress-build" depends="build">
<mkdir dir="${stress.build.classes}" />
<javac destdir="${stress.build.classes}" includeantruntime="true">
<javac destdir="${stress.build.classes}" includeantruntime="true" source="${source.version}" target="${target.version}">
<src path="${stress.build.src}" />
<classpath>
<path refid="cassandra.classes" />
@ -1035,7 +1039,9 @@
debug="true"
debuglevel="${debuglevel}"
destdir="${test.classes}"
includeantruntime="false">
includeantruntime="false"
source="${source.version}"
target="${target.version}">
<classpath>
<path refid="cassandra.classpath"/>
</classpath>