diff options
| author | michelou <michelou@epfl.ch> | 2006-03-22 12:04:11 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2006-03-22 12:04:11 +0000 |
| commit | 36e6a5a203cb7bd5c107ebe0bd14c5fe8d887109 (patch) | |
| tree | 45ce0bd89397a419493f35a8cd334a1d1c9faf1f /src | |
| parent | 887bf2afd5e1070c2d3c782c8686e9d86e40b90b (diff) | |
| download | scala-36e6a5a203cb7bd5c107ebe0bd14c5fe8d887109.tar.gz scala-36e6a5a203cb7bd5c107ebe0bd14c5fe8d887109.tar.bz2 scala-36e6a5a203cb7bd5c107ebe0bd14c5fe8d887109.zip | |
removed unsubstituted properties in Windows tem...
removed unsubstituted properties in Windows template files
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/generic-windows.tmpl | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/ant/templates/tool-windows.tmpl | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl index bc8a8dbb4d..b96a8045f0 100644 --- a/src/compiler/scala/tools/ant/templates/generic-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/generic-windows.tmpl @@ -54,7 +54,7 @@ shift goto :loop :exec -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.class.path="%_USER_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" @properties@ +set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.class.path="%_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" @properties@ set _CLASSPATH=%_USER_CLASSPATH%;%_CLASSPATH% rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp %_CLASSPATH% %_ARGS% diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl index 40009d4c29..280f7a5bbb 100644 --- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl +++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl @@ -25,13 +25,13 @@ set _JAVACMD=%JAVACMD% if "%_JAVACMD%"=="" set _JAVACMD=java set _EXTENSION_CLASSPATH=@extclasspath@ -set _BOOT_CLASSPATH=@bootclasspath@ +set _BOOT_CLASSPATH= rem We use the value of the CLASSPATH environment variable if defined set _USER_CLASSPATH=%CLASSPATH% if "%_USER_CLASSPATH%"=="" set _USER_CLASSPATH=. -set _CLASSPATH=@classpath@ +set _CLASSPATH= if not "%_CLASSPATH%"=="" goto args for %%f in ("%_SCALA_HOME%\lib\*.jar") do call :add_cpath "%%f" @@ -56,9 +56,9 @@ goto :loop :exec set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dscala.boot.class.path="%_BOOT_CLASSPATH%" -Dscala.ext.path="%_EXTENSION_CLASSPATH%" -Denv.classpath="%CLASSPATH%" -Dscala.tool.name="@name@" -Dscala.tool.version="@version@" @properties@ -set _CLASSPATH=%_USER_CLASSPATH%;%_CLASSPATH% -rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ %_ARGS% -%_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ %_ARGS% +rem set _CLASSPATH=%_USER_CLASSPATH%;%_CLASSPATH% +rem echo %_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ -classpath %_USER_CLASSPATH% %_ARGS% +%_JAVACMD% @javaflags@ %_PROPS% -cp "%_CLASSPATH%" @class@ @toolflags@ -classpath %_USER_CLASSPATH% %_ARGS% goto end :version |