Merge pull request #131 from keithc-ca/crlf

Fix line-ends and remove trailing whitespace

.gitattributes

@@ -1,7 +1,24 @@
-# Default - treat files as text as convert line ending to LF
-* text eol=lf
+# Copyright (c) 2017, 2021 IBM Corp. and others
+#
+# This program and the accompanying materials are made available under
+# the terms of the Eclipse Public License 2.0 which accompanies this
+# distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+# or the Apache License, Version 2.0 which accompanies this distribution and
+# is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# This Source Code may also be made available under the following
+# Secondary Licenses when the conditions for such availability set
+# forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+# General Public License, version 2 with the GNU Classpath
+# Exception [1] and GNU General Public License, version 2 with the
+# OpenJDK Assembly Exception [2].
+#
+# [1] https://www.gnu.org/software/classpath/license.html
+# [2] http://openjdk.java.net/legal/assembly-exception.html
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
 
-# Overrides for files to be left untouched - treat as binary
+# Binary files.
 *.bin binary
 *.bmp binary
 *.ciphertext binary

openj9.build/scripts/openj9-systemtest-clone-make.bat

@@ -1,42 +1,42 @@
-REM *******************************************************************************
-REM Copyright (c) 2017, 2021 IBM Corp. and others
-REM 
-REM This program and the accompanying materials are made available under the
-REM terms of the Eclipse Public License 2.0 which accompanies this distribution
-REM and is available at http://eclipse.org/legal/epl-2.0 or the Apache License, 
-REM Version 2.0 which accompanies this distribution and is available at 
-REM https://www.apache.org/licenses/LICENSE-2.0.
-REM 
-REM This Source Code may also be made available under the following Secondary
-REM Licenses when the conditions for such availability set forth in the 
-REM Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
-REM version 2 with the GNU Classpath Exception [1] and GNU General Public License,
-REM version 2 with the OpenJDK Assembly Exception [2].
-REM 
-REM [1] https://www.gnu.org/software/classpath/license.html
-REM [2] http://openjdk.java.net/legal/assembly-exception.html
-REM 
-REM SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
-REM *******************************************************************************/
-
-REM Save current directory
-set currdir=%cd%
-REM Clone stf
-(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST stf rmdir /s /q stf) && git clone https://github.com/AdoptOpenJDK/stf.git stf
-REM Clone openjdk-systemtest
-(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST openjdk-systemtest rmdir /s /q openjdk-systemtest) && git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
-REM Clone openj9-systemtest
-(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST openj9-systemtest rmdir /s /q openj9-systemtest) && git clone https://github.com/eclipse-openj9/openj9/openj9-systemtest.git openj9-systemtest
-REM Configure (get prereqs)
-cd %USERPROFILE%\git\openj9-systemtest\openj9.build
-make configure
-IF ERRORLEVEL 1 cd %currdir% && exit /B 1
-REM Build
-cd %USERPROFILE%\git\openj9-systemtest\openj9.build
-make
-IF ERRORLEVEL 1 cd %currdir% && exit /B 1
-@echo openj9-systemtest repository build successful - to run the tests
-@echo cd %USERPROFILE%\git\openj9-systemtest\openj9.build && make test
-REM Restore current directory
-cd %currdir%
-exit /B 0
+REM *******************************************************************************
+REM Copyright (c) 2017, 2021 IBM Corp. and others
+REM
+REM This program and the accompanying materials are made available under the
+REM terms of the Eclipse Public License 2.0 which accompanies this distribution
+REM and is available at http://eclipse.org/legal/epl-2.0 or the Apache License,
+REM Version 2.0 which accompanies this distribution and is available at
+REM https://www.apache.org/licenses/LICENSE-2.0.
+REM
+REM This Source Code may also be made available under the following Secondary
+REM Licenses when the conditions for such availability set forth in the
+REM Eclipse Public License, v. 2.0 are satisfied: GNU General Public License,
+REM version 2 with the GNU Classpath Exception [1] and GNU General Public License,
+REM version 2 with the OpenJDK Assembly Exception [2].
+REM
+REM [1] https://www.gnu.org/software/classpath/license.html
+REM [2] http://openjdk.java.net/legal/assembly-exception.html
+REM
+REM SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+REM *******************************************************************************/
+
+REM Save current directory
+set currdir=%cd%
+REM Clone stf
+(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST stf rmdir /s /q stf) && git clone https://github.com/AdoptOpenJDK/stf.git stf
+REM Clone openjdk-systemtest
+(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST openjdk-systemtest rmdir /s /q openjdk-systemtest) && git clone https://github.com/AdoptOpenJDK/openjdk-systemtest.git openjdk-systemtest
+REM Clone openj9-systemtest
+(IF NOT EXIST %USERPROFILE%\git mkdir %USERPROFILE%\git) && cd %USERPROFILE%\git && (IF EXIST openj9-systemtest rmdir /s /q openj9-systemtest) && git clone https://github.com/eclipse-openj9/openj9/openj9-systemtest.git openj9-systemtest
+REM Configure (get prereqs)
+cd %USERPROFILE%\git\openj9-systemtest\openj9.build
+make configure
+IF ERRORLEVEL 1 cd %currdir% && exit /B 1
+REM Build
+cd %USERPROFILE%\git\openj9-systemtest\openj9.build
+make
+IF ERRORLEVEL 1 cd %currdir% && exit /B 1
+@echo openj9-systemtest repository build successful - to run the tests
+@echo cd %USERPROFILE%\git\openj9-systemtest\openj9.build && make test
+REM Restore current directory
+cd %currdir%
+exit /B 0