From af11aa2c0f7d12b6eeb5ac4a22389194a13997c2 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Wed, 1 Jun 2016 21:47:00 -0400 Subject: pass command line arguments through to cbt tools scala and cbt tools amm --- stage2/ToolsTasks.scala | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'stage2/ToolsTasks.scala') diff --git a/stage2/ToolsTasks.scala b/stage2/ToolsTasks.scala index e8a3a20..df33b5d 100644 --- a/stage2/ToolsTasks.scala +++ b/stage2/ToolsTasks.scala @@ -38,21 +38,22 @@ class ToolsTasks( def amm = ammonite def ammonite = { val version = args.lift(1).getOrElse(constants.scalaVersion) - val d = Resolver(mavenCentral).bindOne( + val classLoader = Resolver(mavenCentral).bindOne( MavenDependency( "com.lihaoyi","ammonite-repl_2.11.8",args.lift(1).getOrElse("0.5.8") ) - ) + ).classLoader(classLoaderCache) // FIXME: this does not work quite yet, throws NoSuchFileException: /ammonite/repl/frontend/ReplBridge$.class lib.runMain( - "ammonite.repl.Main", Seq(), d.classLoader(classLoaderCache) + "ammonite.repl.Main", args.drop(2), classLoader ) } def scala = { val version = args.lift(1).getOrElse(constants.scalaVersion) val scalac = new ScalaCompilerDependency( cbtHasChanged, mavenCache, version ) + val _args = Seq("-cp", scalac.classpath.string) ++ args.drop(2) lib.runMain( - "scala.tools.nsc.MainGenericRunner", Seq("-cp", scalac.classpath.string), scalac.classLoader(classLoaderCache) + "scala.tools.nsc.MainGenericRunner", _args, scalac.classLoader(classLoaderCache) ) } def cbtEarlyDependencies = { -- cgit v1.2.3