Skip to content

Commit

Permalink
Rename SBT target to assemble-deps.
Browse files Browse the repository at this point in the history
  • Loading branch information
shivaram committed Oct 17, 2013
1 parent 1dcded4 commit 0a4b76f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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",
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0a4b76f

Please sign in to comment.