[Cmake-commits] CMake branch, next, updated. v3.7.1-1761-g9814bfd
Brad King
brad.king at kitware.com
Wed Dec 14 15:15:29 EST 2016
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 9814bfd0bd343bb141b9de0f6d622f92201715a9 (commit)
via da03e2d6c60f70f6dfe581e130067b2dde4517fc (commit)
via a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf (commit)
via 2413075765228001a205017c670abbefdf3b7f61 (commit)
from ec493ce9986aa3e56abb8b7bc59693add4f1579d (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=9814bfd0bd343bb141b9de0f6d622f92201715a9
commit 9814bfd0bd343bb141b9de0f6d622f92201715a9
Merge: ec493ce da03e2d
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 14 15:15:27 2016 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 14 15:15:27 2016 -0500
Merge topic 'update-kwsys' into next
da03e2d6 Merge branch 'upstream-KWSys' into update-kwsys
a9ea66bd KWSys 2016-12-14 (95a7e234)
24130757 update-kwsys: Update repository URL
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da03e2d6c60f70f6dfe581e130067b2dde4517fc
commit da03e2d6c60f70f6dfe581e130067b2dde4517fc
Merge: 2413075 a9ea66b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 14 11:19:03 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 14 11:19:03 2016 -0500
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2016-12-14 (95a7e234)
diff --cc Source/kwsys/.gitattributes
index a9c4e77,0000000..a121ad1
mode 100644,000000..100644
--- a/Source/kwsys/.gitattributes
+++ b/Source/kwsys/.gitattributes
@@@ -1,12 -1,0 +1,12 @@@
+.git* export-ignore
+
- /CONTRIBUTING.rst conflict-marker-size=78
-
+*.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
++
++*.rst whitespace=tab-in-indent conflict-marker-size=79
diff --cc Source/kwsys/README.rst
index 0000000,fc6b590..fc6b590
mode 000000,100644..100644
--- a/Source/kwsys/README.rst
+++ b/Source/kwsys/README.rst
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf
commit a9ea66bd66db0f0ad9b0b59d617739ad6a04cebf
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Dec 14 11:15:00 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 14 11:16:55 2016 -0500
KWSys 2016-12-14 (95a7e234)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 95a7e234ffd0c6bdfaa8b21c59a119198c050164 (master).
Upstream Shortlog
-----------------
Ben Boeckel (1):
e0967411 Add a script to help update third-party sources
Brad King (10):
98505f79 Add script to update GitSetup from upstream
365edba8 GitSetup: Tell Git not to export .gitattributes
41a7fe5b Add pre-commit hook to check whether SetupForDevelopment must re-run
17a1200c Convert developer setup scripts away from Gerrit Code Review
5f206c3a Tell Git to use a distinct conflict marker size in `.rst` files
33f828d4 README: Convert from `.txt` to `.rst` markup
56b707dd README: Add section about reporting bugs
140357ea CONTRIBUTING: Document contribution through the Kitware GitLab Instance
4b7bf8e4 Tell Git not to export any `.sh` or `.bash` scripts
e25eb8dc CONTRIBUTING: Add step for running developer setup script
GitSetup Upstream (3):
fed3d191 GitSetup 2012-09-27 (341043cf)
a0144297 GitSetup 2016-12-13 (8af10838)
868c1e68 GitSetup 2016-12-13 (cd5ada6d)
diff --git a/.gitattributes b/.gitattributes
index 8027e27..f2da782 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,13 +1,12 @@
.git* export-ignore
.gitattributes -export-ignore
+.hooks* export-ignore
/GitSetup export-ignore
-/SetupForDevelopment.sh export-ignore eol=lf
-/clang-format.bash export-ignore eol=lf
+/*.sh export-ignore eol=lf
+/*.bash export-ignore eol=lf
/.clang-format export-ignore
-/CONTRIBUTING.rst conflict-marker-size=78
-
*.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
@@ -16,3 +15,5 @@
*.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
+
+*.rst whitespace=tab-in-indent conflict-marker-size=79
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 47dffee..d71832a 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1,28 +1,28 @@
Contributing to KWSys
*********************
-Overview
-========
+Patches
+=======
KWSys is kept in its own Git repository and shared by several projects
via copies in their source trees. Changes to KWSys should not be made
directly in a host project, except perhaps in maintenance branches.
-Please visit
-
- http://public.kitware.com/Wiki/KWSys/Git
+KWSys uses `Kitware's GitLab Instance`_ to manage development and code review.
+To contribute patches:
-to contribute changes directly to KWSys upstream. Once changes are
-reviewed, tested, and integrated there then the copies of KWSys within
-dependent projects can be updated to get the changes.
+#. Fork the upstream `KWSys Repository`_ into a personal account.
+#. Base all new work on the upstream ``master`` branch.
+#. Run ``./SetupForDevelopment.sh`` in new local work trees.
+#. Create commits making incremental, distinct, logically complete changes.
+#. Push a topic branch to a personal repository fork on GitLab.
+#. Create a GitLab Merge Request targeting the upstream ``master`` branch.
-Issues
-======
+Once changes are reviewed, tested, and integrated to KWSys upstream then
+copies of KWSys within dependent projects can be updated to get the changes.
-KWSys has no independent issue tracker. After encountering an issue
-(bug) please try to submit a patch using the above instructions.
-Otherwise please report the issue to the tracker for the project that
-hosts the copy of KWSys in which the problem was found.
+.. _`Kitware's GitLab Instance`: https://gitlab.kitware.com
+.. _`KWSys Repository`: https://gitlab.kitware.com/utils/kwsys
Code Style
==========
@@ -36,7 +36,6 @@ See also the `clang-format.bash`_ script.
.. _`.clang-format`: .clang-format
.. _`clang-format.bash`: clang-format.bash
-
License
=======
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..fc6b590
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,37 @@
+KWSys
+*****
+
+Introduction
+============
+
+KWSys is the Kitware System Library. It provides platform-independent
+APIs to many common system features that are implemented differently on
+every platform. This library is intended to be shared among many
+projects at the source level, so it has a configurable namespace.
+Each project should configure KWSys to use a namespace unique to itself.
+See comments in `CMakeLists.txt`_ for details.
+
+.. _`CMakeLists.txt`: CMakeLists.txt
+
+License
+=======
+
+KWSys is distributed under the OSI-approved BSD 3-clause License.
+See `Copyright.txt`_ for details.
+
+.. _`Copyright.txt`: Copyright.txt
+
+Reporting Bugs
+==============
+
+KWSys has no independent issue tracker. After encountering an issue
+(bug) please submit a patch using the instructions for `Contributing`_.
+Otherwise please report the issue to the tracker for the project that
+hosts the copy of KWSys in which the problem was found.
+
+Contributing
+============
+
+See `CONTRIBUTING.rst`_ for instructions to contribute.
+
+.. _`CONTRIBUTING.rst`: CONTRIBUTING.rst
diff --git a/README.txt b/README.txt
deleted file mode 100644
index b8191f7..0000000
--- a/README.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-KWSys provides a platform-independent API to many common system
-features that are implemented differently on every platform. This
-library is intended to be shared among many projects, so it has a
-configurable namespace. Each project should configure KWSys to use a
-namespace unique to itself. See comments in CMakeLists.txt for
-details.
-
-You are probably reading this file in the source tree of a surrounding
-project. In that case, see "../README.kwsys" for details of using
-KWSys in your project.
-
-See CONTRIBUTING.rst for instructions to contribute KWSys changes.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2413075765228001a205017c670abbefdf3b7f61
commit 2413075765228001a205017c670abbefdf3b7f61
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 14 06:10:05 2016 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 14 11:16:47 2016 -0500
update-kwsys: Update repository URL
KWSys is now hosted on Kitware's GitLab instance.
diff --git a/Utilities/Scripts/update-kwsys.bash b/Utilities/Scripts/update-kwsys.bash
index 650841f..83da8a4 100755
--- a/Utilities/Scripts/update-kwsys.bash
+++ b/Utilities/Scripts/update-kwsys.bash
@@ -7,7 +7,7 @@ shopt -s dotglob
readonly name="KWSys"
readonly ownership="KWSys Upstream <kwrobot at kitware.com>"
readonly subtree="Source/kwsys"
-readonly repo="http://public.kitware.com/KWSys.git"
+readonly repo="https://gitlab.kitware.com/utils/kwsys.git"
readonly tag="master"
readonly shortlog=true
readonly paths="
-----------------------------------------------------------------------
Summary of changes:
Source/kwsys/.gitattributes | 4 ++--
Source/kwsys/CONTRIBUTING.rst | 29 +++++++++++++--------------
Source/kwsys/README.rst | 37 +++++++++++++++++++++++++++++++++++
Source/kwsys/README.txt | 12 ------------
Utilities/Scripts/update-kwsys.bash | 2 +-
5 files changed, 54 insertions(+), 30 deletions(-)
create mode 100644 Source/kwsys/README.rst
delete mode 100644 Source/kwsys/README.txt
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list