diff options
| author | Lukas Rytz <lukas.rytz@typesafe.com> | 2016-06-19 13:40:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-19 13:40:11 +0200 |
| commit | aaf7bc0b948ee073934885f8240193a4ba2b3bb8 (patch) | |
| tree | 37e189bfd35440ed88f84007d03e29b8f01088b0 /project/ScalaTool.scala | |
| parent | 91b6944480a3b37f1d62a8a2ed3c332ce02a835a (diff) | |
| parent | c2c08a45a99f6ba48d8dc3b7c06d44196e50a2a2 (diff) | |
| download | scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.tar.gz scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.tar.bz2 scala-aaf7bc0b948ee073934885f8240193a4ba2b3bb8.zip | |
Merge pull request #5190 from szeiger/wip/validate-test-use-sbt
Use sbt for PR validation [ci: last-only]
Diffstat (limited to 'project/ScalaTool.scala')
| -rw-r--r-- | project/ScalaTool.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/project/ScalaTool.scala b/project/ScalaTool.scala index e9531f229e..5e3f20b1ba 100644 --- a/project/ScalaTool.scala +++ b/project/ScalaTool.scala @@ -27,12 +27,12 @@ case class ScalaTool(mainClass: String, } else classpath.mkString(":").replace('\\', '/').replaceAll(varRegex, """\${$1}""") val variables = Map( - ("@@" -> "@"), // for backwards compatibility - ("@class@" -> mainClass), - ("@properties@" -> (properties map { case (k, v) => s"""-D$k="$v""""} mkString " ")), - ("@javaflags@" -> javaOpts), - ("@toolflags@" -> toolFlags), - ("@classpath@" -> platformClasspath) + "@@" -> "@", // for backwards compatibility + "@class@" -> mainClass, + "@properties@" -> (properties map { case (k, v) => s"""-D$k="$v""""} mkString " "), + "@javaflags@" -> javaOpts, + "@toolflags@" -> toolFlags, + "@classpath@" -> platformClasspath ) val (from, to) = variables.unzip |