mirror of
https://github.com/Kitware/CMake.git
synced 2026-02-19 05:30:59 -06:00
Merge topic 'modernize-git-whitespace-attributes'
8ed03baagitattributes: prefer `eol=crlf` to `-crlf`40470031MumpsCoverage: remove unnecessary attributed20485d8gitattributes: prefer `eol=lf` to `crlf=input`b85c2589gitattributes: prefer `-text` for binary files377f3685gitattributes: remove unused attributes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1173
This commit is contained in:
25
.gitattributes
vendored
25
.gitattributes
vendored
@@ -8,20 +8,19 @@
|
||||
# Do not perform whitespace checks. Do not format.
|
||||
[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab -format.clang-format
|
||||
|
||||
bootstrap crlf=input
|
||||
configure crlf=input
|
||||
*.[1-9] crlf=input
|
||||
*.sh crlf=input
|
||||
*.sh.in crlf=input
|
||||
bootstrap eol=lf
|
||||
configure eol=lf
|
||||
*.[1-9] eol=lf
|
||||
*.sh eol=lf
|
||||
*.sh.in eol=lf
|
||||
|
||||
*.bat -crlf
|
||||
*.bat.in -crlf
|
||||
*.dsp -crlf
|
||||
*.dsw -crlf
|
||||
*.pfx -crlf
|
||||
*.png -crlf
|
||||
*.sln -crlf
|
||||
*.vcproj -crlf
|
||||
*.bat eol=crlf
|
||||
*.bat.in eol=crlf
|
||||
*.sln eol=crlf
|
||||
*.vcproj eol=crlf
|
||||
|
||||
*.pfx -text
|
||||
*.png -text
|
||||
|
||||
*.c our-c-style
|
||||
*.cc our-c-style
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
@echo off
|
||||
call "@CMAKE_GNUtoMS_BAT@"
|
||||
lib /machine:"@CMAKE_GNUtoMS_ARCH@" %*
|
||||
@echo off
|
||||
call "@CMAKE_GNUtoMS_BAT@"
|
||||
lib /machine:"@CMAKE_GNUtoMS_ARCH@" %*
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
echo 'Starting the squish server...'
|
||||
start %1
|
||||
|
||||
echo 'Running the test case...'
|
||||
%2 --testcase %3 --wrapper %4 --aut %5
|
||||
set result=%ERRORLEVEL%
|
||||
|
||||
echo 'Stopping the squish server...'
|
||||
%1 --stop
|
||||
|
||||
exit \b %result%
|
||||
echo 'Starting the squish server...'
|
||||
start %1
|
||||
|
||||
echo 'Running the test case...'
|
||||
%2 --testcase %3 --wrapper %4 --aut %5
|
||||
set result=%ERRORLEVEL%
|
||||
|
||||
echo 'Stopping the squish server...'
|
||||
%1 --stop
|
||||
|
||||
exit \b %result%
|
||||
|
||||
@@ -1 +1 @@
|
||||
*.sln-file -crlf whitespace=cr-at-eol
|
||||
*.sln-file eol=crlf
|
||||
|
||||
2
Tests/CMakeTests/.gitattributes
vendored
2
Tests/CMakeTests/.gitattributes
vendored
@@ -1 +1 @@
|
||||
File-HASH-Input.txt crlf=input
|
||||
File-HASH-Input.txt eol=lf
|
||||
|
||||
6
Tests/MFC/mfc1/.gitattributes
vendored
6
Tests/MFC/mfc1/.gitattributes
vendored
@@ -1,6 +0,0 @@
|
||||
.gitattributes export-ignore
|
||||
|
||||
*.sln -crlf
|
||||
*.vcproj -crlf
|
||||
|
||||
* -whitespace
|
||||
5
Tests/Module/ExternalData/.gitattributes
vendored
Normal file
5
Tests/Module/ExternalData/.gitattributes
vendored
Normal file
@@ -0,0 +1,5 @@
|
||||
MD5/* -text
|
||||
SHA1/* -text
|
||||
SHA224/* -text
|
||||
SHA256/* -text
|
||||
SHA3_256/* -text
|
||||
1
Tests/Module/ExternalData/MD5/.gitattributes
vendored
1
Tests/Module/ExternalData/MD5/.gitattributes
vendored
@@ -1 +0,0 @@
|
||||
* -crlf
|
||||
@@ -1 +0,0 @@
|
||||
* -crlf
|
||||
@@ -1 +0,0 @@
|
||||
* -crlf
|
||||
@@ -1 +0,0 @@
|
||||
* -crlf
|
||||
@@ -1 +0,0 @@
|
||||
* -crlf
|
||||
3
Tests/MumpsCoverage/.gitattributes
vendored
3
Tests/MumpsCoverage/.gitattributes
vendored
@@ -1,2 +1 @@
|
||||
*.cmcov -crlf -whitespace
|
||||
*.mcov -crlf -whitespace
|
||||
*.cmcov eol=crlf
|
||||
|
||||
@@ -1 +1 @@
|
||||
@echo Sample Script Output
|
||||
@echo Sample Script Output
|
||||
|
||||
@@ -1 +1 @@
|
||||
@echo Sample Script Output
|
||||
@echo Sample Script Output
|
||||
|
||||
Reference in New Issue
Block a user