diff --git a/bin/run-example b/bin/run-example index dfb4bf7baf0c2349037e42b7968658c4cd5edb14..6c5d4a6a8f3641223598970d6c450468baf61ecd 100755 --- a/bin/run-example +++ b/bin/run-example @@ -55,7 +55,7 @@ if [ -e "$EXAMPLES_DIR"/target/spark-examples*[0-9Tg].jar ]; then 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 + echo "You need to build Spark with sbt/sbt assembly before running this program" >&2 exit 1 fi diff --git a/project/build.properties b/project/build.properties index 059edac7d4331181951dd4c9f8d2756051de474f..03438f6558abeae10453dd143d61a0afe1456232 100644 --- a/project/build.properties +++ b/project/build.properties @@ -16,5 +16,5 @@ # # Note: If you change the sbt version please also change the sbt download -# script in the root directory of the project called sbt. +# script sbt/sbt sbt.version=0.12.4 diff --git a/sbt/sbt b/sbt/sbt index 0951e9daa68e616c105eb6d6cd6318fc541ac746..af422d9e891bd275e2f58b0b786cd64f9a8683ca 100755 --- a/sbt/sbt +++ b/sbt/sbt @@ -35,7 +35,7 @@ else printf "Our attempt to download sbt locally to ${JAR} failed. Please install sbt manually from http://www.scala-sbt.org/\n" exit -1 fi - printf "Launching sbt from .sbtlib\n" + printf "Launching sbt from ${JAR}\n" java \ -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=256m \ -jar ${JAR} \