raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Publish akka-osgi but do not include it in dist #20548 (#20549)

Browse source
This commit is contained in:
Johan Andrén 2016-05-19 12:41:38 +02:00
parent e0c64f59d8
commit 83c60cb034
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-osgi/build.sbt
View file

@ -1,7 +1,7 @@
import akka.{ AkkaBuild, Dependencies, Formatting, OSGi } import akka.{ AkkaBuild, Dependencies, Formatting, OSGi, Dist }
AkkaBuild.defaultSettings AkkaBuild.defaultSettings
AkkaBuild.dontPublishSettings Dist.includeInDist := false
Formatting.formatSettings Formatting.formatSettings
OSGi.osgi OSGi.osgi
Dependencies.osgi Dependencies.osgi

3
project/AkkaBuild.scala
View file

@ -434,7 +434,8 @@ object AkkaBuild extends Build {
val dontPublishSettings = Seq( val dontPublishSettings = Seq(
publishSigned := (), publishSigned := (),
publish := (), publish := (),
publishArtifact in Compile := false publishArtifact in Compile := false,
Dist.includeInDist := false
) )
val dontPublishDocsSettings = Seq( val dontPublishDocsSettings = Seq(

4
project/Dist.scala
View file

@ -24,8 +24,10 @@ object Dist {
val distDocJars = TaskKey[Seq[File]]("dist-doc-jars") val distDocJars = TaskKey[Seq[File]]("dist-doc-jars")
val distSources = TaskKey[DistSources]("dist-sources") val distSources = TaskKey[DistSources]("dist-sources")
val dist = TaskKey[File]("dist", "Create a zipped distribution of everything.") val dist = TaskKey[File]("dist", "Create a zipped distribution of everything.")
val includeInDist = SettingKey[Boolean]("include-in-dist", "Include the artifact of this project in the standalone dist zip-file")
lazy val settings: Seq[Setting[_]] = Seq( lazy val settings: Seq[Setting[_]] = Seq(
includeInDist := true,
distAllClasspaths <<= (thisProjectRef, buildStructure) flatMap aggregated(dependencyClasspath in Compile), distAllClasspaths <<= (thisProjectRef, buildStructure) flatMap aggregated(dependencyClasspath in Compile),
distDependencies <<= distAllClasspaths map { _.flatten.map(_.data).filter(ClasspathUtilities.isArchive).distinct }, distDependencies <<= distAllClasspaths map { _.flatten.map(_.data).filter(ClasspathUtilities.isArchive).distinct },
distLibJars <<= (thisProjectRef, buildStructure) flatMap aggregated(packageBin in Compile), distLibJars <<= (thisProjectRef, buildStructure) flatMap aggregated(packageBin in Compile),
@ -49,7 +51,7 @@ object Dist {
def aggregatedProjects(projectRef: ProjectRef, structure: BuildStructure, scope: Scope): Seq[ProjectRef] = { def aggregatedProjects(projectRef: ProjectRef, structure: BuildStructure, scope: Scope): Seq[ProjectRef] = {
val aggregate = Project.getProject(projectRef, structure).toSeq.flatMap(_.aggregate) val aggregate = Project.getProject(projectRef, structure).toSeq.flatMap(_.aggregate)
aggregate flatMap { ref => aggregate flatMap { ref =>
if (!(publishArtifact in ref in scope get structure.data getOrElse false)) Nil if (!(includeInDist in ref in scope get structure.data getOrElse false)) Nil
else ref +: aggregatedProjects(ref, structure, scope) else ref +: aggregatedProjects(ref, structure, scope)
} }
} }