From 46a32e94ffb7c95700b61cb09bc105321daf6c05 Mon Sep 17 00:00:00 2001 From: michelou Date: Wed, 18 Apr 2007 13:29:03 +0000 Subject: added JAVA_OPTS to Windows batch fileadded JAVA... added JAVA_OPTS to Windows batch fileadded JAVA_OPTS to Windows batch filess --- src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 11b9a3ae3c..48b5161f34 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -28,6 +28,10 @@ rem We use the value of the JAVACMD environment variable if defined set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" set _JAVACMD=java +rem We use the value of the JAVA_OPTS environment variable if defined +set _JAVA_OPTS=%JAVA_OPTS% +if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=@javaflags@ + set _EXTENSION_CLASSPATH=@extclasspath@ if "%_EXTENSION_CLASSPATH%"=="" ( for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" @@ -57,8 +61,8 @@ goto loop :exec set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.classpath="%CLASSPATH%" @properties@ -rem echo %_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" @javaflags@ %_PROPS% -cp "%_EXTENSION_CLASSPATH%" @class@ @toolflags@ %_ARGS% -%_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" @javaflags@ %_PROPS% -cp "%_EXTENSION_CLASSPATH%" @class@ @toolflags@ %_ARGS% +rem echo %_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" @class@ @toolflags@ %_ARGS% +%_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" @class@ @toolflags@ %_ARGS% goto end rem ########################################################################## -- cgit v1.2.3