From ca56236260f2bf801dedca434b61380463d9e038 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 15 Feb 2017 22:02:01 -0500 Subject: the word class was duplicated since .show changed --- stage2/Lib.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stage2/Lib.scala') diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 9e1f824..1ecc99e 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -139,7 +139,7 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ ( ( if( thisTasks.nonEmpty ){ - s"""Methods provided by Build ${show} + s"""Methods provided by ${show} ${thisTasks.mkString(" ")} -- cgit v1.2.3 From 2f2035682a942814a4a3e34dc4e61c34d00c1fa7 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 15 Feb 2017 22:02:09 -0500 Subject: top-level instead of anonymous classes to allow these to work with the dynamic configuration features .copy and DynamicOverride --- stage2/BuildBuild.scala | 2 ++ stage2/Lib.scala | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'stage2/Lib.scala') diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index 9ac631f..d97e186 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -2,6 +2,8 @@ package cbt import java.nio.file._ import java.io.File +class ConcreteBuildBuild(val context: Context) extends BuildBuild +class ConcreteBuildBuildWithoutEssentials(val context: Context) extends BuildBuildWithoutEssentials trait BuildBuild extends BuildBuildWithoutEssentials{ override def dependencies = super.dependencies :+ plugins.essentials diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 1ecc99e..7adb33e 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -47,9 +47,9 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ || directory == (context.cbtHome ++ "/libraries/eval") || directory == (context.cbtHome ++ "/plugins/scalatest") ) - new cbt.BasicBuild( context.copy( workingDirectory = start ) ) with BuildBuildWithoutEssentials + new cbt.ConcreteBuildBuildWithoutEssentials( context.copy( workingDirectory = start ) ) else - new cbt.BasicBuild( context.copy( workingDirectory = start ) ) with BuildBuild + new cbt.ConcreteBuildBuild( context.copy( workingDirectory = start ) ) } catch { case e:ClassNotFoundException if e.getMessage == buildClassName => throw new Exception(s"no class ${buildClassName} found in " ++ start.string) -- cgit v1.2.3