[Cmake-commits] CMake branch, next, updated. v3.6.2-2598-g1735255
Brad King
brad.king at kitware.com
Wed Sep 28 15:29:13 EDT 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 1735255f48c2e03306ad4bb092434a630cdd6577 (commit)
via 03bd9895e3f0bcdc97f051733728ca8869f8fb9e (commit)
via 2cbfb5c7a4000f27e93fde178ce3659dca0dbb6e (commit)
from 51b80629c0e9fbd7cda9a1ee940a628063dac0e5 (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=1735255f48c2e03306ad4bb092434a630cdd6577
commit 1735255f48c2e03306ad4bb092434a630cdd6577
Merge: 51b8062 03bd989
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 15:29:12 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 15:29:12 2016 -0400
Merge topic 'CONTRIBUTING-use-gitlab' into next
03bd9895 CONTRIBUTING: Document contribution through the Kitware GitLab Instance
2cbfb5c7 CONTRIBUTING: Reference clang-format helper script for code style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=03bd9895e3f0bcdc97f051733728ca8869f8fb9e
commit 03bd9895e3f0bcdc97f051733728ca8869f8fb9e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 15:16:19 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 15:28:06 2016 -0400
CONTRIBUTING: Document contribution through the Kitware GitLab Instance
Replace the instructions that routed patches to the mailing list with
new instructions routing them to our GitLab instance.
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 3007900..921ba7c 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -6,22 +6,26 @@ Community
CMake is maintained and supported by `Kitware`_ and developed in
collaboration with a productive community of contributors.
+Please subscribe and post to the `CMake Developers List`_ to raise
+discussion of development topics.
.. _`Kitware`: http://www.kitware.com/cmake
-
-The preferred entry point for new contributors is the mailing list.
-Please subscribe and post to the `CMake Developers List`_ to offer
-contributions. Regular and productive contributors may be invited
-to gain direct push access.
-
.. _`CMake Developers List`: https://cmake.org/mailman/listinfo/cmake-developers
Patches
=======
-Please base all new work on the ``master`` branch. Then use
-``git format-patch`` to produce patches suitable to post to
-the mailing list.
+CMake uses `Kitware's GitLab Instance`_ to manage development and code review.
+To contribute patches:
+
+#. Fork the upstream `CMake Repository`_ into a personal account.
+#. Base all new work on the upstream ``master`` branch.
+#. 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.
+
+.. _`Kitware's GitLab Instance`: https://gitlab.kitware.com
+.. _`CMake Repository`: https://gitlab.kitware.com/cmake/cmake
Code Style
==========
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2cbfb5c7a4000f27e93fde178ce3659dca0dbb6e
commit 2cbfb5c7a4000f27e93fde178ce3659dca0dbb6e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 11:46:40 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 11:48:13 2016 -0400
CONTRIBUTING: Reference clang-format helper script for code style
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index ddf8407..3007900 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -29,9 +29,11 @@ Code Style
We use `clang-format`_ to define our style for C++ code in the CMake source
tree. See the `.clang-format`_ configuration file for our style settings.
Use ``clang-format`` version 3.8 or higher to format source files.
+See also the `Utilities/Scripts/clang-format.bash`_ script.
.. _`clang-format`: http://clang.llvm.org/docs/ClangFormat.html
.. _`.clang-format`: .clang-format
+.. _`Utilities/Scripts/clang-format.bash`: Utilities/Scripts/clang-format.bash
License
=======
-----------------------------------------------------------------------
Summary of changes:
CONTRIBUTING.rst | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list