Skip to content
Browse files

Separated Cassandra and HBase lib dirs into their own directory

  • Loading branch information...
1 parent f586b48 commit 3355a6f84543e06559c82b588e54bba070d4191e @brianfrankcooper brianfrankcooper committed
View
23 build.xml
@@ -4,15 +4,21 @@
<property name="src.dir" value="src"/>
<property name="doc.dir" value="doc"/>
<property name="dbsrc.dir" value="${src.dir}/com/yahoo/ycsb/db"/>
- <property name="dblib.dir" value="${dbsrc.dir}/lib"/>
+ <property name="cassandralib.dir" value="${dbsrc.dir}/cassandralib"/>
+ <property name="hbaselib.dir" value="${dbsrc.dir}/hbaselib"/>
<property name="build.dir" value="build"/>
<property name="classes.dir" value="${build.dir}/classes"/>
<property name="jar.dir" value="${build.dir}/jar"/>
- <path id="classpath">
- <fileset dir="${dblib.dir}" includes="**/*.jar"/>
+ <path id="cassandraclasspath">
+ <fileset dir="${cassandralib.dir}" includes="**/*.jar"/>
+ <fileset file="build/ycsb.jar"/>
+ </path>
+
+ <path id="hbaseclasspath">
+ <fileset dir="${hbaselib.dir}" includes="**/*.jar"/>
<fileset file="build/ycsb.jar"/>
</path>
@@ -25,17 +31,18 @@
<antcall target="makejar"/>
</target>
- <target name="dbcompile">
+
+ <target name="dbcompile-cassandra">
<mkdir dir="${classes.dir}"/>
- <javac srcdir="${dbsrc.dir}" destdir="${classes.dir}" classpathref="classpath" deprecation="on">
+ <javac includes="CassandraClient.java" srcdir="${dbsrc.dir}" destdir="${classes.dir}" classpathref="cassandraclasspath" deprecation="on">
<compilerarg value="-Xlint:unchecked"/>
</javac>
<antcall target="makejar"/>
</target>
-
- <target name="dbcompile-cassandra">
+
+ <target name="dbcompile-hbase">
<mkdir dir="${classes.dir}"/>
- <javac includes="CassandraClient.java" srcdir="${dbsrc.dir}" destdir="${classes.dir}" classpathref="classpath" deprecation="on">
+ <javac includes="HBaseClient.java" srcdir="${dbsrc.dir}" destdir="${classes.dir}" classpathref="hbaseclasspath" deprecation="on">
<compilerarg value="-Xlint:unchecked"/>
</javac>
<antcall target="makejar"/>
View
1 src/com/yahoo/ycsb/db/cassandralib/README
@@ -0,0 +1 @@
+This directory should contain jars for building and running Cassandra
View
1 src/com/yahoo/ycsb/db/hbaselib/README
@@ -0,0 +1 @@
+This directory should contain jars for building and running HBase
View
1 src/com/yahoo/ycsb/db/lib/README
@@ -1 +0,0 @@
-Put any jars needed to build your database layer in this lib/ directory.

0 comments on commit 3355a6f

Please sign in to comment.
Something went wrong with that request. Please try again.