[Cmake-commits] CMake branch, next, updated. v3.8.0-rc3-570-g30b22d9
Kitware Robot
kwrobot at kitware.com
Fri Mar 24 15:25:02 EDT 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 30b22d94f06e8b1760ea2bca570376161fdf95c1 (commit)
via ea2a91a43279616a602b641d827e07912ac9c0b9 (commit)
via fda80fde76c230dda8372bf9d7208520c40f3611 (commit)
via 64490637840b05da7f0829aa52cae7f3923b805e (commit)
via f1a5583901e051ef4627bf8be08565c4b331e99a (commit)
from 6f245c20528528f5c848e69ee909a803a59477f0 (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=30b22d94f06e8b1760ea2bca570376161fdf95c1
commit 30b22d94f06e8b1760ea2bca570376161fdf95c1
Merge: 6f245c2 ea2a91a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 24 19:22:04 2017 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Fri Mar 24 15:22:06 2017 -0400
Stage topic 'update-kwsys'
Topic-id: 23265
Topic-url: https://gitlab.kitware.com/cmake/cmake/merge_requests/624
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ea2a91a43279616a602b641d827e07912ac9c0b9
commit ea2a91a43279616a602b641d827e07912ac9c0b9
Merge: 6449063 fda80fd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 24 15:17:25 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 24 15:17:25 2017 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-03-24 (7e9f7b7b)
Resolve conflicts in `.gitattributes` by integrating changes from both
sides. Keep the `our-c-style` attribute that KWSys uses, but drop their
definition of it in favor of ours (Git only allows custom attributes in
the top level anyway). Then add our own attribute line to unset the
`format.clang-format` attribute for KWSys sources since we do not want
to format third-party code ourselves.
diff --cc Source/kwsys/.gitattributes
index a121ad1,0000000..3583f39
mode 100644,000000..100644
--- a/Source/kwsys/.gitattributes
+++ b/Source/kwsys/.gitattributes
@@@ -1,12 -1,0 +1,15 @@@
+.git* export-ignore
+
- *.c whitespace=tab-in-indent,no-lf-at-eof
- *.h whitespace=tab-in-indent,no-lf-at-eof
- *.h.in whitespace=tab-in-indent,no-lf-at-eof
- *.cxx whitespace=tab-in-indent,no-lf-at-eof
- *.hxx whitespace=tab-in-indent,no-lf-at-eof
- *.hxx.in whitespace=tab-in-indent,no-lf-at-eof
- *.txt whitespace=tab-in-indent,no-lf-at-eof
- *.cmake whitespace=tab-in-indent,no-lf-at-eof
++*.c our-c-style
++*.c.in our-c-style
++*.cxx our-c-style
++*.h our-c-style
++*.h.in our-c-style
++*.hxx our-c-style
++*.hxx.in our-c-style
+
++*.cmake whitespace=tab-in-indent
+*.rst whitespace=tab-in-indent conflict-marker-size=79
++*.txt whitespace=tab-in-indent
++
++* -format.clang-format
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fda80fde76c230dda8372bf9d7208520c40f3611
commit fda80fde76c230dda8372bf9d7208520c40f3611
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Fri Mar 24 13:30:34 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 24 15:16:56 2017 -0400
KWSys 2017-03-24 (7e9f7b7b)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 7e9f7b7bdc8ac54006a40a775867022c4d678b06 (master).
Upstream Shortlog
-----------------
Brad King (3):
0af48083 Drop custom Git whitespace check attribute
6365886c Define a custom Git attribute to mark sources using our C style
d22c2743 clang-format.bash: Use Git attributes to mark files for formatting
Egor Pugin (3):
ce44c58a FStream: Export ReadBOM() from shared library
04e24b2b ConsoleBuf: Remove export macro from BasicConsoleBuf template
858d5edd Encoding: Export CommandLineArguments from shared library
diff --git a/.gitattributes b/.gitattributes
index f2da782..8ce3d68 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,18 +2,22 @@
.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 format.clang-format
+
/GitSetup export-ignore
/*.sh export-ignore eol=lf
/*.bash export-ignore eol=lf
/.clang-format export-ignore
-*.c whitespace=tab-in-indent,no-lf-at-eof
-*.h whitespace=tab-in-indent,no-lf-at-eof
-*.h.in whitespace=tab-in-indent,no-lf-at-eof
-*.cxx whitespace=tab-in-indent,no-lf-at-eof
-*.hxx whitespace=tab-in-indent,no-lf-at-eof
-*.hxx.in whitespace=tab-in-indent,no-lf-at-eof
-*.txt whitespace=tab-in-indent,no-lf-at-eof
-*.cmake whitespace=tab-in-indent,no-lf-at-eof
+*.c our-c-style
+*.c.in our-c-style
+*.cxx our-c-style
+*.h our-c-style
+*.h.in our-c-style
+*.hxx our-c-style
+*.hxx.in our-c-style
+*.cmake whitespace=tab-in-indent
*.rst whitespace=tab-in-indent conflict-marker-size=79
+*.txt whitespace=tab-in-indent
diff --git a/ConsoleBuf.hxx.in b/ConsoleBuf.hxx.in
index cb58865..32e680c 100644
--- a/ConsoleBuf.hxx.in
+++ b/ConsoleBuf.hxx.in
@@ -25,8 +25,7 @@ namespace @KWSYS_NAMESPACE@ {
#if defined(_WIN32)
template <class CharT, class Traits = std::char_traits<CharT> >
-class @KWSYS_NAMESPACE at _EXPORT BasicConsoleBuf
- : public std::basic_streambuf<CharT, Traits>
+class BasicConsoleBuf : public std::basic_streambuf<CharT, Traits>
{
public:
typedef typename Traits::int_type int_type;
diff --git a/Encoding.hxx.in b/Encoding.hxx.in
index 6639efd..bf93f50 100644
--- a/Encoding.hxx.in
+++ b/Encoding.hxx.in
@@ -13,7 +13,7 @@ class @KWSYS_NAMESPACE at _EXPORT Encoding
{
public:
// Container class for argc/argv.
- class CommandLineArguments
+ class @KWSYS_NAMESPACE at _EXPORT CommandLineArguments
{
public:
// On Windows, get the program command line arguments
diff --git a/FStream.hxx.in b/FStream.hxx.in
index 736214f..cf331a5 100644
--- a/FStream.hxx.in
+++ b/FStream.hxx.in
@@ -269,7 +269,7 @@ enum BOM
// If a BOM exists, the stream is advanced to after the BOM.
// This function requires a seekable stream (but not a relative
// seekable stream).
-BOM ReadBOM(std::istream& in);
+ at KWSYS_NAMESPACE@_EXPORT BOM ReadBOM(std::istream& in);
}
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=64490637840b05da7f0829aa52cae7f3923b805e
commit 64490637840b05da7f0829aa52cae7f3923b805e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 24 14:51:46 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 24 15:16:39 2017 -0400
update-kwsys: Disable custom gitattributes during import
The KWSys `.gitattributes` file now defines custom attributes.
Git does not support these in a subdirectory where we are about
to place the content, so comment them out during import.
This also ensures that the `our-c-style` attribute on KWSys
sources does not activate the `format.clang-format` attribute
on the third-party import branch.
diff --git a/Utilities/Scripts/update-kwsys.bash b/Utilities/Scripts/update-kwsys.bash
index 83da8a4..d5485aa 100755
--- a/Utilities/Scripts/update-kwsys.bash
+++ b/Utilities/Scripts/update-kwsys.bash
@@ -15,6 +15,7 @@ readonly paths="
extract_source () {
git_archive
+ disable_custom_gitattributes
}
export HOOKS_ALLOW_KWSYS=1
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f1a5583901e051ef4627bf8be08565c4b331e99a
commit f1a5583901e051ef4627bf8be08565c4b331e99a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 24 15:13:55 2017 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 24 15:13:55 2017 -0400
update-third-party: Add helper to disable custom gitattributes
Provide a helper function that import scripts can use when the
third-party project defines custom Git attributes in its top-level
`.gitattributes` file. These must be commented out because Git
does not support custom attributes in a subdirectory where we
where the third-party project is about to be merged.
diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash
index 3b8358e..670946e 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -52,6 +52,14 @@ git_archive () {
tar -C "$extractdir" -x
}
+disable_custom_gitattributes() {
+ pushd "${extractdir}/${name}-reduced"
+ # Git does not allow custom attributes in a subdirectory where we
+ # are about to merge the `.gitattributes` file, so disable them.
+ sed -i '/^\[attr\]/ {s/^/#/}' .gitattributes
+ popd
+}
+
die () {
echo >&2 "$@"
exit 1
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/.gitattributes | 19 +++++++++++--------
Source/kwsys/ConsoleBuf.hxx.in | 3 +--
Source/kwsys/Encoding.hxx.in | 2 +-
Source/kwsys/FStream.hxx.in | 2 +-
Utilities/Scripts/update-kwsys.bash | 1 +
Utilities/Scripts/update-third-party.bash | 8 ++++++++
6 files changed, 23 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list