diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
|---|---|---|
| committer | Raymond Liu <raymond.liu@intel.com> | 2013-11-14 12:44:19 +0800 |
| commit | a60620b76a98e236f1e4ffda7a2f289e7917b957 (patch) | |
| tree | f66630007c201074af74ba13dca24ab9894ae543 /spark-class | |
| parent | 0f2e3c6e31d56c627ff81cdc93289a7c7cb2ec16 (diff) | |
| parent | 2054c61a18c277c00661b89bbae365470c297031 (diff) | |
| download | spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.gz spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.tar.bz2 spark-a60620b76a98e236f1e4ffda7a2f289e7917b957.zip | |
Merge branch 'master' into scala-2.10
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 359db3d984..78d6e073b1 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 |