diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-07 11:02:29 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-07 11:02:29 -0800 |
| commit | 8f02f1c3d45ee553ed6bec2dc81fbae4435274fc (patch) | |
| tree | 2832c5d269ffec64cdeb5b0a1255900998de9998 /bin | |
| parent | aa99f226a691ddcb4442d60f4cd4908f434cc4ce (diff) | |
| download | spark-8f02f1c3d45ee553ed6bec2dc81fbae4435274fc.tar.gz spark-8f02f1c3d45ee553ed6bec2dc81fbae4435274fc.tar.bz2 spark-8f02f1c3d45ee553ed6bec2dc81fbae4435274fc.zip | |
Fixed examples/pom.xml and run-example based on Patrick's suggestions.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/run-example | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/bin/run-example b/bin/run-example index dfb4bf7baf..a94913ddef 100755 --- a/bin/run-example +++ b/bin/run-example @@ -45,20 +45,15 @@ fi EXAMPLES_DIR="$FWDIR"/examples SPARK_EXAMPLES_JAR="" if [ -e "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar ]; then - # Use the JAR from the SBT build export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/scala-$SCALA_VERSION/*assembly*[0-9Tg].jar` fi -if [ -e "$EXAMPLES_DIR"/target/spark-examples*[0-9Tg].jar ]; then - # Use the JAR from the Maven build - # TODO: this also needs to become an assembly! - export SPARK_EXAMPLES_JAR=`ls "$EXAMPLES_DIR"/target/spark-examples*[0-9Tg].jar` -fi if [[ -z $SPARK_EXAMPLES_JAR ]]; then echo "Failed to find Spark examples assembly in $FWDIR/examples/target" >&2 echo "You need to build Spark with sbt assembly before running this program" >&2 exit 1 fi + # Since the examples JAR ideally shouldn't include spark-core (that dependency should be # "provided"), also add our standard Spark classpath, built using compute-classpath.sh. CLASSPATH=`$FWDIR/bin/compute-classpath.sh` |