diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-14 17:28:37 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-14 17:28:37 -0700 |
| commit | 492624d729730d594097aa618f8f1e34caa79639 (patch) | |
| tree | b836ed4a8841d59e7e83cdafa52a5f20535420fd | |
| parent | dfa324ce8f29833fe4c5409557ac4a45ef9e464d (diff) | |
| parent | ba1dab68c8ab1088daed7587a988ef06a1e07b45 (diff) | |
| download | scala-492624d729730d594097aa618f8f1e34caa79639.tar.gz scala-492624d729730d594097aa618f8f1e34caa79639.tar.bz2 scala-492624d729730d594097aa618f8f1e34caa79639.zip | |
Merge pull request #3630 from adriaanm/t8368
SI-8368 respect user-supplied scala.usejavacp
| -rwxr-xr-x[-rw-r--r--] | src/compiler/scala/tools/ant/templates/tool-unix.tmpl | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl index d6dc167dd8..f58223a39e 100644..100755 --- a/src/compiler/scala/tools/ant/templates/tool-unix.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-unix.tmpl @@ -156,7 +156,7 @@ while [[ $# -gt 0 ]]; do java_args=("${java_args[@@]}" "$1") scala_args=("${scala_args[@@]}" "$1") # respect user-supplied -Dscala.usejavacp - case "$1" in -Dscala.usejavacp) OVERRIDE_USEJAVACP="";; esac + case "$1" in -Dscala.usejavacp*) OVERRIDE_USEJAVACP="";; esac shift ;; -J*) diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 9a2deb4da6..cf0e003f10 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -49,7 +49,8 @@ if "%_TEST_PARAM:~0,2%"=="-J" ( ) if "%_TEST_PARAM:~0,2%"=="-D" ( - if "%_TEST_PARAM%"=="-Dscala.usejavacp" ( + rem Only match beginning of the -D option. The relevant bit is 17 chars long. + if "%_TEST_PARAM:~0,17%"=="-Dscala.usejavacp" ( set _OVERRIDE_USEJAVACP= ) rem test if this was double-quoted property "-Dprop=42" |