diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-11 13:27:24 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-03-11 13:27:24 -0500 |
commit | f890b14098a588fb4e016afc6932edf89f8ef1f7 (patch) | |
tree | 6ea3269fdfadab3ac4317ed67dfb3c2e07ac3c87 | |
parent | e760ee9e4c4c3b3f39e2bb2dfd47d2b142e12a53 (diff) | |
download | cbt-f890b14098a588fb4e016afc6932edf89f8ef1f7.tar.gz cbt-f890b14098a588fb4e016afc6932edf89f8ef1f7.tar.bz2 cbt-f890b14098a588fb4e016afc6932edf89f8ef1f7.zip |
extract re-usable parts of cbt’s own build into Shared plugin
-rw-r--r-- | build/build.scala | 26 | ||||
-rw-r--r-- | build/build/build.scala | 7 | ||||
-rw-r--r-- | internal/plugins/shared/Shared.scala | 13 | ||||
-rw-r--r-- | internal/plugins/shared/build/build.scala | 5 | ||||
-rw-r--r-- | stage2/BuildBuild.scala | 7 |
5 files changed, 41 insertions, 17 deletions
diff --git a/build/build.scala b/build/build.scala index b4a39ea..4114bc5 100644 --- a/build/build.scala +++ b/build/build.scala @@ -1,6 +1,12 @@ import cbt._ +import cbt_internal._ + +class Build(val context: Context) extends Shared{ + override def name: String = "cbt" + override def version: String = ??? + override def description: String = "Fast, intuitive Build Tool for Scala" + override def inceptionYear: Int = 2015 -class Build(val context: Context) extends Publish{ // FIXME: somehow consolidate this with cbt's own boot-strapping from source. override def dependencies = { super.dependencies ++ Resolver(mavenCentral).bind( @@ -9,22 +15,8 @@ class Build(val context: Context) extends Publish{ ScalaDependency("org.scala-lang.modules","scala-xml","1.0.5") ) } + override def sources = Seq( "nailgun_launcher", "stage1", "stage2", "compatibility" - ).map(d => projectDirectory ++ ("/" + d)) - - def groupId: String = "org.cvogt" - - def version: String = "0.9" - override def name: String = "cbt" - - // Members declared in cbt.Publish - def description: String = "Fast, intuitive Build Tool for Scala" - def developers: Seq[cbt.Developer] = Nil - def inceptionYear: Int = 2016 - def licenses: Seq[cbt.License] = Seq( License.Apache2 ) - def organization: Option[cbt.Organization] = None - def scmConnection: String = "" - def scmUrl: String = "" - def url: java.net.URL = new java.net.URL("http://github.com/cvogt/cbt/") + ).map( projectDirectory / _ ).flatMap( _.listFiles ) } diff --git a/build/build/build.scala b/build/build/build.scala new file mode 100644 index 0000000..313b2b5 --- /dev/null +++ b/build/build/build.scala @@ -0,0 +1,7 @@ +package cbt_build.cbt.build +import cbt._ +class Build(val context: Context) extends CbtInternal{ + override def dependencies = ( + super.dependencies :+ cbtInternal.shared + ) +} diff --git a/internal/plugins/shared/Shared.scala b/internal/plugins/shared/Shared.scala new file mode 100644 index 0000000..90bc4b2 --- /dev/null +++ b/internal/plugins/shared/Shared.scala @@ -0,0 +1,13 @@ +package cbt_internal +import cbt._ +import java.net.URL +trait Shared extends SonatypeRelease with SnapshotVersion with GithubPom{ + override def user = "cvogt" + override def groupId = "org.cvogt" + override def organization = Some( Organization( "Jan Christopher Vogt", Some( new URL("http://cvogt.org") ) ) ) + override def licenses = Seq( License.Apache2 ) + override def developers = Seq(cvogt) + override def githubProject = "cbt" + + def cvogt = Developer("cvogt", "Jan Christopher Vogt", "-5", new URL("https://github.com/cvogt/")) +} diff --git a/internal/plugins/shared/build/build.scala b/internal/plugins/shared/build/build.scala new file mode 100644 index 0000000..1d6fc29 --- /dev/null +++ b/internal/plugins/shared/build/build.scala @@ -0,0 +1,5 @@ +package cbt_build.cbt_internal.library_build_plugin +import cbt._ +class Build(val context: Context) extends Plugin{ + override def dependencies = super.dependencies :+ plugins.sonatypeRelease +} diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index c312df9..d778049 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -116,3 +116,10 @@ trait BuildBuildWithoutEssentials extends BaseBuild{ if( c == p ) this else managedBuild.finalBuild( current ) } } + +trait CbtInternal extends BuildBuild{ + protected object cbtInternal{ + def shared = DirectoryDependency(context.cbtHome / "/internal/plugins/shared") + def library = DirectoryDependency(context.cbtHome / "/internal/plugins/library") + } +} |