Merge branch '2.10.x'

* 2.10.x: (36 commits)
  Normalized line endings.
  New .gitattributes file.
  Disabled failing build manager tests.
  New test case for SI-6337
  New test case for closing SI-6385
  Value classes: eliminated half-boxing
  Cleanup of OverridingPairs
  Fixes SI-6260
  Use faster download URL now that artifactory is fixed.
  don't try to create tags w/o scala-reflect.jar
  some small remaining fixes
  SI-5943 toolboxes now autoimport Predef and scala
  Fix for loud test.
  SI-6363 deploys the updated starr
  SI-6363 removes scala.reflect.base
  SI-6392 wraps non-terms before typecheck/eval
  SI-6394 fixes macros.Context.enclosingClass
  Error message improvement for SI-6336.
  Adjustments to scala.concurrent.duration.
  prepping for the refactoring
  ...

Conflicts:
	src/actors-migration/scala/actors/Pattern.scala
	src/compiler/scala/tools/nsc/Global.scala
	src/compiler/scala/tools/nsc/transform/Erasure.scala
	src/compiler/scala/tools/nsc/typechecker/Typers.scala
	src/library/scala/collection/immutable/Vector.scala
	test/files/jvm/actmig-PinS_1.scala
	test/files/jvm/actmig-PinS_2.scala
	test/files/jvm/actmig-PinS_3.scala
	test/files/jvm/actmig-public-methods_1.scala

1 files changed, 91 insertions, 91 deletions

diff --git a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
index 3c0d1d77ca..a347df6d6e 100644
--- a/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
+++ b/src/compiler/scala/tools/ant/templates/tool-windows.tmpl
@@ -1,91 +1,91 @@
-@@echo off

-

-rem ##########################################################################

-rem # Copyright 2002-2012 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 ##########################################################################

-

-setlocal enableextensions enabledelayedexpansion

-

-set _LINE_TOOLCP=

-

-:another_param

-

-if "%1%"=="-toolcp" (

-    set _LINE_TOOLCP=%2%

-	shift

-	shift

-	goto another_param

-)

-

-set _LINE_PARAMS=%1

-:param_loop

-shift

-if [%1]==[] goto param_afterloop

-set _LINE_PARAMS=%_LINE_PARAMS% %1

-goto param_loop

-:param_afterloop

-if "%OS%" NEQ "Windows_NT" (

-  echo "Warning, your version of Windows is not supported.  Attempting to start scala anyway."

-)

-

-@@setlocal

-call :set_home

-

-rem We use the value of the JAVACMD environment variable if defined

-set _JAVACMD=%JAVACMD%

-

-if not defined _JAVACMD (

-  if not "%JAVA_HOME%"=="" (

-    if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe"

-  )

-)

-

-if "%_JAVACMD%"=="" set _JAVACMD=java

-

-rem We use the value of the JAVA_OPTS environment variable if defined

-set _JAVA_OPTS=%JAVA_OPTS%

-if not defined _JAVA_OPTS set _JAVA_OPTS=@javaflags@

-

-set _TOOL_CLASSPATH=@classpath@

-if "%_TOOL_CLASSPATH%"=="" (

-  for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"

-  for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"

-)

-

-if not "%_LINE_TOOLCP%"=="" call :add_cpath "%_LINE_TOOLCP%"

-

-set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@

-

-rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*

-"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*

-goto end

-

-rem ##########################################################################

-rem # subroutines

-

-:add_cpath

-  if "%_TOOL_CLASSPATH%"=="" (

-    set _TOOL_CLASSPATH=%~1

-  ) else (

-    set _TOOL_CLASSPATH=%_TOOL_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

-

-:end

-@@endlocal

-

-REM exit code fix, see http://stackoverflow.com/questions/4632891/exiting-batch-with-exit-b-x-where-x-1-acts-as-if-command-completed-successfu

-@@%COMSPEC% /C exit %errorlevel% >nul

+@@echo off
+
+rem ##########################################################################
+rem # Copyright 2002-2012 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 ##########################################################################
+
+setlocal enableextensions enabledelayedexpansion
+
+set _LINE_TOOLCP=
+
+:another_param
+
+if "%1%"=="-toolcp" (
+    set _LINE_TOOLCP=%2%
+	shift
+	shift
+	goto another_param
+)
+
+set _LINE_PARAMS=%1
+:param_loop
+shift
+if [%1]==[] goto param_afterloop
+set _LINE_PARAMS=%_LINE_PARAMS% %1
+goto param_loop
+:param_afterloop
+if "%OS%" NEQ "Windows_NT" (
+  echo "Warning, your version of Windows is not supported.  Attempting to start scala anyway."
+)
+
+@@setlocal
+call :set_home
+
+rem We use the value of the JAVACMD environment variable if defined
+set _JAVACMD=%JAVACMD%
+
+if not defined _JAVACMD (
+  if not "%JAVA_HOME%"=="" (
+    if exist "%JAVA_HOME%\bin\java.exe" set "_JAVACMD=%JAVA_HOME%\bin\java.exe"
+  )
+)
+
+if "%_JAVACMD%"=="" set _JAVACMD=java
+
+rem We use the value of the JAVA_OPTS environment variable if defined
+set _JAVA_OPTS=%JAVA_OPTS%
+if not defined _JAVA_OPTS set _JAVA_OPTS=@javaflags@
+
+set _TOOL_CLASSPATH=@classpath@
+if "%_TOOL_CLASSPATH%"=="" (
+  for %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"
+  for /d %%f in ("!_SCALA_HOME!\lib\*") do call :add_cpath "%%f"
+)
+
+if not "%_LINE_TOOLCP%"=="" call :add_cpath "%_LINE_TOOLCP%"
+
+set _PROPS=-Dscala.home="!_SCALA_HOME!" -Denv.emacs="%EMACS%" -Dscala.usejavacp=true @properties@
+
+rem echo "%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
+"%_JAVACMD%" %_JAVA_OPTS% %_PROPS% -cp "%_TOOL_CLASSPATH%" @class@ @toolflags@ %*
+goto end
+
+rem ##########################################################################
+rem # subroutines
+
+:add_cpath
+  if "%_TOOL_CLASSPATH%"=="" (
+    set _TOOL_CLASSPATH=%~1
+  ) else (
+    set _TOOL_CLASSPATH=%_TOOL_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
+
+:end
+@@endlocal
+
+REM exit code fix, see http://stackoverflow.com/questions/4632891/exiting-batch-with-exit-b-x-where-x-1-acts-as-if-command-completed-successfu
+@@%COMSPEC% /C exit %errorlevel% >nul