diff options
| author | Josh Rosen <joshrosen@apache.org> | 2013-11-09 13:37:11 -0800 |
|---|---|---|
| committer | Josh Rosen <joshrosen@apache.org> | 2013-11-09 13:42:45 -0800 |
| commit | a37ff0f1dbae977744fdd3f7d4a2d6873fe9c70f (patch) | |
| tree | faaf8c6da52c4532a67b1d866387151ae5e6df74 /spark-class | |
| parent | 72a601ec318d017e5ec2b878abeac19e30ebb554 (diff) | |
| download | spark-a37ff0f1dbae977744fdd3f7d4a2d6873fe9c70f.tar.gz spark-a37ff0f1dbae977744fdd3f7d4a2d6873fe9c70f.tar.bz2 spark-a37ff0f1dbae977744fdd3f7d4a2d6873fe9c70f.zip | |
Add spark-tools assembly to spark-class classpath.
This allows the JavaAPICompletenessChecker to be
run with Spark 0.8+.
Diffstat (limited to 'spark-class')
| -rwxr-xr-x | spark-class | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/spark-class b/spark-class index fb9d1a4f8e..bbeca7f245 100755 --- a/spark-class +++ b/spark-class @@ -110,8 +110,21 @@ if [ ! -f "$FWDIR/RELEASE" ]; then fi fi +TOOLS_DIR="$FWDIR"/tools +SPARK_TOOLS_JAR="" +if [ -e "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar ]; then + # Use the JAR from the SBT build + export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar` +fi +if [ -e "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar ]; then + # Use the JAR from the Maven build + # TODO: this also needs to become an assembly! + export SPARK_TOOLS_JAR=`ls "$TOOLS_DIR"/target/spark-tools*[0-9Tg].jar` +fi + # Compute classpath using external script CLASSPATH=`$FWDIR/bin/compute-classpath.sh` +CLASSPATH="$SPARK_TOOLS_JAR:$CLASSPATH" export CLASSPATH if [ "$SPARK_PRINT_LAUNCH_COMMAND" == "1" ]; then |