diff options
| author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-10-16 17:05:46 -0700 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-10-16 17:05:46 -0700 |
| commit | 0a4b76fcc22568dd62e6be0301e3bda916bc6bc8 (patch) | |
| tree | cc951d86504df3c522ca0544b081655cfb83f376 /project/SparkBuild.scala | |
| parent | 1dcded45e23da488df1407c66b890da6d85c07b9 (diff) | |
| download | spark-0a4b76fcc22568dd62e6be0301e3bda916bc6bc8.tar.gz spark-0a4b76fcc22568dd62e6be0301e3bda916bc6bc8.tar.bz2 spark-0a4b76fcc22568dd62e6be0301e3bda916bc6bc8.zip | |
Rename SBT target to assemble-deps.
Diffstat (limited to 'project/SparkBuild.scala')
| -rw-r--r-- | project/SparkBuild.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala index d7e82079cf..dd26d7e60b 100644 --- a/project/SparkBuild.scala +++ b/project/SparkBuild.scala @@ -60,7 +60,7 @@ object SparkBuild extends Build { lazy val assemblyProj = Project("assembly", file("assembly"), settings = assemblyProjSettings) .dependsOn(core, bagel, mllib, repl, streaming) dependsOn(maybeYarn: _*) - lazy val spark = TaskKey[Unit]("spark", "Build assembly of dependencies and spark packages") + lazy val assembleDeps = TaskKey[Unit]("assemble-deps", "Build assembly of dependencies and packages Spark projects") // A configuration to set an alternative publishLocalConfiguration lazy val MavenCompile = config("m2r") extend(Compile) @@ -76,12 +76,12 @@ object SparkBuild extends Build { // Conditionally include the yarn sub-project lazy val maybeYarn = if(isYarnEnabled) Seq[ClasspathDependency](yarn) else Seq[ClasspathDependency]() lazy val maybeYarnRef = if(isYarnEnabled) Seq[ProjectReference](yarn) else Seq[ProjectReference]() - lazy val allProjects = Seq[ProjectReference]( - core, repl, examples, bagel, streaming, mllib, tools, assemblyProj) ++ maybeYarnRef - // Everything except assembly and examples belongs to packageProjects + // Everything except assembly, tools and examples belong to packageProjects lazy val packageProjects = Seq[ProjectReference](core, repl, bagel, streaming, mllib) ++ maybeYarnRef + lazy val allProjects = packageProjects ++ Seq[ProjectReference](examples, tools, assemblyProj) + def sharedSettings = Defaults.defaultSettings ++ Seq( organization := "org.apache.spark", version := "0.9.0-incubating-SNAPSHOT", @@ -308,7 +308,7 @@ object SparkBuild extends Build { def assemblyProjSettings = sharedSettings ++ Seq( name := "spark-assembly", - spark in Compile <<= (packageProjects.map(packageBin in Compile in _) ++ Seq(packageDependency in Compile)).dependOn, + assembleDeps in Compile <<= (packageProjects.map(packageBin in Compile in _) ++ Seq(packageDependency in Compile)).dependOn, jarName in assembly <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + ".jar" }, jarName in packageDependency <<= version map { v => "spark-assembly-" + v + "-hadoop" + hadoopVersion + "-deps.jar" } ) ++ assemblySettings ++ extraAssemblySettings |