From 54e9379de291c3d5e5a9749cfc022a17ff34852c Mon Sep 17 00:00:00 2001 From: Jey Kottalam Date: Wed, 21 Aug 2013 21:13:34 -0700 Subject: Revert "Allow build configuration to be set in conf/spark-env.sh" This reverts commit 66e7a38a3229eeb6d980193048ebebcda1522acb. --- sbt/sbt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'sbt') diff --git a/sbt/sbt b/sbt/sbt index a38a2985d1..397895276c 100755 --- a/sbt/sbt +++ b/sbt/sbt @@ -17,15 +17,12 @@ # limitations under the License. # -export SPARK_HOME=$(cd "$(dirname $0)/.." 2>&1 >/dev/null ; pwd) -export SPARK_TESTING=1 # To put test classes on classpath - -if [ -f "$SPARK_HOME/conf/spark-env.sh" ]; then - source "$SPARK_HOME/conf/spark-env.sh" -fi - +EXTRA_ARGS="" if [ "$MESOS_HOME" != "" ]; then - EXTRA_BUILD_ARGS="$EXTRA_BUILD_ARGS -Djava.library.path=$MESOS_HOME/lib/java" + EXTRA_ARGS="-Djava.library.path=$MESOS_HOME/lib/java" fi -java -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=128m $EXTRA_BUILD_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@" +export SPARK_HOME=$(cd "$(dirname $0)/.." 2>&1 >/dev/null ; pwd) +export SPARK_TESTING=1 # To put test classes on classpath + +java -Xmx1200m -XX:MaxPermSize=350m -XX:ReservedCodeCacheSize=128m $EXTRA_ARGS -jar $SPARK_HOME/sbt/sbt-launch-*.jar "$@" -- cgit v1.2.3