diff options
| author | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-14 17:49:42 -0700 |
|---|---|---|
| committer | Jey Kottalam <jey@cs.berkeley.edu> | 2013-08-16 13:50:12 -0700 |
| commit | 8add2d7a59c59e72539da86a58b9c2980843f1e0 (patch) | |
| tree | 4f9cda8ee7ec11ea9585d5fa929e110c18e659de /project | |
| parent | 3f98eff63a3df35f6dc56f0786c828cdbe4ffcf1 (diff) | |
| download | spark-8add2d7a59c59e72539da86a58b9c2980843f1e0.tar.gz spark-8add2d7a59c59e72539da86a58b9c2980843f1e0.tar.bz2 spark-8add2d7a59c59e72539da86a58b9c2980843f1e0.zip | |
Fix repl/assembly when YARN enabled
Diffstat (limited to 'project')
| -rw-r--r-- | project/SparkBuild.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index 23c7179919..fa9ec7deca 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -36,7 +36,7 @@ object SparkBuild extends Build { lazy val core = Project("core", file("core"), settings = coreSettings) - lazy val repl = Project("repl", file("repl"), settings = replSettings) dependsOn (core) dependsOn(bagel) dependsOn(mllib) + lazy val repl = Project("repl", file("repl"), settings = replSettings) dependsOn(core) dependsOn(bagel) dependsOn(mllib) dependsOn(maybeYarn:_*) lazy val examples = Project("examples", file("examples"), settings = examplesSettings) dependsOn (core) dependsOn (streaming) dependsOn(mllib) @@ -62,8 +62,9 @@ object SparkBuild extends Build { } // Conditionally include the yarn sub-project - lazy val maybeYarn = if(isYarnMode) Seq[ProjectReference](yarn) else Seq[ProjectReference]() - lazy val allProjects = Seq[ProjectReference](core, repl, examples, bagel, streaming, mllib, tools) ++ maybeYarn + lazy val maybeYarn = if(isYarnMode) Seq[ClasspathDependency](yarn) else Seq[ClasspathDependency]() + lazy val maybeYarnRef = if(isYarnMode) Seq[ProjectReference](yarn) else Seq[ProjectReference]() + lazy val allProjects = Seq[ProjectReference](core, repl, examples, bagel, streaming, mllib, tools) ++ maybeYarnRef def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.spark-project", |