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

compile bytecode to build/classes/main 

Patch by eevans; reviewed by tjake for CASSANDRA-1848


git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@1075608 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eric Evans 2011-03-01 01:31:35 +00:00
parent 2690f286bc
commit deb5fb4b00
22 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/cassandra-cli.bat
View File

@ -33,8 +33,8 @@ set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes"
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
goto runCli
:runCli

4
bin/cassandra.bat
View File

@ -54,8 +54,8 @@ set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes"
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;"%CASSANDRA_HOME%\build\classes\main"
set CASSANDRA_PARAMS=-Dcassandra -Dcassandra-foreground=yes
goto runDaemon

2
bin/cassandra.in.sh
View File

@ -26,7 +26,7 @@ fi
# This can be the path to a jar file, or a directory containing the
# compiled classes. NOTE: This isn't needed by the startup script,
# it's just used here in constructing the classpath.
cassandra_bin=$CASSANDRA_HOME/build/classes
cassandra_bin=$CASSANDRA_HOME/build/classes/main
#cassandra_bin=$cassandra_home/build/cassandra.jar
# JAVA_HOME can optionally be set here

4
bin/clustertool.bat
View File

@ -40,8 +40,8 @@ set CLASSPATH=%CLASSPATH%;%1%2
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%
set CASSANDRA_PARAMS=
set TOOLS_PARAMS=

4
bin/json2sstable.bat
View File

@ -40,8 +40,8 @@ set CLASSPATH=%CLASSPATH%;%1%2
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%
set CASSANDRA_PARAMS=
set TOOLS_PARAMS=

4
bin/nodetool.bat
View File

@ -33,8 +33,8 @@ set CLASSPATH=%CLASSPATH%;%1
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main
goto runNodeTool
:runNodeTool

4
bin/schematool.bat
View File

@ -40,8 +40,8 @@ set CLASSPATH=%CLASSPATH%;%1%2
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%
set CASSANDRA_PARAMS=
set TOOLS_PARAMS=

4
bin/sstable2json.bat
View File

@ -40,8 +40,8 @@ set CLASSPATH=%CLASSPATH%;%1%2
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%
set CASSANDRA_PARAMS=
set TOOLS_PARAMS=

4
bin/sstablekeys.bat
View File

@ -40,8 +40,8 @@ set CLASSPATH=%CLASSPATH%;%1%2
goto :eof
:okClasspath
REM Include the build\classes directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes;%CASSANDRA_CONF%
REM Include the build\classes\main directory so it works in development
set CASSANDRA_CLASSPATH=%CLASSPATH%;%CASSANDRA_HOME%\build\classes\main;%CASSANDRA_CONF%
set CASSANDRA_PARAMS=
set TOOLS_PARAMS=

25
build.xml
View File

@ -34,6 +34,7 @@
<property name="build.dir.lib" value="${basedir}/build/lib"/>
<property name="build.test.dir" value="${build.dir}/test"/>
<property name="build.classes" value="${build.dir}/classes"/>
<property name="build.classes.main" value="${build.classes}/main" />
<property name="javadoc.dir" value="${build.dir}/javadoc"/>
<property name="interface.dir" value="${basedir}/interface"/>
<property name="interface.thrift.dir" value="${interface.dir}/thrift"/>
@ -55,7 +56,8 @@
<isset property="release"/>
</condition>
<property name="version" value="${base.version}-SNAPSHOT"/>
<property name="version.properties.dir" value="${build.classes}/org/apache/cassandra/config/"/>
<property name="version.properties.dir"
value="${build.classes.main}/org/apache/cassandra/config/" />
<property name="final.name" value="${ant.project.name}-${version}"/>
<property name="maven-ant-tasks.version" value="2.1.1" />
<property name="maven-ant-tasks.url"
@ -85,7 +87,7 @@
<path id="maven-ant-tasks.classpath" path="${build.dir}/maven-ant-tasks-${maven-ant-tasks.version}.jar" />
<path id="cassandra.classpath">
<pathelement location="${cobertura.classes.dir}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${build.classes.main}" />
<fileset dir="${build.lib}">
<include name="**/*.jar" />
</fileset>
@ -100,7 +102,7 @@
<target name="init">
<fail unless="is.source.artifact"
message="Not a source artifact, stopping here." />
<mkdir dir="${build.classes}"/>
<mkdir dir="${build.classes.main}"/>
<mkdir dir="${test.lib}"/>
<mkdir dir="${test.classes}"/>
<mkdir dir="${build.src.gen-java}"/>
@ -346,7 +348,8 @@
<target depends="init,avro-generate,gen-cli-grammar,gen-cql-grammar"
name="build-project">
<echo message="${ant.project.name}: ${ant.file}"/>
<javac debug="true" debuglevel="${debuglevel}" destdir="${build.classes}" includeantruntime="false">
<javac debug="true" debuglevel="${debuglevel}"
destdir="${build.classes.main}" includeantruntime="false">
<src path="${build.src.java}"/>
<src path="${build.src.gen-java}"/>
<src path="${interface.thrift.dir}/gen-java"/>
@ -366,11 +369,13 @@
The jar target makes cassandra.jar output.
-->
<target name="jar" depends="build" description="Assemble Cassandra JAR files">
<mkdir dir="${build.classes}/META-INF"/>
<copy file="LICENSE.txt" tofile="${build.classes}/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt" tofile="${build.classes}/META-INF/NOTICE.txt"/>
<mkdir dir="${build.classes.main}/META-INF" />
<copy file="LICENSE.txt"
tofile="${build.classes.main}/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt"
tofile="${build.classes.main}/META-INF/NOTICE.txt"/>
<jar jarfile="${build.dir}/${final.name}.jar"
basedir="${build.classes}">
basedir="${build.classes.main}">
<manifest>
<!-- <section name="org/apache/cassandra/infrastructure"> -->
<attribute name="Implementation-Title" value="Cassandra"/>
@ -639,7 +644,7 @@
<cobertura-instrument todir="${cobertura.classes.dir}" datafile="${cobertura.datafile}">
<ignore regex="org.apache.log4j.*"/>
<fileset dir="${build.classes}">
<fileset dir="${build.classes.main}">
<include name="**/*.class"/>
<exclude name="**/*Test.class"/>
<exclude name="**/*TestCase.class"/>
@ -746,7 +751,7 @@
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/long"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="build/classes"/>
<classpathentry kind="output" path="${build.classes.main}"/>
<classpathentry kind="lib" path="build/test/classes"/>
<classpathentry kind="lib" path="test/conf"/>
]]>

6
contrib/circuit/bin/circuit
View File

@ -20,18 +20,18 @@ DEFAULT_PORT=7199
if [ "x$CLASSPATH" = "x" ]; then
# Cassandra class files.
if [ ! -d `dirname $0`/../../../build/classes ]; then
if [ ! -d `dirname $0`/../../../build/classes/main ]; then
echo "Unable to locate cassandra class files" >&2
exit 1
fi
# Circuit class files.
if [ ! -d `dirname $0`/../build/classes ]; then
if [ ! -d `dirname $0`/../build/classes/main ]; then
echo "Unable to locate circuit class files" >&2
exit 1
fi
CLASSPATH=`dirname $0`/../../../build/classes:`dirname $0`/../build/classes
CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main
for jar in `dirname $0`/../../../lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done

2
contrib/circuit/build.xml
View File

@ -20,7 +20,7 @@
<project basedir="." default="build" name="circuit">
<property name="cassandra.dir" value="../.." />
<property name="cassandra.lib" value="${cassandra.dir}/lib" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src" />
<property name="build.out" value="${basedir}/build" />
<property name="build.classes" value="${build.out}/classes" />

4
contrib/client_only/bin/client_only
View File

@ -21,7 +21,7 @@ cwd=`dirname $0`
name=client_only
# Cassandra class files
if [ ! -d $cwd/../../../build/classes ]; then
if [ ! -d $cwd/../../../build/classes/main ]; then
echo "Unable to locate cassandra class files" >&2
exit 1
fi
@ -33,7 +33,7 @@ if [ ! -e $cwd/../build/$name.jar ]; then
fi
CLASSPATH=$CLASSPATH:$cwd/../build/$name.jar
CLASSPATH=$CLASSPATH:$cwd/../../../build/classes
CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main
for jar in $cwd/../../../lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done

2
contrib/client_only/build.xml
View File

@ -20,7 +20,7 @@
<project default="jar" name="client_only">
<property name="cassandra.dir" value="../.." />
<property name="cassandra.dir.lib" value="${cassandra.dir}/lib" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src" />
<property name="build.dir" value="${basedir}/build" />
<property name="build.classes" value="${build.dir}/classes" />

2
contrib/javautils/build.xml
View File

@ -21,7 +21,7 @@
<property name="cassandra.dir" value="../.." />
<property name="cassandra.lib" value="${cassandra.dir}/lib" />
<property name="test.lib" value="${cassandra.dir}/build/lib" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src/main/java" />
<property name="test.src" value="${basedir}/src/test/java" />
<property name="test.reports" value="${basedir}/reports" />

2
contrib/pig/build.xml
View File

@ -22,7 +22,7 @@
<property environment="env" />
<property name="cassandra.dir" value="../.." />
<property name="cassandra.lib" value="" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src" />
<property name="build.lib" value="${basedir}/lib" />
<property name="build.out" value="${basedir}/build" />

6
contrib/stress/bin/stress
View File

@ -18,18 +18,18 @@
if [ "x$CLASSPATH" = "x" ]; then
# Cassandra class files.
if [ ! -d `dirname $0`/../../../build/classes ]; then
if [ ! -d `dirname $0`/../../../build/classes/main ]; then
echo "Unable to locate cassandra class files" >&2
exit 1
fi
# Stress class files.
if [ ! -d `dirname $0`/../build/classes ]; then
if [ ! -d `dirname $0`/../build/classes/main ]; then
echo "Unable to locate stress class files" >&2
exit 1
fi
CLASSPATH=`dirname $0`/../../../build/classes:`dirname $0`/../build/classes
CLASSPATH=`dirname $0`/../../../build/classes/main:`dirname $0`/../build/classes/main
for jar in `dirname $0`/../../../lib/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done

2
contrib/stress/build.xml
View File

@ -20,7 +20,7 @@
<project basedir="." default="build" name="stress">
<property name="cassandra.dir" value="../.." />
<property name="cassandra.lib" value="${cassandra.dir}/lib" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src" />
<property name="build.out" value="${basedir}/build" />
<property name="build.classes" value="${build.out}/classes" />

4
contrib/word_count/bin/word_count
View File

@ -19,7 +19,7 @@
cwd=`dirname $0`
# Cassandra class files.
if [ ! -d $cwd/../../../build/classes ]; then
if [ ! -d $cwd/../../../build/classes/main ]; then
echo "Unable to locate cassandra class files" >&2
exit 1
fi
@ -31,7 +31,7 @@ if [ ! -e $cwd/../build/word_count.jar ]; then
fi
CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar
CLASSPATH=$CLASSPATH:$cwd/../../../build/classes
CLASSPATH=$CLASSPATH:$cwd/../../../build/classes/main
for jar in $cwd/../build/lib/jars/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done

4
contrib/word_count/bin/word_count_setup
View File

@ -19,7 +19,7 @@
cwd=`dirname $0`
# Cassandra class files.
if [ ! -d $cwd/../../../build/classes ]; then
if [ ! -d $cwd/../../../build/classes/main ]; then
echo "Unable to locate cassandra class files" >&2
exit 1
fi
@ -31,7 +31,7 @@ if [ ! -e $cwd/../build/word_count.jar ]; then
fi
CLASSPATH=$CLASSPATH:$cwd/../build/word_count.jar
CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes
CLASSPATH=$CLASSPATH:.:$cwd/../../../build/classes/main
for jar in $cwd/../build/lib/jars/*.jar; do
CLASSPATH=$CLASSPATH:$jar
done

2
contrib/word_count/build.xml
View File

@ -20,7 +20,7 @@
<project default="jar" name="word_count" xmlns:ivy="antlib:org.apache.ivy.ant">
<property name="cassandra.dir" value="../.." />
<property name="cassandra.dir.lib" value="${cassandra.dir}/lib" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes" />
<property name="cassandra.classes" value="${cassandra.dir}/build/classes/main" />
<property name="build.src" value="${basedir}/src" />
<property name="build.dir" value="${basedir}/build" />
<property name="ivy.lib.dir" value="${build.dir}/lib" />

2
test/cassandra.in.sh
View File

@ -21,7 +21,7 @@ CASSANDRA_CONF=$cassandra_home/test/conf
# This can be the path to a jar file, or a directory containing the
# compiled classes. NOTE: This isn't needed by the startup script,
# it's just used here in constructing the classpath.
cassandra_bin=$cassandra_home/build/classes
cassandra_bin=$cassandra_home/build/classes/main
#cassandra_bin=$cassandra_home/build/cassandra.jar
# The java classpath (required)