diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-21 21:13:34 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-21 21:13:34 -0700 |
| commit | 54e9379de291c3d5e5a9749cfc022a17ff34852c (patch) | |
| tree | df800834e1b8116477c0934812657a5efe4666d4 /sbt | |
| parent | f9cc1fbf272606ce0b679936ef38429b20916cc1 (diff) | |
| download | spark-54e9379de291c3d5e5a9749cfc022a17ff34852c.tar.gz spark-54e9379de291c3d5e5a9749cfc022a17ff34852c.tar.bz2 spark-54e9379de291c3d5e5a9749cfc022a17ff34852c.zip | |
Revert "Allow build configuration to be set in conf/spark-env.sh"
This reverts commit 66e7a38a3229eeb6d980193048ebebcda1522acb.
Diffstat (limited to 'sbt')
| -rwxr-xr-x | sbt/sbt | 15 |
1 files changed, 6 insertions, 9 deletions
@@ -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 "$@" |