aboutsummaryrefslogtreecommitdiff
path: root/sbt
diff options
context:
space:
mode:
authorJey Kottalam <jey@cs.berkeley.edu>2013-08-21 14:25:53 -0700
committerJey Kottalam <jey@cs.berkeley.edu>2013-08-21 14:25:53 -0700
commit66e7a38a3229eeb6d980193048ebebcda1522acb (patch)
tree352ab3e7488059ca1c64e9669fc34510b2f884d7 /sbt
parent31644a011c1c61ca010b91dc83373e15960f4d23 (diff)
downloadspark-66e7a38a3229eeb6d980193048ebebcda1522acb.tar.gz
spark-66e7a38a3229eeb6d980193048ebebcda1522acb.tar.bz2
spark-66e7a38a3229eeb6d980193048ebebcda1522acb.zip
Allow build configuration to be set in conf/spark-env.sh
Diffstat (limited to 'sbt')
-rwxr-xr-xsbt/sbt15
1 files changed, 9 insertions, 6 deletions
diff --git a/sbt/sbt b/sbt/sbt
index 397895276c..a38a2985d1 100755
--- a/sbt/sbt
+++ b/sbt/sbt
@@ -17,12 +17,15 @@
# limitations under the License.
#
-EXTRA_ARGS=""
-if [ "$MESOS_HOME" != "" ]; then
- EXTRA_ARGS="-Djava.library.path=$MESOS_HOME/lib/java"
-fi
-
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 "$@"
+if [ -f "$SPARK_HOME/conf/spark-env.sh" ]; then
+ source "$SPARK_HOME/conf/spark-env.sh"
+fi
+
+if [ "$MESOS_HOME" != "" ]; then
+ EXTRA_BUILD_ARGS="$EXTRA_BUILD_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 "$@"