diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-11 12:07:26 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2014-03-11 12:07:26 -0700 |
| commit | 34a23375c093014260ae7083399c5a8077f0acfd (patch) | |
| tree | 0baef907c140799d2325b8aa863909470be3ef06 /src | |
| parent | d95b5547e4b2e7620a52f983771fa4ca938b4470 (diff) | |
| parent | 59e8c6e2ba9ab41c7e55f6df8fee2cdae9aad349 (diff) | |
| download | scala-34a23375c093014260ae7083399c5a8077f0acfd.tar.gz scala-34a23375c093014260ae7083399c5a8077f0acfd.tar.bz2 scala-34a23375c093014260ae7083399c5a8077f0acfd.zip | |
Merge pull request #3621 from szeiger/tmp/si8368
SI-8368 respect user-supplied -Dscala.usejavacp in Windows runner
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 8441f3af23..9a2deb4da6 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -25,6 +25,10 @@ shift :notoolcp +rem SI-8358, SI-8368 -- the default should really be false, +rem but I don't want to flip the default during 2.11's RC cycle +set _OVERRIDE_USEJAVACP="-Dscala.usejavacp=true" + rem We keep in _JAVA_PARAMS all -J-prefixed and -D-prefixed arguments set _JAVA_PARAMS= @@ -45,6 +49,9 @@ if "%_TEST_PARAM:~0,2%"=="-J" ( ) if "%_TEST_PARAM:~0,2%"=="-D" ( + if "%_TEST_PARAM%"=="-Dscala.usejavacp" ( + set _OVERRIDE_USEJAVACP= + ) rem test if this was double-quoted property "-Dprop=42" for /F "delims== tokens=1-2" %%G in ("%_TEST_PARAM%") DO ( if not "%%G" == "%_TEST_PARAM%" ( @@ -126,7 +133,7 @@ if "%_TOOL_CLASSPATH%"=="" ( if not "%_LINE_TOOLCP%"=="" call :add_cpath "%_LINE_TOOLCP%" -set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@ +set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" %_OVERRIDE_USEJAVACP% @properties@ rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %* |