From d63942fe1a8dadc0cd8ef041d073539bc2b381c7 Mon Sep 17 00:00:00 2001 From: michelou Date: Mon, 18 Jun 2007 15:49:07 +0000 Subject: renamed scala?.net.bat to scala?-net.bat --- src/mono/bin/scala-net.bat | 81 +++++++++++++++++++++++++++++++ src/mono/bin/scala.net.bat | 81 ------------------------------- src/mono/bin/scalac-net.bat | 116 ++++++++++++++++++++++++++++++++++++++++++++ src/mono/bin/scalac.net.bat | 116 -------------------------------------------- 4 files changed, 197 insertions(+), 197 deletions(-) create mode 100755 src/mono/bin/scala-net.bat delete mode 100755 src/mono/bin/scala.net.bat create mode 100755 src/mono/bin/scalac-net.bat delete mode 100755 src/mono/bin/scalac.net.bat (limited to 'src/mono') diff --git a/src/mono/bin/scala-net.bat b/src/mono/bin/scala-net.bat new file mode 100755 index 0000000000..8018f1cb1e --- /dev/null +++ b/src/mono/bin/scala-net.bat @@ -0,0 +1,81 @@ +@echo off + +rem ########################################################################## +rem # @NAME@ @VERSION@ +rem ########################################################################## +rem # @COPYRIGHT@ +rem # +rem # This is free software; see the distribution for copying conditions. +rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +rem # PARTICULAR PURPOSE. +rem ########################################################################## + +rem We adopt the following conventions: +rem - System/user environment variables start with a letter +rem - Local batch variables start with an underscore ('_') + +if "%OS%"=="Windows_NT" ( + @setlocal + call :set_home + set _ARGS=%* +) else ( + set _SCALA_HOME=%SCALA_HOME% + rem The following line tests SCALA_HOME instead of _SCALA_HOME, because + rem the above change to _SCALA_HOME is not visible within this block. + if "%SCALA_HOME%"=="" goto error1 + call :set_args +) + +rem We use the value of the MONO environment variable if defined +set _MONO=%MONO% +if "%_MONO%"=="" ( + if exist "%MONO_HOME%" ( + set _MONO=%MONO_HOME%\bin\mono.exe + ) else ( + call :find_mono mono.exe + ) +) + +set _MSIL_LIBPATH=%_SCALA_HOME%\lib +if not "%MONO_PATH%"=="" ( + set _MSIL_LIBPATH=%_MSIL_LIBPATH%;%MONO_PATH% +) + +set MONO_PATH=%_MSIL_LIBPATH% +%_MONO% %_ARGS% +goto end + +rem ########################################################################## +rem # subroutines + +rem Variable "%~dps0" works on WinXP SP2 or newer +rem (see http://support.microsoft.com/?kbid=833431) +rem set _SCALA_HOME=%~dps0.. +:set_home + set _BIN_DIR= + for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi + set _SCALA_HOME=%_BIN_DIR%.. +goto :eof + +:find_mono + set _MONO=%~$PATH:1 +goto :eof + +:set_args + set _ARGS= + :loop + rem Argument %1 may contain quotes so we use parentheses here + if (%1)==() goto :eof + set _ARGS=%_ARGS% %1 + shift + goto loop + +rem ########################################################################## +rem # errors + +:error1 +echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. +goto end + +:end +if "%OS%"=="Windows_NT" @endlocal diff --git a/src/mono/bin/scala.net.bat b/src/mono/bin/scala.net.bat deleted file mode 100755 index 8018f1cb1e..0000000000 --- a/src/mono/bin/scala.net.bat +++ /dev/null @@ -1,81 +0,0 @@ -@echo off - -rem ########################################################################## -rem # @NAME@ @VERSION@ -rem ########################################################################## -rem # @COPYRIGHT@ -rem # -rem # This is free software; see the distribution for copying conditions. -rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -rem # PARTICULAR PURPOSE. -rem ########################################################################## - -rem We adopt the following conventions: -rem - System/user environment variables start with a letter -rem - Local batch variables start with an underscore ('_') - -if "%OS%"=="Windows_NT" ( - @setlocal - call :set_home - set _ARGS=%* -) else ( - set _SCALA_HOME=%SCALA_HOME% - rem The following line tests SCALA_HOME instead of _SCALA_HOME, because - rem the above change to _SCALA_HOME is not visible within this block. - if "%SCALA_HOME%"=="" goto error1 - call :set_args -) - -rem We use the value of the MONO environment variable if defined -set _MONO=%MONO% -if "%_MONO%"=="" ( - if exist "%MONO_HOME%" ( - set _MONO=%MONO_HOME%\bin\mono.exe - ) else ( - call :find_mono mono.exe - ) -) - -set _MSIL_LIBPATH=%_SCALA_HOME%\lib -if not "%MONO_PATH%"=="" ( - set _MSIL_LIBPATH=%_MSIL_LIBPATH%;%MONO_PATH% -) - -set MONO_PATH=%_MSIL_LIBPATH% -%_MONO% %_ARGS% -goto end - -rem ########################################################################## -rem # subroutines - -rem Variable "%~dps0" works on WinXP SP2 or newer -rem (see http://support.microsoft.com/?kbid=833431) -rem set _SCALA_HOME=%~dps0.. -:set_home - set _BIN_DIR= - for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi - set _SCALA_HOME=%_BIN_DIR%.. -goto :eof - -:find_mono - set _MONO=%~$PATH:1 -goto :eof - -:set_args - set _ARGS= - :loop - rem Argument %1 may contain quotes so we use parentheses here - if (%1)==() goto :eof - set _ARGS=%_ARGS% %1 - shift - goto loop - -rem ########################################################################## -rem # errors - -:error1 -echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. -goto end - -:end -if "%OS%"=="Windows_NT" @endlocal diff --git a/src/mono/bin/scalac-net.bat b/src/mono/bin/scalac-net.bat new file mode 100755 index 0000000000..5f15553964 --- /dev/null +++ b/src/mono/bin/scalac-net.bat @@ -0,0 +1,116 @@ +@echo off + +rem ########################################################################## +rem # @NAME@ @VERSION@ +rem ########################################################################## +rem # @COPYRIGHT@ +rem # +rem # This is free software; see the distribution for copying conditions. +rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A +rem # PARTICULAR PURPOSE. +rem ########################################################################## + +rem We adopt the following conventions: +rem - System/user environment variables start with a letter +rem - Local batch variables start with an underscore ('_') + +if "%OS%"=="Windows_NT" ( + @setlocal + call :set_home + set _ARGS=%* +) else ( + set _SCALA_HOME=%SCALA_HOME% + rem The following line tests SCALA_HOME instead of _SCALA_HOME, because + rem the above change to _SCALA_HOME is not visible within this block. + if "%SCALA_HOME%"=="" goto error1 + call :set_args +) + +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=-Xmx256M -Xms16M + +rem We use the value of the ILASM environment variable if defined +set _ILASM=%ILASM% +if "%_ILASM%"=="" ( + if exist "%MONO_HOME%" ( + set _ILASM=%MONO_HOME%\bin\ilasm.bat + ) else ( + call :find_ilasm ilasm.bat + ) +) + +set _EXTENSION_CLASSPATH= +if "%_EXTENSION_CLASSPATH%"=="" ( + for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" + if "%OS%"=="Windows_NT" ( + for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" + ) +) + +set _BOOT_CLASSPATH= +if "%_BOOT_CLASSPATH%"=="" ( + if exist "%_SCALA_HOME%\lib\scala-library.jar" ( + set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\scala-library.jar + ) + if exist "%_SCALA_HOME%\lib\library" ( + set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\library + ) +) + +set _MSIL_LIBPATH=%_SCALA_HOME%\lib\predef.dll;%_SCALA_HOME%\lib\scalaruntime.dll;%_SCALA_HOME%\lib\mscorlib.dll +if not "%MONO_PATH%"=="" ( + set _MSIL_LIBPATH=%_MSIL_LIBPATH%;%MONO_PATH% +) + +set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.classpath="%CLASSPATH%" -Dmsil.libpath="%_MSIL_LIBPATH%" -Dmsil.ilasm="%_ILASM%" + +%_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.nsc.Main -target:msil %_ARGS% +goto end + +rem ########################################################################## +rem # subroutines + +:add_cpath + if "%_EXTENSION_CLASSPATH%"=="" ( + set _EXTENSION_CLASSPATH=%~1 + ) else ( + set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1 + ) +goto :eof + +rem Variable "%~dps0" works on WinXP SP2 or newer +rem (see http://support.microsoft.com/?kbid=833431) +rem set _SCALA_HOME=%~dps0.. +:set_home + set _BIN_DIR= + for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi + set _SCALA_HOME=%_BIN_DIR%.. +goto :eof + +:find_ilasm + set _ILASM=%~$PATH:1 +goto :eof + +:set_args + set _ARGS= + :loop + rem Argument %1 may contain quotes so we use parentheses here + if (%1)==() goto :eof + set _ARGS=%_ARGS% %1 + shift + goto loop + +rem ########################################################################## +rem # errors + +:error1 +echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. +goto end + +:end +if "%OS%"=="Windows_NT" @endlocal diff --git a/src/mono/bin/scalac.net.bat b/src/mono/bin/scalac.net.bat deleted file mode 100755 index 5f15553964..0000000000 --- a/src/mono/bin/scalac.net.bat +++ /dev/null @@ -1,116 +0,0 @@ -@echo off - -rem ########################################################################## -rem # @NAME@ @VERSION@ -rem ########################################################################## -rem # @COPYRIGHT@ -rem # -rem # This is free software; see the distribution for copying conditions. -rem # There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A -rem # PARTICULAR PURPOSE. -rem ########################################################################## - -rem We adopt the following conventions: -rem - System/user environment variables start with a letter -rem - Local batch variables start with an underscore ('_') - -if "%OS%"=="Windows_NT" ( - @setlocal - call :set_home - set _ARGS=%* -) else ( - set _SCALA_HOME=%SCALA_HOME% - rem The following line tests SCALA_HOME instead of _SCALA_HOME, because - rem the above change to _SCALA_HOME is not visible within this block. - if "%SCALA_HOME%"=="" goto error1 - call :set_args -) - -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=-Xmx256M -Xms16M - -rem We use the value of the ILASM environment variable if defined -set _ILASM=%ILASM% -if "%_ILASM%"=="" ( - if exist "%MONO_HOME%" ( - set _ILASM=%MONO_HOME%\bin\ilasm.bat - ) else ( - call :find_ilasm ilasm.bat - ) -) - -set _EXTENSION_CLASSPATH= -if "%_EXTENSION_CLASSPATH%"=="" ( - for %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" - if "%OS%"=="Windows_NT" ( - for /d %%f in ("%_SCALA_HOME%\lib\*") do call :add_cpath "%%f" - ) -) - -set _BOOT_CLASSPATH= -if "%_BOOT_CLASSPATH%"=="" ( - if exist "%_SCALA_HOME%\lib\scala-library.jar" ( - set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\scala-library.jar - ) - if exist "%_SCALA_HOME%\lib\library" ( - set _BOOT_CLASSPATH=%_SCALA_HOME%\lib\library - ) -) - -set _MSIL_LIBPATH=%_SCALA_HOME%\lib\predef.dll;%_SCALA_HOME%\lib\scalaruntime.dll;%_SCALA_HOME%\lib\mscorlib.dll -if not "%MONO_PATH%"=="" ( - set _MSIL_LIBPATH=%_MSIL_LIBPATH%;%MONO_PATH% -) - -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Denv.classpath="%CLASSPATH%" -Dmsil.libpath="%_MSIL_LIBPATH%" -Dmsil.ilasm="%_ILASM%" - -%_JAVACMD% -Xbootclasspath/a:"%_BOOT_CLASSPATH%" %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.nsc.Main -target:msil %_ARGS% -goto end - -rem ########################################################################## -rem # subroutines - -:add_cpath - if "%_EXTENSION_CLASSPATH%"=="" ( - set _EXTENSION_CLASSPATH=%~1 - ) else ( - set _EXTENSION_CLASSPATH=%_EXTENSION_CLASSPATH%;%~1 - ) -goto :eof - -rem Variable "%~dps0" works on WinXP SP2 or newer -rem (see http://support.microsoft.com/?kbid=833431) -rem set _SCALA_HOME=%~dps0.. -:set_home - set _BIN_DIR= - for %%i in (%~sf0) do set _BIN_DIR=%_BIN_DIR%%%~dpsi - set _SCALA_HOME=%_BIN_DIR%.. -goto :eof - -:find_ilasm - set _ILASM=%~$PATH:1 -goto :eof - -:set_args - set _ARGS= - :loop - rem Argument %1 may contain quotes so we use parentheses here - if (%1)==() goto :eof - set _ARGS=%_ARGS% %1 - shift - goto loop - -rem ########################################################################## -rem # errors - -:error1 -echo ERROR: environment variable SCALA_HOME is undefined. It should point to your installation directory. -goto end - -:end -if "%OS%"=="Windows_NT" @endlocal -- cgit v1.2.3