From 08de8afde6c99fb1739eb9730e6fce4eef54f296 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Thu, 20 Sep 2012 09:58:20 -0700 Subject: Normalized line endings. This brings all the files into line with the .gitattributes settings, which should henceforth be automatically maintained by git. --- test/partest.bat | 208 +++++++++++++++++++++++++++---------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) (limited to 'test/partest.bat') diff --git a/test/partest.bat b/test/partest.bat index 4c97a53122..b64347ce13 100755 --- a/test/partest.bat +++ b/test/partest.bat @@ -1,104 +1,104 @@ -@echo off - -rem ########################################################################## -rem # Scala code runner 2.9.1.final -rem ########################################################################## -rem # (c) 2002-2011 LAMP/EPFL -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 JAVACCMD environment variable if defined -set _JAVACCMD=%JAVACCMD% -if "%_JAVACCMD%"=="" set _JAVACCMD=javac - -rem We use the value of the JAVA_OPTS environment variable if defined -set _JAVA_OPTS=%JAVA_OPTS% -if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx1024M -Xms64M - -rem We use the value of the SCALAC_OPTS environment variable if defined -set _SCALAC_OPTS=%SCALAC_OPTS% -if "%_SCALAC_OPTS%"=="" set _SCALAC_OPTS=-deprecation - -set _EXTENSION_CLASSPATH= -if "%_EXTENSION_CLASSPATH%"=="" ( - if exist "%_SCALA_HOME%\lib\scala-partest.jar" ( - 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" - ) - ) else if exist "%_SCALA_HOME%\build\pack\lib\scala-partest.jar" ( - for %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" - if "%OS%"=="Windows_NT" ( - for /d %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" - ) - ) -) - -set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%" - -rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% -%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_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 - -: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 -exit /b %errorlevel% +@echo off + +rem ########################################################################## +rem # Scala code runner 2.9.1.final +rem ########################################################################## +rem # (c) 2002-2011 LAMP/EPFL +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 JAVACCMD environment variable if defined +set _JAVACCMD=%JAVACCMD% +if "%_JAVACCMD%"=="" set _JAVACCMD=javac + +rem We use the value of the JAVA_OPTS environment variable if defined +set _JAVA_OPTS=%JAVA_OPTS% +if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx1024M -Xms64M + +rem We use the value of the SCALAC_OPTS environment variable if defined +set _SCALAC_OPTS=%SCALAC_OPTS% +if "%_SCALAC_OPTS%"=="" set _SCALAC_OPTS=-deprecation + +set _EXTENSION_CLASSPATH= +if "%_EXTENSION_CLASSPATH%"=="" ( + if exist "%_SCALA_HOME%\lib\scala-partest.jar" ( + 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" + ) + ) else if exist "%_SCALA_HOME%\build\pack\lib\scala-partest.jar" ( + for %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" + if "%OS%"=="Windows_NT" ( + for /d %%f in ("%_SCALA_HOME%\build\pack\lib\*") do call :add_cpath "%%f" + ) + ) +) + +set _PROPS=-Dscala.home="%_SCALA_HOME%" -Dpartest.javacmd="%_JAVACMD%" -Dpartest.java_options="%_JAVA_OPTS%" -Dpartest.scalac_options="%_SCALAC_OPTS%" -Dpartest.javac_cmd="%_JAVACCMD%" + +rem echo %_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_ARGS% +%_JAVACMD% %_JAVA_OPTS% %_PROPS% -cp "%_EXTENSION_CLASSPATH%" scala.tools.partest.nest.NestRunner %_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 + +: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 +exit /b %errorlevel% -- cgit v1.2.3