Merge remote-tracking branch 'origin/master' into kind-projector-plugin

4 files changed, 203 insertions, 4 deletions

diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala
index 05e3c41..0bdbad7 100644
--- a/stage2/BasicBuild.scala
+++ b/stage2/BasicBuild.scala
@@ -5,7 +5,7 @@ import java.net._
 import java.nio.file._
 
 class BasicBuild(final val context: Context) extends BaseBuild
-trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDependencyDsl{
+trait BaseBuild extends BuildInterface with DependencyImplementation with SbtDependencyDsl with ExportBuildInformation{
   override def equals(other: Any) = {
     other match {
       case b: BaseBuild => projectDirectory === b.projectDirectory
diff --git a/stage2/plugins/ExportBuildInformation.scala b/stage2/plugins/ExportBuildInformation.scala
new file mode 100644
index 0000000..0d33d75
--- /dev/null
+++ b/stage2/plugins/ExportBuildInformation.scala
@@ -0,0 +1,170 @@
+package cbt
+
+import cbt._
+import scala.xml._
+import java.io._
+
+trait ExportBuildInformation { self: BaseBuild =>
+  lazy val printer = new scala.xml.PrettyPrinter(200, 2)
+
+  def buildInfoXml = 
+    printer.format(BuildInformationSerializer.serialize(BuildInformation.Project(self)))
+}
+
+object BuildInformation {
+  case class Project(
+    name: String,
+    root: File,
+    rootModule: Module,
+    modules: Seq[Module],
+    libraries: Seq[Library]
+  )
+
+  case class Module(
+    name: String,
+    root: File,
+    sources: Seq[File],
+    target: File,
+    mavenDependencies: Seq[MavenDependency],
+    moduleDependencies: Seq[ModuleDependency],
+    classpaths: Seq[ClassPathItem],
+    parentBuild: Option[String]
+  )
+
+  case class Library( name: String, jars: Seq[File] )
+
+  case class MavenDependency( name: String )
+
+  case class ModuleDependency( name: String )
+
+  case class ClassPathItem( path: File )
+
+  object Project {
+    def apply(build: BaseBuild) =   
+     new BuildInformationExporter(build).exportBuildInformation  
+
+    private class BuildInformationExporter(rootBuild: BaseBuild) {
+      def exportBuildInformation(): Project = {
+        val rootModule = exportModule(rootBuild)
+        val modules = (rootBuild +: rootBuild.transitiveDependencies)
+          .collect { case d: BaseBuild => d +: collectParentBuilds(d)}
+          .flatten
+          .map(exportModule)
+          .distinct
+        val libraries = rootBuild.transitiveDependencies
+          .collect { case d: BoundMavenDependency => exportLibrary(d)}
+          .distinct
+       
+        Project(
+          rootModule.name,
+          rootModule.root,
+          rootModule,
+          modules,
+          libraries
+        )
+      }
+
+      private def exportLibrary(mavenDependency: BoundMavenDependency) = 
+        Library(fomatMavenDependency(mavenDependency.mavenDependency), mavenDependency.exportedJars)
+
+      private def collectParentBuilds(build: BaseBuild): Seq[BaseBuild] = 
+          build.context.parentBuild
+            .map(_.asInstanceOf[BaseBuild])
+            .map(b => b +: collectParentBuilds(b))
+            .toSeq
+            .flatten
+
+      private def exportModule(build: BaseBuild): Module = {
+        val moduleDependencies = build.dependencies
+          .collect { case d: BaseBuild => ModuleDependency(moduleName(d)) }
+        val mavenDependencies = build.dependencies
+          .collect { case d: BoundMavenDependency => MavenDependency(fomatMavenDependency(d.mavenDependency))}
+        val classpaths = build.dependencyClasspath.files
+          .filter(_.isFile)
+          .map(t => ClassPathItem(t))
+        val sources = {
+          val s = build.sources
+            .filter(s => s.exists && s.isDirectory)
+          if (s.isEmpty)
+            Seq(build.projectDirectory)
+          else
+            s
+        }
+        Module(
+          name = moduleName(build),
+          root = build.projectDirectory,
+          sources = sources,
+          target = build.target,
+          mavenDependencies = mavenDependencies,
+          moduleDependencies = moduleDependencies,
+          classpaths = classpaths,
+          parentBuild = build.context.parentBuild.map(b => moduleName(b.asInstanceOf[BaseBuild]))
+        )
+      }
+
+      private def fomatMavenDependency(dependency: cbt.MavenDependency) =
+        s"${dependency.groupId}:${dependency.artifactId}:${dependency.version}"
+
+      private def moduleName(build: BaseBuild) = 
+          if (rootBuild.projectDirectory == build.projectDirectory)
+            rootBuild.projectDirectory.getName
+          else
+            build.projectDirectory.getPath
+              .drop(rootBuild.projectDirectory.getPath.length)
+              .stripPrefix("/")
+              .replace("/", "-")
+    }
+  }
+}
+
+object BuildInformationSerializer {
+  def serialize(project: BuildInformation.Project): Node = 
+    <project>
+      <name>{project.name}</name>
+      <root>{project.root.toString}</root>
+      <rootModule>{project.rootModule.name}</rootModule>
+      <modules>
+        {project.modules.map(serialize)}
+      </modules>
+      <libraries>
+        {project.libraries.map(serialize)}
+      </libraries>
+    </project>
+
+  private def serialize(module: BuildInformation.Module): Node = 
+    <module>
+      <name>{module.name}</name>
+      <root>{module.root}</root>
+      <target>{module.target}</target>      
+      <sources>
+        {module.sources.map(s => <source>{s}</source>)}
+      </sources>
+      <mavenDependencies>
+        {module.mavenDependencies.map(serialize)}
+      </mavenDependencies>
+      <moduleDependencies>
+        {module.moduleDependencies.map(serialize)}
+      </moduleDependencies>
+      <classpaths>
+        {module.classpaths.map(serialize)}
+      </classpaths>
+      {module.parentBuild.map(p => <parentBuild>{p}</parentBuild>).getOrElse(NodeSeq.Empty)}
+    </module>
+
+  private def serialize(mavenDependency: BuildInformation.MavenDependency): Node = 
+    <mavenDependency>{mavenDependency.name}</mavenDependency>
+
+  private def serialize(library: BuildInformation.Library): Node = 
+    <library>
+      <name>{library.name}</name>
+      <jars>
+        {library.jars.map(j => <jar>{j}</jar>)}
+      </jars>
+    </library>
+
+  private def serialize(moduleDependency: BuildInformation.ModuleDependency): Node = 
+    <moduleDependency>{moduleDependency.name}</moduleDependency>
+
+  private def serialize(targetLibrary: BuildInformation.ClassPathItem): Node = 
+    <classpathItem>{targetLibrary.path.toString}</classpathItem>
+}
diff --git a/stage2/plugins/NewStyleMacros.scala b/stage2/plugins/NewStyleMacros.scala
new file mode 100644
index 0000000..42b3287
--- /dev/null
+++ b/stage2/plugins/NewStyleMacros.scala
@@ -0,0 +1,29 @@
+package cbt
+import java.io.File
+
+trait NewStyleMacros extends BaseBuild{
+  def newStyleMacrosVersion = "3.0.0-M9"
+
+  override def scalacOptions = super.scalacOptions ++ NewStyleMacros.scalacOptions(
+    NewStyleMacros.dependencies( scalaVersion, newStyleMacrosVersion, context.cbtLastModified, context.paths.mavenCache ).jar
+  )
+}
+
+object NewStyleMacros{
+  def dependencies(
+    scalaVersion: String, newStyleMacrosVersion: String, cbtLastModified: Long, mavenCache: java.io.File
+  )(
+    implicit logger: Logger, transientCache: java.util.Map[AnyRef,AnyRef], classLoaderCache: ClassLoaderCache
+  ) =
+    MavenResolver( cbtLastModified, mavenCache, mavenCentral ).bindOne(
+      MavenDependency( "org.scalameta", "paradise_"+scalaVersion, newStyleMacrosVersion )
+    )
+
+  def scalacOptions( jarPath: File ) =
+    Seq(
+      "-Xplugin:" ++ jarPath.string,
+      "-Yrangepos",
+      "-Xplugin-require:macroparadise"
+    )
+}
+
diff --git a/stage2/plugins/ScalaParadise.scala b/stage2/plugins/OldStyleMacros.scala
index 28ee934..42719ea 100644
--- a/stage2/plugins/ScalaParadise.scala
+++ b/stage2/plugins/OldStyleMacros.scala
@@ -1,10 +1,10 @@
 package cbt
-trait ScalaParadise extends BaseBuild{
-  def scalaParadiseVersion = "2.1.0"
+trait OldStyleMacros extends BaseBuild{
+  def oldStyleMacrosVersion = "2.1.0"
 
   private def scalaParadiseDependency =
     Resolver( mavenCentral ).bindOne(
-      "org.scalamacros" % ("paradise_" ++ scalaVersion) % scalaParadiseVersion
+      "org.scalamacros" % ("paradise_" ++ scalaVersion) % oldStyleMacrosVersion
     )
 
   override def dependencies = (