diff options
author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-13 10:39:40 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-13 10:39:40 -0500 |
commit | e0fb6ec75286c695b7e4c5ed9189714d40f9b672 (patch) | |
tree | 3cf36e22305cc1da608667cfef85afcf682cc21a /examples | |
parent | 0a295c21d3379117e661fdbf586ecb6222c3602b (diff) | |
parent | d1cbc1efffd5c2a6511f1ccca43ccfb37a7f1af8 (diff) | |
download | cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.tar.gz cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.tar.bz2 cbt-e0fb6ec75286c695b7e4c5ed9189714d40f9b672.zip |
Merge pull request #303 from cvogt/nested-builds
Add support for nested builds and use it to replace cross compilation command which was previously hard-coded
Diffstat (limited to 'examples')
-rw-r--r-- | examples/cross-build-example/build/build.scala | 4 | ||||
-rw-r--r-- | examples/cross-build-example/src/Main.scala | 3 | ||||
-rw-r--r-- | examples/multi-combined-example/Readme.md | 1 | ||||
-rw-r--r-- | examples/multi-combined-example/build/build.scala | 44 | ||||
-rw-r--r-- | examples/multi-combined-example/shared/SomeSharedClass.scala | 6 | ||||
-rw-r--r-- | examples/multi-combined-example/sub1/SomeConcreteClass.scala | 2 | ||||
-rw-r--r-- | examples/multi-combined-example/sub2/SomeOtherConcreteClass.scala | 2 | ||||
-rw-r--r-- | examples/multi-standalone-example/Readme.md | 3 | ||||
-rw-r--r-- | examples/multi-standalone-example/build/build.scala (renamed from examples/multi-project-example/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/build/build/build.scala (renamed from examples/multi-project-example/build/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/common/SomeSharedClass.scala (renamed from examples/multi-project-example/common/SomeSharedClass.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/common/build/build.scala (renamed from examples/multi-project-example/common/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/common/build/build/build.scala (renamed from examples/multi-project-example/common/build/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/shared-build/SharedCbtBuild.scala (renamed from examples/multi-project-example/shared-build/SharedCbtBuild.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/shared-build/build/build.scala (renamed from examples/multi-project-example/shared-build/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub1/SomeConcreteClass.scala (renamed from examples/multi-project-example/sub1/SomeConcreteClass.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub1/build/build.scala (renamed from examples/multi-project-example/sub1/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub1/build/build/build.scala (renamed from examples/multi-project-example/sub1/build/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub2/SomeOtherConcreteClass.scala (renamed from examples/multi-project-example/sub2/SomeOtherConcreteClass.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub2/build/build.scala (renamed from examples/multi-project-example/sub2/build/build.scala) | 0 | ||||
-rw-r--r-- | examples/multi-standalone-example/sub2/build/build/build.scala (renamed from examples/multi-project-example/sub2/build/build/build.scala) | 0 |
21 files changed, 65 insertions, 0 deletions
diff --git a/examples/cross-build-example/build/build.scala b/examples/cross-build-example/build/build.scala new file mode 100644 index 0000000..e1df645 --- /dev/null +++ b/examples/cross-build-example/build/build.scala @@ -0,0 +1,4 @@ +import cbt._ +class Build(val context: Context) extends MultipleScalaVersions{ + override def scalaVersions = Seq("2.10.5","2.11.7") +} diff --git a/examples/cross-build-example/src/Main.scala b/examples/cross-build-example/src/Main.scala new file mode 100644 index 0000000..88a18d3 --- /dev/null +++ b/examples/cross-build-example/src/Main.scala @@ -0,0 +1,3 @@ +object Main extends App { + println("Hello World") +} diff --git a/examples/multi-combined-example/Readme.md b/examples/multi-combined-example/Readme.md new file mode 100644 index 0000000..01302d4 --- /dev/null +++ b/examples/multi-combined-example/Readme.md @@ -0,0 +1 @@ +This is an example how to do a multi-project build with a single build file. diff --git a/examples/multi-combined-example/build/build.scala b/examples/multi-combined-example/build/build.scala new file mode 100644 index 0000000..41c03d6 --- /dev/null +++ b/examples/multi-combined-example/build/build.scala @@ -0,0 +1,44 @@ +import cbt._ +import cbt._ +trait SharedCbtBuild extends BaseBuild{ + override def defaultScalaVersion = "2.10.6" +} + + +class Shared(val context: Context) extends SharedCbtBuild + +class Sub(val context:Context) extends SharedCbtBuild{ + override def dependencies = Seq(new Shared( + context.copy( + projectDirectory = projectDirectory ++ "/../shared" + ) + )) +} + +class Build(val context: Context) extends BaseBuild{ + /* + Currently each sub build nested into the main build needs to be an instance + of a top-level class taking a Context as the sole parameter, similar to the + Build class itself. This restriction may be lifted for more flexibility at + some point, see https://github.com/cvogt/cbt/issues/306 + */ + def sub1 = new Sub( + context.copy( + projectDirectory = projectDirectory ++ "/sub1" + ) + ) + def sub2 = new Sub( + context.copy( + projectDirectory = projectDirectory ++ "/sub2" + ) + ) + + def sub3 = // DON'T DO THIS, anonymous classes are currently not supported here. + new SharedCbtBuild{ + def context = Build.this.context.copy( + projectDirectory = Build.this.projectDirectory ++ "/sub3" + ) + } + + override def dependencies = Seq( sub1, sub2 ) // assembles all projects +} diff --git a/examples/multi-combined-example/shared/SomeSharedClass.scala b/examples/multi-combined-example/shared/SomeSharedClass.scala new file mode 100644 index 0000000..d7d99e4 --- /dev/null +++ b/examples/multi-combined-example/shared/SomeSharedClass.scala @@ -0,0 +1,6 @@ +package cbt.examples.multi_combined +class SomeSharedClass{ + def main(args: Array[String]): Unit = { + println(this.getClass.getSimpleName) + } +} diff --git a/examples/multi-combined-example/sub1/SomeConcreteClass.scala b/examples/multi-combined-example/sub1/SomeConcreteClass.scala new file mode 100644 index 0000000..e55cb12 --- /dev/null +++ b/examples/multi-combined-example/sub1/SomeConcreteClass.scala @@ -0,0 +1,2 @@ +package cbt.examples.multi_combined +object SomeConcreteClass extends SomeSharedClass diff --git a/examples/multi-combined-example/sub2/SomeOtherConcreteClass.scala b/examples/multi-combined-example/sub2/SomeOtherConcreteClass.scala new file mode 100644 index 0000000..399aee6 --- /dev/null +++ b/examples/multi-combined-example/sub2/SomeOtherConcreteClass.scala @@ -0,0 +1,2 @@ +package cbt.examples.multi_combined +object SomeOtherConcreteClass extends SomeSharedClass diff --git a/examples/multi-standalone-example/Readme.md b/examples/multi-standalone-example/Readme.md new file mode 100644 index 0000000..be89598 --- /dev/null +++ b/examples/multi-standalone-example/Readme.md @@ -0,0 +1,3 @@ +This is an example how to build a multi-project build using CBT while keeping each project self-contained with it's own build files. + +Check the multi-combined-example for how to do it with a single build file for all builds together instead. diff --git a/examples/multi-project-example/build/build.scala b/examples/multi-standalone-example/build/build.scala index 9a67488..9a67488 100644 --- a/examples/multi-project-example/build/build.scala +++ b/examples/multi-standalone-example/build/build.scala diff --git a/examples/multi-project-example/build/build/build.scala b/examples/multi-standalone-example/build/build/build.scala index be72a13..be72a13 100644 --- a/examples/multi-project-example/build/build/build.scala +++ b/examples/multi-standalone-example/build/build/build.scala diff --git a/examples/multi-project-example/common/SomeSharedClass.scala b/examples/multi-standalone-example/common/SomeSharedClass.scala index 1f32c5a..1f32c5a 100644 --- a/examples/multi-project-example/common/SomeSharedClass.scala +++ b/examples/multi-standalone-example/common/SomeSharedClass.scala diff --git a/examples/multi-project-example/common/build/build.scala b/examples/multi-standalone-example/common/build/build.scala index 0fbea50..0fbea50 100644 --- a/examples/multi-project-example/common/build/build.scala +++ b/examples/multi-standalone-example/common/build/build.scala diff --git a/examples/multi-project-example/common/build/build/build.scala b/examples/multi-standalone-example/common/build/build/build.scala index efeeb77..efeeb77 100644 --- a/examples/multi-project-example/common/build/build/build.scala +++ b/examples/multi-standalone-example/common/build/build/build.scala diff --git a/examples/multi-project-example/shared-build/SharedCbtBuild.scala b/examples/multi-standalone-example/shared-build/SharedCbtBuild.scala index 38e4cc1..38e4cc1 100644 --- a/examples/multi-project-example/shared-build/SharedCbtBuild.scala +++ b/examples/multi-standalone-example/shared-build/SharedCbtBuild.scala diff --git a/examples/multi-project-example/shared-build/build/build.scala b/examples/multi-standalone-example/shared-build/build/build.scala index 332519e..332519e 100644 --- a/examples/multi-project-example/shared-build/build/build.scala +++ b/examples/multi-standalone-example/shared-build/build/build.scala diff --git a/examples/multi-project-example/sub1/SomeConcreteClass.scala b/examples/multi-standalone-example/sub1/SomeConcreteClass.scala index 2f8f715..2f8f715 100644 --- a/examples/multi-project-example/sub1/SomeConcreteClass.scala +++ b/examples/multi-standalone-example/sub1/SomeConcreteClass.scala diff --git a/examples/multi-project-example/sub1/build/build.scala b/examples/multi-standalone-example/sub1/build/build.scala index 2c39a54..2c39a54 100644 --- a/examples/multi-project-example/sub1/build/build.scala +++ b/examples/multi-standalone-example/sub1/build/build.scala diff --git a/examples/multi-project-example/sub1/build/build/build.scala b/examples/multi-standalone-example/sub1/build/build/build.scala index efeeb77..efeeb77 100644 --- a/examples/multi-project-example/sub1/build/build/build.scala +++ b/examples/multi-standalone-example/sub1/build/build/build.scala diff --git a/examples/multi-project-example/sub2/SomeOtherConcreteClass.scala b/examples/multi-standalone-example/sub2/SomeOtherConcreteClass.scala index 56b0aa3..56b0aa3 100644 --- a/examples/multi-project-example/sub2/SomeOtherConcreteClass.scala +++ b/examples/multi-standalone-example/sub2/SomeOtherConcreteClass.scala diff --git a/examples/multi-project-example/sub2/build/build.scala b/examples/multi-standalone-example/sub2/build/build.scala index 2c39a54..2c39a54 100644 --- a/examples/multi-project-example/sub2/build/build.scala +++ b/examples/multi-standalone-example/sub2/build/build.scala diff --git a/examples/multi-project-example/sub2/build/build/build.scala b/examples/multi-standalone-example/sub2/build/build/build.scala index efeeb77..efeeb77 100644 --- a/examples/multi-project-example/sub2/build/build/build.scala +++ b/examples/multi-standalone-example/sub2/build/build/build.scala |