From 14efd3d908f3df3897a52d3ac13452da3f761736 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Sun, 6 Aug 2017 14:38:37 +0300 Subject: Get rid of compiling cbt sources to jars --- examples/export-build-information/expected.xml | 327 +++++-------------------- stage2/plugins/ExportBuildInformation.scala | 56 ++--- 2 files changed, 77 insertions(+), 306 deletions(-) diff --git a/examples/export-build-information/expected.xml b/examples/export-build-information/expected.xml index 8116298..6c49bca 100644 --- a/examples/export-build-information/expected.xml +++ b/examples/export-build-information/expected.xml @@ -1,302 +1,93 @@ - - - - + + + CBT_HOME/examples/export-build-information/build/build - - - + org.scala-lang:scala-library:2.11.8 + - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jar - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jar - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar - CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jar - CBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jar + CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jarCBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jarCBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jarCBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jarCBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jarCBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jarCBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jarCBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jar - - + + CBT_HOME/examples/export-build-information/build - - - + - org.scala-lang:scala-library:2.11.8 - org.scala-lang.modules:scala-xml_2.11:1.0.6 + org.scala-lang:scala-library:2.11.8org.scala-lang.modules:scala-xml_2.11:1.0.6 + - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jar - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jar - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar - CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jar - CBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jar + CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jarCBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jarCBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jarCBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jarCBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jarCBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jarCBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jarCBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jar build-build - - + CBT_HOME/examples/export-build-information - - - + org.scala-lang:scala-library:2.11.8 + CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar build - - - - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar - - - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar - - - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar - - - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jar - - - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.6/scala-library-2.11.6.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4-sources.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.6/scala-library-2.11.6-sources.jar - - - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6-sources.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar - - - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8-sources.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar - - - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0-sources.jar - - - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-sources.jar - - - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6-sources.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jar - - - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jar - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-sources.jar - - - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53-sources.jar - - - CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8-sources.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4-sources.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4-sources.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8-sources.jar - - - CBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0-sources.jar - CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0-sources.jar - - - CBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jar - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jar - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jar - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jar - CBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r-sources.jar - CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar - CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jar - CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-sources.jar - CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6-sources.jar - CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-sources.jar - CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53-sources.jar - - - - - CBT_HOME/libraries/process/target/scala-2.11/process_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/process/build - CBT_HOME/libraries/process/build/build - - - CBT_HOME/libraries/eval/target/scala-2.11/eval_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/eval/build - - - CBT_HOME/libraries/interfaces/target/scala-2.11/interfaces_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/interfaces/build - - - CBT_HOME/libraries/common-0/target/scala-2.11/common-0_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/common-0/build - CBT_HOME/libraries/common-0/build/build - - - CBT_HOME/libraries/common-1/target/scala-2.11/common-1_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/common-1/build - CBT_HOME/libraries/common-1/build/build - - - CBT_HOME/libraries/file/target/scala-2.11/file_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/file/build - CBT_HOME/libraries/file/build/build - - - CBT_HOME/libraries/reflect/target/scala-2.11/reflect_2.11-0.9-SNAPSHOT.jar - CBT_HOME/libraries/reflect/build - CBT_HOME/libraries/reflect/build/build - - - CBT_HOME/target/scala-2.11/cbt_2.11-0.9-SNAPSHOT.jar - CBT_HOME/internal - CBT_HOME/coursier - CBT_HOME/compatibility - CBT_HOME/build - CBT_HOME/nailgun_launcher - CBT_HOME/doc - CBT_HOME/tools - CBT_HOME/stage1 - CBT_HOME/realpath - CBT_HOME/plugins - CBT_HOME/ports - CBT_HOME/stage2 - CBT_HOME/shell-integration - CBT_HOME/internal/plugins - CBT_HOME/internal/plugins/shared - CBT_HOME/internal/plugins/library - CBT_HOME/internal/plugins/shared/build - CBT_HOME/internal/plugins/library/build - CBT_HOME/build/build - CBT_HOME/doc/cbt-developer - CBT_HOME/tools/giter8 - CBT_HOME/tools/gui - CBT_HOME/tools/giter8/build - CBT_HOME/tools/giter8/build/build - CBT_HOME/tools/gui/src - CBT_HOME/tools/gui/build - CBT_HOME/tools/gui/resources - CBT_HOME/tools/gui/resources/web - CBT_HOME/tools/gui/resources/template-project - CBT_HOME/tools/gui/resources/web/highlight - CBT_HOME/tools/gui/resources/template-project/src - CBT_HOME/tools/gui/resources/template-project/build - CBT_HOME/tools/gui/resources/template-project/src/main - CBT_HOME/tools/gui/resources/template-project/src/main/scala - CBT_HOME/tools/gui/resources/template-project/build/build - CBT_HOME/plugins/sonatype-release - CBT_HOME/plugins/wartremover - CBT_HOME/plugins/scalastyle - CBT_HOME/plugins/scalajs - CBT_HOME/plugins/scalafix - CBT_HOME/plugins/uber-jar - CBT_HOME/plugins/sbt_layout - CBT_HOME/plugins/scalapb - CBT_HOME/plugins/google-java-format - CBT_HOME/plugins/proguard - CBT_HOME/plugins/scalariform - CBT_HOME/plugins/scalafmt - CBT_HOME/plugins/scalafix-compiler-plugin - CBT_HOME/plugins/sonatype-release/src - CBT_HOME/plugins/sonatype-release/build - CBT_HOME/plugins/sonatype-release/src/sonatype - CBT_HOME/plugins/wartremover/build - CBT_HOME/plugins/scalastyle/build - CBT_HOME/plugins/scalastyle/resources - CBT_HOME/plugins/scalajs/build - CBT_HOME/plugins/scalafix/build - CBT_HOME/plugins/uber-jar/src - CBT_HOME/plugins/uber-jar/build - CBT_HOME/plugins/sbt_layout/build - CBT_HOME/plugins/scalapb/build - CBT_HOME/plugins/scalapb/src_generated - CBT_HOME/plugins/google-java-format/build - CBT_HOME/plugins/proguard/build - CBT_HOME/plugins/scalariform/build - CBT_HOME/plugins/scalafmt/build - CBT_HOME/plugins/scalafix-compiler-plugin/build - CBT_HOME/ports/migration-manager - CBT_HOME/ports/scala-xray - CBT_HOME/ports/scalariform - CBT_HOME/ports/migration-manager/build - CBT_HOME/ports/scala-xray/build - CBT_HOME/ports/scalariform/build - CBT_HOME/stage2/plugins - - - - - CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4.jar - CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar + + + + CBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar + + CBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jar + + CBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jar + + CBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jar + + CBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.6/scala-library-2.11.6.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4-sources.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.6/scala-library-2.11.6-sources.jar + + CBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.6/scala-xml_2.11-1.0.6-sources.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar + + CBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8-sources.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jar + + CBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jarCBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0-sources.jar + + CBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jarCBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-sources.jar + + CBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6-sources.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jar + + CBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jarCBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-sources.jar + + CBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jarCBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53-sources.jar + + CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8-sources.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8-sources.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4-sources.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4-sources.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8-sources.jar + + CBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0.jarCBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0.jarCBT_HOME/cache/maven/net/java/dev/jna/jna-platform/4.4.0/jna-platform-4.4.0-sources.jarCBT_HOME/cache/maven/net/java/dev/jna/jna/4.4.0/jna-4.4.0-sources.jar + + CBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3.jarCBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6.jarCBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jarCBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53.jarCBT_HOME/cache/maven/org/eclipse/jgit/org.eclipse.jgit/4.2.0.201601211800-r/org.eclipse.jgit-4.2.0.201601211800-r-sources.jarCBT_HOME/cache/maven/commons-codec/commons-codec/1.6/commons-codec-1.6-sources.jarCBT_HOME/cache/maven/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3-sources.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpcore/4.3.3/httpcore-4.3.3-sources.jarCBT_HOME/cache/maven/org/slf4j/slf4j-api/1.7.2/slf4j-api-1.7.2-sources.jarCBT_HOME/cache/maven/org/apache/httpcomponents/httpclient/4.3.6/httpclient-4.3.6-sources.jarCBT_HOME/cache/maven/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-sources.jarCBT_HOME/cache/maven/com/jcraft/jsch/0.1.53/jsch-0.1.53-sources.jar + + + + + CBT_HOME/target/scala-2.11/classesCBT_HOME/stage1/target/scala-2.11/classesCBT_HOME/stage2/target/scala-2.11/classesCBT_HOME/compatibility/target/scala-2.11/classesCBT_HOME/libraries/common-0/target/scala-2.11/classesCBT_HOME/libraries/common-1/target/scala-2.11/classesCBT_HOME/libraries/file/target/scala-2.11/classesCBT_HOME/libraries/process/target/scala-2.11/classesCBT_HOME/plugins/sonatype-release/target/scala-2.11/classesCBT_HOME/stage1CBT_HOME/stage2CBT_HOME/compatibilityCBT_HOME/libraries/common-0CBT_HOME/libraries/common-1CBT_HOME/libraries/fileCBT_HOME/libraries/processCBT_HOME/nailgun_launcher/processCBT_HOME/plugins/sonatype-release + + + + + CBT_HOME/cache/maven/org/scala-lang/scala-compiler/2.11.8/scala-compiler-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/scala-library/2.11.8/scala-library-2.11.8.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-parser-combinators_2.11/1.0.4/scala-parser-combinators_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/modules/scala-xml_2.11/1.0.4/scala-xml_2.11-1.0.4.jarCBT_HOME/cache/maven/org/scala-lang/scala-reflect/2.11.8/scala-reflect-2.11.8.jar - - \ No newline at end of file + + \ No newline at end of file diff --git a/stage2/plugins/ExportBuildInformation.scala b/stage2/plugins/ExportBuildInformation.scala index 29c17f1..6ce43f9 100644 --- a/stage2/plugins/ExportBuildInformation.scala +++ b/stage2/plugins/ExportBuildInformation.scala @@ -111,20 +111,6 @@ object BuildInformation { ) } - - private def convertCbtLibraries = { - val cbtBuild = - DirectoryDependency(rootBuild.context.cbtHome)(rootBuild.context).dependenciesArray.head.asInstanceOf[BaseBuild] - transitiveBuilds(Seq((cbtBuild, ModuleType.Default)), skipTests = true) - .map(_._1) - .collect { - case d: BoundMavenDependency => d.jar - case d: PackageJars => d.jar.get - } - .map(exportLibrary) - .distinct - } - private def collectDependencies(dependencies: Seq[Dependency]): Seq[ModuleDependency] = dependencies .collect { @@ -233,32 +219,26 @@ object BuildInformation { Library(name, binaryJars ++ sourceJars) } - def recursiveListFiles(f: File): Seq[File] = { - val ignoredDirs = - Seq("cache", - "target", - "examples", - "test", - "libraries", - ".git", - ".circleci", - "_site" + private def convertCbtLibraries = { + val cbtHome = rootBuild.context.cbtHome + val cbtSourceDirs = //TODO add sth else here ?? + Seq(cbtHome / "stage1", + cbtHome / "stage2", + cbtHome / "compatibility", + cbtHome / "libraries" / "common-0", + cbtHome / "libraries" / "common-1", + cbtHome / "libraries" / "file", + cbtHome / "libraries" / "process", + cbtHome / "nailgun_launcher" / "process", + cbtHome / "plugins" / "sonatype-release" ) - val files = f.listFiles - .filter(_.isDirectory) - .filterNot(f => ignoredDirs.contains(f.getName)) - files ++ - files - .flatMap(recursiveListFiles) - } - - private def exportLibrary(file: File) = { - val name = "CBT:" + file.getName.stripSuffix(".jar") - val binaryJar = LibraryJar(file, JarType.Binary) - val sourceJars = - recursiveListFiles(file.getParentFile.getParentFile.getParentFile) + val sourceJars = cbtSourceDirs .map(LibraryJar(_, JarType.Source)) - Library(name, binaryJar +: sourceJars) + val binaryJars = (cbtHome +: cbtSourceDirs) + .map(_ / "target" / "scala-2.11" / "classes") + .filter(_.exists) + .map(LibraryJar(_, JarType.Binary)) + Seq(Library("CBT", binaryJars ++ sourceJars)) } private def parentBuild(build: BaseBuild): Seq[BaseBuild] = -- cgit v1.2.3