Merge remote-tracking branch 'paulp/topic/gitattributes' into 2.10.x

2 files changed, 128 insertions, 128 deletions

diff --git a/test/files/jvm/manifests-new.check b/test/files/jvm/manifests-new.check
index 1c0bf6a568..a1ff9491cf 100644
--- a/test/files/jvm/manifests-new.check
+++ b/test/files/jvm/manifests-new.check
@@ -1,58 +1,58 @@
-x=(), t=TypeTag[Unit], k=TypeRef, s=class Unit

-x=true, t=TypeTag[Boolean], k=TypeRef, s=class Boolean

-x=a, t=TypeTag[Char], k=TypeRef, s=class Char

-x=1, t=TypeTag[Int], k=TypeRef, s=class Int

-x=abc, t=TypeTag[java.lang.String], k=TypeRef, s=class String

-x='abc, t=TypeTag[Symbol], k=TypeRef, s=class Symbol

-

-x=List(()), t=TypeTag[List[Unit]], k=TypeRef, s=class List

-x=List(true), t=TypeTag[List[Boolean]], k=TypeRef, s=class List

-x=List(1), t=TypeTag[List[Int]], k=TypeRef, s=class List

-x=List(abc), t=TypeTag[List[java.lang.String]], k=TypeRef, s=class List

-x=List('abc), t=TypeTag[List[Symbol]], k=TypeRef, s=class List

-

-x=[Z, t=TypeTag[Array[Boolean]], k=TypeRef, s=class Array

-x=[C, t=TypeTag[Array[Char]], k=TypeRef, s=class Array

-x=[I, t=TypeTag[Array[Int]], k=TypeRef, s=class Array

-x=[Ljava.lang.String;, t=TypeTag[Array[java.lang.String]], k=TypeRef, s=class Array

-x=[Lscala.Symbol;, t=TypeTag[Array[Symbol]], k=TypeRef, s=class Array

-

-x=((),()), t=TypeTag[(Unit, Unit)], k=TypeRef, s=class Tuple2

-x=(true,false), t=TypeTag[(Boolean, Boolean)], k=TypeRef, s=class Tuple2

-x=(1,2), t=TypeTag[(Int, Int)], k=TypeRef, s=class Tuple2

-x=(abc,xyz), t=TypeTag[(java.lang.String, java.lang.String)], k=TypeRef, s=class Tuple2

-x=('abc,'xyz), t=TypeTag[(Symbol, Symbol)], k=TypeRef, s=class Tuple2

-

-x=Test$, t=TypeTag[Test.type], k=SingleType, s=object Test

-x=scala.collection.immutable.List$, t=TypeTag[scala.collection.immutable.List.type], k=SingleType, s=object List

-

-x=Foo, t=TypeTag[Foo[Int]], k=TypeRef, s=class Foo

-x=Foo, t=TypeTag[Foo[List[Int]]], k=TypeRef, s=class Foo

-x=Foo, t=TypeTag[Foo[Foo[Int]]], k=TypeRef, s=class Foo

-x=Foo, t=TypeTag[Foo[List[Foo[Int]]]], k=TypeRef, s=class Foo

-

-x=Test1$$anon$1, t=TypeTag[Bar[String]], k=RefinedType, s=<local Test1>

-x=Test1$$anon$2, t=TypeTag[Bar[String]], k=RefinedType, s=<local Test1>

-

-()=()

-true=true

-a=a

-1=1

-'abc='abc

-

-List(())=List(())

-List(true)=List(true)

-List('abc)=List('abc)

-

-Array()=Array()

-Array(true)=Array(true)

-Array(a)=Array(a)

-Array(1)=Array(1)

-

-((),())=((),())

-(true,false)=(true,false)

-

-List(List(1), List(2))=List(List(1), List(2))

-

-Array(Array(1), Array(2))=Array(Array(1), Array(2))

-

+x=(), t=TypeTag[Unit], k=TypeRef, s=class Unit
+x=true, t=TypeTag[Boolean], k=TypeRef, s=class Boolean
+x=a, t=TypeTag[Char], k=TypeRef, s=class Char
+x=1, t=TypeTag[Int], k=TypeRef, s=class Int
+x=abc, t=TypeTag[java.lang.String], k=TypeRef, s=class String
+x='abc, t=TypeTag[Symbol], k=TypeRef, s=class Symbol
+
+x=List(()), t=TypeTag[List[Unit]], k=TypeRef, s=class List
+x=List(true), t=TypeTag[List[Boolean]], k=TypeRef, s=class List
+x=List(1), t=TypeTag[List[Int]], k=TypeRef, s=class List
+x=List(abc), t=TypeTag[List[java.lang.String]], k=TypeRef, s=class List
+x=List('abc), t=TypeTag[List[Symbol]], k=TypeRef, s=class List
+
+x=[Z, t=TypeTag[Array[Boolean]], k=TypeRef, s=class Array
+x=[C, t=TypeTag[Array[Char]], k=TypeRef, s=class Array
+x=[I, t=TypeTag[Array[Int]], k=TypeRef, s=class Array
+x=[Ljava.lang.String;, t=TypeTag[Array[java.lang.String]], k=TypeRef, s=class Array
+x=[Lscala.Symbol;, t=TypeTag[Array[Symbol]], k=TypeRef, s=class Array
+
+x=((),()), t=TypeTag[(Unit, Unit)], k=TypeRef, s=class Tuple2
+x=(true,false), t=TypeTag[(Boolean, Boolean)], k=TypeRef, s=class Tuple2
+x=(1,2), t=TypeTag[(Int, Int)], k=TypeRef, s=class Tuple2
+x=(abc,xyz), t=TypeTag[(java.lang.String, java.lang.String)], k=TypeRef, s=class Tuple2
+x=('abc,'xyz), t=TypeTag[(Symbol, Symbol)], k=TypeRef, s=class Tuple2
+
+x=Test$, t=TypeTag[Test.type], k=SingleType, s=object Test
+x=scala.collection.immutable.List$, t=TypeTag[scala.collection.immutable.List.type], k=SingleType, s=object List
+
+x=Foo, t=TypeTag[Foo[Int]], k=TypeRef, s=class Foo
+x=Foo, t=TypeTag[Foo[List[Int]]], k=TypeRef, s=class Foo
+x=Foo, t=TypeTag[Foo[Foo[Int]]], k=TypeRef, s=class Foo
+x=Foo, t=TypeTag[Foo[List[Foo[Int]]]], k=TypeRef, s=class Foo
+
+x=Test1$$anon$1, t=TypeTag[Bar[String]], k=RefinedType, s=<local Test1>
+x=Test1$$anon$2, t=TypeTag[Bar[String]], k=RefinedType, s=<local Test1>
+
+()=()
+true=true
+a=a
+1=1
+'abc='abc
+
+List(())=List(())
+List(true)=List(true)
+List('abc)=List('abc)
+
+Array()=Array()
+Array(true)=Array(true)
+Array(a)=Array(a)
+Array(1)=Array(1)
+
+((),())=((),())
+(true,false)=(true,false)
+
+List(List(1), List(2))=List(List(1), List(2))
+
+Array(Array(1), Array(2))=Array(Array(1), Array(2))
+
diff --git a/test/files/jvm/mkLibNatives.bat b/test/files/jvm/mkLibNatives.bat
index 2f99f7aab5..623039b867 100755
--- a/test/files/jvm/mkLibNatives.bat
+++ b/test/files/jvm/mkLibNatives.bat
@@ -1,70 +1,70 @@
-@echo off

-

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

-rem # Author  : Stephane Micheloud

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

-

-rem # For building the -64.dll, you need: Visual C++ Express, Microsoft SDK (to

-rem # get the 64bit compiler / libraries), adapt this script.

-

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

-rem # variables

-

-if "%OS%"=="Windows_NT" @setlocal

-

-rem debug switches are: off=0, on=1

-set DEBUG=0

-set STDOUT=NUL

-if %DEBUG%==1 set STDOUT=CON

-

-set CLASS_NAME=Test$

-set CLASS_DIR=.

-

-set OBJ_NAME=natives

-set LIB_NAME=natives-32

-

-if "%JAVA_HOME%"=="" goto error1

-if "%VSINSTALLDIR%"=="" goto error2

-

-set JAVAH=%JAVA_HOME%\bin\javah

-set JAVAH_OPTIONS=-jni -force -classpath %CLASS_DIR% -o %OBJ_NAME%.h

-

-set CC=%VSINSTALLDIR%\vc\bin\cl

-set CC_OPTIONS=/nologo /c

-set CC_INCLUDES=-I%VSINSTALLDIR%\vc\include -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32

-

-set LNK_OPTIONS=/nologo /MT /LD

-

-rem variable LIB is used by the C++ linker to find libcmt.lib, ..

-set LIB=%VSINSTALLDIR%\vc\lib

-

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

-rem # commands

-

-del /s/q *.obj *.exp *.lib *.dll 1>%STDOUT%

-

-if %DEBUG%==1 echo %JAVAH% %JAVAH_OPTIONS% %CLASS_NAME%

-%JAVAH% %JAVAH_OPTIONS% %CLASS_NAME%

-

-if %DEBUG%==1 echo %CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c

-%CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c 1>%STDOUT%

-

-if %DEBUG%==1 echo %CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj

-%CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj 1>%STDOUT%

-

-goto end

-

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

-rem # subroutines

-

-:error1

-echo ERROR: environment variable JAVA_HOME is undefined. It should point to your JDK installation.

-goto end

-

-:error2

-echo ERROR: environment variable VSINSTALLDIR is undefined. It should point to your MS Visual Studio installation.

-goto end

-

-:end

-if "%OS%"=="Windows_NT" @endlocal

-exit /b %errorlevel%

+@echo off
+
+rem ##########################################################################
+rem # Author  : Stephane Micheloud
+rem ##########################################################################
+
+rem # For building the -64.dll, you need: Visual C++ Express, Microsoft SDK (to
+rem # get the 64bit compiler / libraries), adapt this script.
+
+rem ##########################################################################
+rem # variables
+
+if "%OS%"=="Windows_NT" @setlocal
+
+rem debug switches are: off=0, on=1
+set DEBUG=0
+set STDOUT=NUL
+if %DEBUG%==1 set STDOUT=CON
+
+set CLASS_NAME=Test$
+set CLASS_DIR=.
+
+set OBJ_NAME=natives
+set LIB_NAME=natives-32
+
+if "%JAVA_HOME%"=="" goto error1
+if "%VSINSTALLDIR%"=="" goto error2
+
+set JAVAH=%JAVA_HOME%\bin\javah
+set JAVAH_OPTIONS=-jni -force -classpath %CLASS_DIR% -o %OBJ_NAME%.h
+
+set CC=%VSINSTALLDIR%\vc\bin\cl
+set CC_OPTIONS=/nologo /c
+set CC_INCLUDES=-I%VSINSTALLDIR%\vc\include -I%JAVA_HOME%\include -I%JAVA_HOME%\include\win32
+
+set LNK_OPTIONS=/nologo /MT /LD
+
+rem variable LIB is used by the C++ linker to find libcmt.lib, ..
+set LIB=%VSINSTALLDIR%\vc\lib
+
+rem ##########################################################################
+rem # commands
+
+del /s/q *.obj *.exp *.lib *.dll 1>%STDOUT%
+
+if %DEBUG%==1 echo %JAVAH% %JAVAH_OPTIONS% %CLASS_NAME%
+%JAVAH% %JAVAH_OPTIONS% %CLASS_NAME%
+
+if %DEBUG%==1 echo %CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c
+%CC% %CC_OPTIONS% %CC_INCLUDES% /Fo%OBJ_NAME%.obj natives.c 1>%STDOUT%
+
+if %DEBUG%==1 echo %CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj
+%CC% %LNK_OPTIONS% /Fe%LIB_NAME%.dll %OBJ_NAME%.obj 1>%STDOUT%
+
+goto end
+
+rem ##########################################################################
+rem # subroutines
+
+:error1
+echo ERROR: environment variable JAVA_HOME is undefined. It should point to your JDK installation.
+goto end
+
+:error2
+echo ERROR: environment variable VSINSTALLDIR is undefined. It should point to your MS Visual Studio installation.
+goto end
+
+:end
+if "%OS%"=="Windows_NT" @endlocal
+exit /b %errorlevel%