diff options
| author | Ankur Dave <ankurdave@gmail.com> | 2013-10-30 15:59:09 -0700 |
|---|---|---|
| committer | Ankur Dave <ankurdave@gmail.com> | 2013-10-30 15:59:09 -0700 |
| commit | 5064f9b2d22b9d28734bf19d825d20292a3b0fd9 (patch) | |
| tree | 5dc2b23dcb54091585dccd3d11810e3110706428 /bin/compute-classpath.sh | |
| parent | a0c86c36896c20cd70a8fecfe23284486f898883 (diff) | |
| parent | 618c1f6cf3008caae7a8c0202721a6bd77d29a0f (diff) | |
| download | spark-5064f9b2d22b9d28734bf19d825d20292a3b0fd9.tar.gz spark-5064f9b2d22b9d28734bf19d825d20292a3b0fd9.tar.bz2 spark-5064f9b2d22b9d28734bf19d825d20292a3b0fd9.zip | |
Merge remote-tracking branch 'spark-upstream/master'
Conflicts:
project/SparkBuild.scala
Diffstat (limited to 'bin/compute-classpath.sh')
| -rwxr-xr-x | bin/compute-classpath.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/bin/compute-classpath.sh b/bin/compute-classpath.sh index 6ad1ca6ef8..6f1a3f8d64 100755 --- a/bin/compute-classpath.sh +++ b/bin/compute-classpath.sh @@ -33,12 +33,26 @@ fi # Build up classpath CLASSPATH="$SPARK_CLASSPATH:$FWDIR/conf" -if [ -f "$FWDIR/RELEASE" ]; then - ASSEMBLY_JAR=`ls "$FWDIR"/jars/spark-assembly*.jar` + +# First check if we have a dependencies jar. If so, include binary classes with the deps jar +if [ -f "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*-deps.jar ]; then + CLASSPATH="$CLASSPATH:$FWDIR/core/target/scala-$SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/repl/target/scala-$SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/mllib/target/scala-$SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/bagel/target/scala-$SCALA_VERSION/classes" + CLASSPATH="$CLASSPATH:$FWDIR/streaming/target/scala-$SCALA_VERSION/classes" + + DEPS_ASSEMBLY_JAR=`ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*-deps.jar` + CLASSPATH="$CLASSPATH:$DEPS_ASSEMBLY_JAR" else - ASSEMBLY_JAR=`ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar` + # Else use spark-assembly jar from either RELEASE or assembly directory + if [ -f "$FWDIR/RELEASE" ]; then + ASSEMBLY_JAR=`ls "$FWDIR"/jars/spark-assembly*.jar` + else + ASSEMBLY_JAR=`ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar` + fi + CLASSPATH="$CLASSPATH:$ASSEMBLY_JAR" fi -CLASSPATH="$CLASSPATH:$ASSEMBLY_JAR" # Add test classes if we're running from SBT or Maven with SPARK_TESTING set to 1 if [[ $SPARK_TESTING == 1 ]]; then |