diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 13:53:16 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 14:00:05 -0700 |
| commit | 67b593607c7df934d5a73012fe9cce220b25f321 (patch) | |
| tree | 961b3f3709b6734a0192e622c5aa85e84e7eaf21 /project | |
| parent | b1d99744a813a72301260612943f46853794f00f (diff) | |
| download | spark-67b593607c7df934d5a73012fe9cce220b25f321.tar.gz spark-67b593607c7df934d5a73012fe9cce220b25f321.tar.bz2 spark-67b593607c7df934d5a73012fe9cce220b25f321.zip | |
Rename YARN build flag to SPARK_WITH_YARN
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 4023626c16..cea982b886 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -26,8 +26,10 @@ import AssemblyKeys._ object SparkBuild extends Build { // Hadoop version to build against. For example, "0.20.2", "0.20.205.0", or // "1.0.4" for Apache releases, or "0.20.2-cdh3u5" for Cloudera Hadoop. - val HADOOP_VERSION = "1.2.1" - val HADOOP_YARN = false + // Note that these variables can be set through the environment variables + // SPARK_HADOOP_VERSION and SPARK_WITH_YARN. + val DEFAULT_HADOOP_VERSION = "1.2.1" + val DEFAULT_WITH_YARN = false // HBase version; set as appropriate. val HBASE_VERSION = "0.94.6" @@ -55,9 +57,9 @@ object SparkBuild extends Build { lazy val publishLocalBoth = TaskKey[Unit]("publish-local", "publish local for m2 and ivy") // Allows build configuration to be set through environment variables - lazy val hadoopVersion = scala.util.Properties.envOrElse("SPARK_HADOOP_VERSION", HADOOP_VERSION) - lazy val isYarnMode = scala.util.Properties.envOrNone("SPARK_YARN_MODE") match { - case None => HADOOP_YARN + lazy val hadoopVersion = scala.util.Properties.envOrElse("SPARK_HADOOP_VERSION", DEFAULT_HADOOP_VERSION) + lazy val isYarnMode = scala.util.Properties.envOrNone("SPARK_WITH_YARN") match { + case None => DEFAULT_WITH_YARN case Some(v) => v.toBoolean } |