[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-482-g4e78fde
Brad King
brad.king at kitware.com
Wed Feb 22 17:02:32 EST 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 4e78fde27cf461a80bece2e82b84a3356249b92c (commit)
via d5f39a56a44fe061018c6acc15e1c3aa7337ff54 (commit)
via f6986ee479f1cce6da17859eaf6a0616852b9e20 (commit)
via 2256c3a7db89c58ecdd0e6cfcdff7805522187f1 (commit)
from e0fe4bc5ffc8b29bb337113645eb74ace68deada (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e78fde27cf461a80bece2e82b84a3356249b92c
commit 4e78fde27cf461a80bece2e82b84a3356249b92c
Merge: e0fe4bc d5f39a5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 22 17:02:31 2017 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 22 17:02:31 2017 -0500
Merge topic 'clang-format-attrs' into next
d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting
f6986ee4 Define a custom Git attribute to mark sources using our C style
2256c3a7 Define a custom Git attribute to mark source files as generated
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5f39a56a44fe061018c6acc15e1c3aa7337ff54
commit d5f39a56a44fe061018c6acc15e1c3aa7337ff54
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 22 15:01:23 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 22 16:59:26 2017 -0500
clang-format.bash: Use Git attributes to mark files for formatting
diff --git a/.gitattributes b/.gitattributes
index abb698a..3829160 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,11 +2,11 @@
.hooks* export-ignore
# Custom attribute to mark sources as using our C code style.
-[attr]our-c-style whitespace=tab-in-indent
+[attr]our-c-style whitespace=tab-in-indent format.clang-format
# Custom attribute to mark sources as generated.
-# Do not perform whitespace checks.
-[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab
+# 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
diff --git a/Source/.gitattributes b/Source/.gitattributes
index 47eedfb..1cec8a3 100644
--- a/Source/.gitattributes
+++ b/Source/.gitattributes
@@ -15,3 +15,7 @@
/cmFortranParser.cxx generated
/cmFortranParserTokens.h generated
/cmListFileLexer.c generated
+
+# Do not format third-party sources.
+/bindexplib.* -format.clang-format
+/kwsys/** -format.clang-format
diff --git a/Source/CursesDialog/form/.gitattributes b/Source/CursesDialog/form/.gitattributes
new file mode 100644
index 0000000..62d728c
--- /dev/null
+++ b/Source/CursesDialog/form/.gitattributes
@@ -0,0 +1 @@
+* -format.clang-format
diff --git a/Tests/CompileFeatures/.gitattributes b/Tests/CompileFeatures/.gitattributes
new file mode 100644
index 0000000..83da28d
--- /dev/null
+++ b/Tests/CompileFeatures/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source containing C++11 '>>' syntax as C++98.
+cxx_right_angle_brackets.cpp -format.clang-format
diff --git a/Tests/PositionIndependentTargets/.gitattributes b/Tests/PositionIndependentTargets/.gitattributes
new file mode 100644
index 0000000..ed36631
--- /dev/null
+++ b/Tests/PositionIndependentTargets/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source where we want a long line preserved.
+pic_test.h -format.clang-format
diff --git a/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes b/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes
new file mode 100644
index 0000000..9c22288
--- /dev/null
+++ b/Tests/RunCMake/CommandLine/cmake_depends/.gitattributes
@@ -0,0 +1,2 @@
+# Do not format a source encoded in UTF-16.
+test_UTF-16LE.h -format.clang-format
diff --git a/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes b/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes
new file mode 100644
index 0000000..883a7f1
--- /dev/null
+++ b/Tests/RunCMake/GenerateExportHeader/reference/.gitattributes
@@ -0,0 +1,2 @@
+# Exclude reference content from formatting.
+* -format.clang-format
diff --git a/Utilities/.gitattributes b/Utilities/.gitattributes
index c6345eb..bd97802 100644
--- a/Utilities/.gitattributes
+++ b/Utilities/.gitattributes
@@ -1,3 +1,7 @@
/Git export-ignore
/GitSetup export-ignore
SetupForDevelopment.sh export-ignore
+
+# Do not format third-party sources.
+/KWIML/** -format.clang-format
+/cm*/** -format.clang-format
diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index 2b36ac5..edcda77 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#=============================================================================
-# Copyright 2015-2016 Kitware, Inc.
+# Copyright 2015-2017 Kitware, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -106,34 +106,12 @@ case "$mode" in
*) die "invalid mode: $mode" ;;
esac
-# Filter sources to which our style should apply.
-$git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' '*.cu' '*.notcu' |
+# List files as selected above.
+$git_ls |
- # Exclude lexer/parser generator input and output.
- egrep -z -v '^Source/cmCommandArgumentLexer\.' |
- egrep -z -v '^Source/cmCommandArgumentParser(\.y|\.cxx|Tokens\.h)' |
- egrep -z -v '^Source/cmDependsJavaLexer\.' |
- egrep -z -v '^Source/cmDependsJavaParser(\.y|\.cxx|Tokens\.h)' |
- egrep -z -v '^Source/cmExprLexer\.' |
- egrep -z -v '^Source/cmExprParser(\.y|\.cxx|Tokens\.h)' |
- egrep -z -v '^Source/cmFortranLexer\.' |
- egrep -z -v '^Source/cmFortranParser(\.y|\.cxx|Tokens\.h)' |
- egrep -z -v '^Source/cmListFileLexer(\.in\.l|\.c)' |
-
- # Exclude third-party sources.
- egrep -z -v '^Source/bindexplib' |
- egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
- egrep -z -v '^Utilities/(KW|cm).*/' |
-
- # Exclude reference content.
- egrep -z -v '^Tests/RunCMake/GenerateExportHeader/reference/' |
-
- # Exclude manually-formatted sources (e.g. with long lines).
- egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |
- egrep -z -v '^Tests/CompileFeatures/cxx_right_angle_brackets.cpp' |
-
- # Exclude sources with encoding not suported by clang-format.
- egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
+ # Select sources with our attribute.
+ git check-attr --stdin format.clang-format |
+ sed -n '/: format\.clang-format: set$/ {s/:[^:]*:[^:]*$//p}' |
# Update sources in-place.
- xargs -0 "$clang_format" -i
+ xargs -d '\n' "$clang_format" -i
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f6986ee479f1cce6da17859eaf6a0616852b9e20
commit f6986ee479f1cce6da17859eaf6a0616852b9e20
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 22 14:58:27 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 22 16:53:29 2017 -0500
Define a custom Git attribute to mark sources using our C style
diff --git a/.gitattributes b/.gitattributes
index dfc3250..abb698a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,9 @@
.gitattributes export-ignore
.hooks* export-ignore
+# Custom attribute to mark sources as using our C code style.
+[attr]our-c-style whitespace=tab-in-indent
+
# Custom attribute to mark sources as generated.
# Do not perform whitespace checks.
[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab
@@ -20,10 +23,17 @@ configure crlf=input
*.sln -crlf
*.vcproj -crlf
-*.c whitespace=tab-in-indent
-*.h whitespace=tab-in-indent
-*.cxx whitespace=tab-in-indent
-*.txt whitespace=tab-in-indent
-*.cmake whitespace=tab-in-indent
+*.c our-c-style
+*.cc our-c-style
+*.cpp our-c-style
+*.cu our-c-style
+*.cxx our-c-style
+*.h our-c-style
+*.hh our-c-style
+*.hpp our-c-style
+*.hxx our-c-style
+*.notcu our-c-style
+*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79
+*.txt whitespace=tab-in-indent
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2256c3a7db89c58ecdd0e6cfcdff7805522187f1
commit 2256c3a7db89c58ecdd0e6cfcdff7805522187f1
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 22 14:33:30 2017 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 22 16:53:26 2017 -0500
Define a custom Git attribute to mark source files as generated
diff --git a/.gitattributes b/.gitattributes
index d959918..dfc3250 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,10 @@
.gitattributes export-ignore
.hooks* export-ignore
+# Custom attribute to mark sources as generated.
+# Do not perform whitespace checks.
+[attr]generated whitespace=-tab-in-indent,-indent-with-non-tab
+
bootstrap crlf=input
configure crlf=input
*.[1-9] crlf=input
diff --git a/Source/.gitattributes b/Source/.gitattributes
index dbd6382..47eedfb 100644
--- a/Source/.gitattributes
+++ b/Source/.gitattributes
@@ -1,10 +1,17 @@
-# Preserve indentation style in generated code.
-cmCommandArgumentLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmCommandArgumentLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmDependsJavaLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmDependsJavaLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmExprLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmExprLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmFortranLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmFortranLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmListFileLexer.c whitespace=-tab-in-indent,-indent-with-non-tab
+/cmCommandArgumentLexer.cxx generated
+/cmCommandArgumentLexer.h generated
+/cmCommandArgumentParser.cxx generated
+/cmCommandArgumentParserTokens.h generated
+/cmDependsJavaLexer.cxx generated
+/cmDependsJavaLexer.h generated
+/cmDependsJavaParser.cxx generated
+/cmDependsJavaParserTokens.h generated
+/cmExprLexer.cxx generated
+/cmExprLexer.h generated
+/cmExprParser.cxx generated
+/cmExprParserTokens.h generated
+/cmFortranLexer.cxx generated
+/cmFortranLexer.h generated
+/cmFortranParser.cxx generated
+/cmFortranParserTokens.h generated
+/cmListFileLexer.c generated
-----------------------------------------------------------------------
Summary of changes:
.gitattributes | 24 ++++++++++---
Source/.gitattributes | 31 +++++++++++------
Source/CursesDialog/form/.gitattributes | 1 +
Tests/CompileFeatures/.gitattributes | 2 ++
Tests/PositionIndependentTargets/.gitattributes | 2 ++
.../CommandLine/cmake_depends/.gitattributes | 2 ++
.../GenerateExportHeader/reference/.gitattributes | 2 ++
Utilities/.gitattributes | 4 +++
Utilities/Scripts/clang-format.bash | 36 ++++----------------
9 files changed, 60 insertions(+), 44 deletions(-)
create mode 100644 Source/CursesDialog/form/.gitattributes
create mode 100644 Tests/CompileFeatures/.gitattributes
create mode 100644 Tests/PositionIndependentTargets/.gitattributes
create mode 100644 Tests/RunCMake/CommandLine/cmake_depends/.gitattributes
create mode 100644 Tests/RunCMake/GenerateExportHeader/reference/.gitattributes
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list