浏览代码

CONTRIBUTORS: Factor contributors list out of license file

It is more conventional to list contributors in a dedicated file.
Also drop the long out-of-date sponsorship section.
Brad King 7 月之前
父节点
当前提交
8d83487e60
共有 7 个文件被更改,包括 110 次插入121 次删除
  1. 1 1
      .codespellrc
  2. 1 1
      .typos.toml
  3. 3 1
      CMakeCPack.cmake
  4. 1 0
      CMakeLists.txt
  5. 100 0
      CONTRIBUTORS.rst
  6. 1 117
      LICENSE.rst
  7. 3 1
      Source/CMakeCopyright.cmake

+ 1 - 1
.codespellrc

@@ -10,8 +10,8 @@ skip =
   .git,
   .typos.toml,
   build,
+  CONTRIBUTORS.rst,
   CTestCustom.cmake.in,
-  LICENSE.rst,
   Modules/Internal/CPack/NSIS.template.in,
   Source/CursesDialog/form/*,
   Source/kwsys/*,

+ 1 - 1
.typos.toml

@@ -57,7 +57,7 @@ SEH = "SEH"
 ignore-hidden = false
 ignore-dot = false
 extend-exclude = [
-    "LICENSE.rst"
+    "CONTRIBUTORS.rst"
     # Exclude third-party sources.
   , "Source/CursesDialog/form/"
   , "Source/kwsys/"

+ 3 - 1
CMakeCPack.cmake

@@ -15,7 +15,9 @@ if(CMake_INSTALL_DEPENDENCIES)
 endif()
 
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/LICENSE.txt")
-configure_file("${CMake_LICENSE_FILE}" "${CPACK_RESOURCE_FILE_LICENSE}" COPYONLY)
+file(READ "${CMake_LICENSE_FILE}" license_text)
+string(REPLACE "`Contributors <CONTRIBUTORS.rst>`_" "Contributors" license_text "${license_text}")
+file(WRITE "${CPACK_RESOURCE_FILE_LICENSE}" "${license_text}")
 
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool")
 set(CPACK_PACKAGE_VENDOR "Kitware")

+ 1 - 0
CMakeLists.txt

@@ -536,6 +536,7 @@ if(NOT CMake_TEST_EXTERNAL_CMAKE)
   # Install license file as it requires.
   install(FILES
     "${CMake_LICENSE_FILE}"
+    "${CMake_SOURCE_DIR}/CONTRIBUTORS.rst"
     DESTINATION ${CMAKE_DOC_DIR})
 
   # Install script directories.

+ 100 - 0
CONTRIBUTORS.rst

@@ -0,0 +1,100 @@
+Contributors
+************
+
+The following individuals and institutions are among the contributors:
+
+* Aaron C. Meadows <[email protected]>
+* Adriaan de Groot <[email protected]>
+* Aleksey Avdeev <[email protected]>
+* Alexander Neundorf <[email protected]>
+* Alexander Smorkalov <[email protected]>
+* Alexey Sokolov <[email protected]>
+* Alex Merry <[email protected]>
+* Alex Turbov <[email protected]>
+* Andreas Pakulat <[email protected]>
+* Andreas Schneider <[email protected]>
+* André Rigland Brodtkorb <[email protected]>
+* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
+* Benjamin Eikel
+* Bjoern Ricks <[email protected]>
+* Brad Hards <[email protected]>
+* Christopher Harvey
+* Christoph Grüninger <[email protected]>
+* Clement Creusot <[email protected]>
+* Daniel Blezek <[email protected]>
+* Daniel Pfeifer <[email protected]>
+* Dawid Wróbel <[email protected]>
+* Enrico Scholz <[email protected]>
+* Eran Ifrah <[email protected]>
+* Esben Mose Hansen, Ange Optimization ApS
+* Geoffrey Viola <[email protected]>
+* Google Inc
+* Gregor Jasny
+* Helio Chissini de Castro <[email protected]>
+* Ilya Lavrenov <[email protected]>
+* Insight Software Consortium <insightsoftwareconsortium.org>
+* Intel Corporation <www.intel.com>
+* Jan Woetzel
+* Jordan Williams <[email protected]>
+* Julien Schueller
+* Kelly Thompson <[email protected]>
+* Konstantin Podsvirov <[email protected]>
+* Laurent Montel <[email protected]>
+* Mario Bensi <[email protected]>
+* Martin Gräßlin <[email protected]>
+* Mathieu Malaterre <[email protected]>
+* Matthaeus G. Chajdas
+* Matthias Kretz <[email protected]>
+* Matthias Maennich <[email protected]>
+* Michael Hirsch, Ph.D. <www.scivision.co>
+* Michael Stürmer
+* Miguel A. Figueroa-Villanueva
+* Mike Durso <[email protected]>
+* Mike Jackson
+* Mike McQuaid <[email protected]>
+* Nicolas Bock <[email protected]>
+* Nicolas Despres <[email protected]>
+* Nikita Krupen'ko <[email protected]>
+* NVIDIA Corporation <www.nvidia.com>
+* OpenGamma Ltd. <opengamma.com>
+* Patrick Stotko <[email protected]>
+* Per Øyvind Karlsen <[email protected]>
+* Peter Collingbourne <[email protected]>
+* Petr Gotthard <[email protected]>
+* Philip Lowman <[email protected]>
+* Philippe Proulx <[email protected]>
+* Raffi Enficiaud, Max Planck Society
+* Raumfeld <raumfeld.com>
+* Roger Leigh <[email protected]>
+* Rolf Eike Beer <[email protected]>
+* Roman Donchenko <[email protected]>
+* Roman Kharitonov <[email protected]>
+* Ruslan Baratov
+* Sebastian Holtermann <[email protected]>
+* Stephen Kelly <[email protected]>
+* Sylvain Joubert <[email protected]>
+* The Qt Company Ltd.
+* Thomas Sondergaard <[email protected]>
+* Tobias Hunger <[email protected]>
+* Todd Gamblin <[email protected]>
+* Tristan Carel
+* University of Dundee
+* Vadim Zhukov
+* Will Dicharry <[email protected]>
+
+See version control history for details of individual contributions.
+
+Copyright
+=========
+
+The accompanying `LICENSE.rst`_ notice applies to distributions of CMake
+in source and binary form.  We do not require any formal copyright
+assignment or contributor license agreement.  Any contributions
+intentionally sent upstream are presumed to be offered under terms
+of the OSI-approved BSD 3-clause License.
+
+Third-party software packages supplied with CMake under compatible
+licenses provide their own copyright notices documented in corresponding
+subdirectories or source files.
+
+.. _`LICENSE.rst`: LICENSE.rst

+ 1 - 117
LICENSE.rst

@@ -1,4 +1,4 @@
-Copyright 2000-2025 Kitware, Inc. and Contributors
+Copyright 2000-2025 Kitware, Inc. and `Contributors <CONTRIBUTORS.rst>`_
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -26,119 +26,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Contributors
-************
-
-The following individuals and institutions are among the contributors:
-
-* Aaron C. Meadows <[email protected]>
-* Adriaan de Groot <[email protected]>
-* Aleksey Avdeev <[email protected]>
-* Alexander Neundorf <[email protected]>
-* Alexander Smorkalov <[email protected]>
-* Alexey Sokolov <[email protected]>
-* Alex Merry <[email protected]>
-* Alex Turbov <[email protected]>
-* Andreas Pakulat <[email protected]>
-* Andreas Schneider <[email protected]>
-* André Rigland Brodtkorb <[email protected]>
-* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf
-* Benjamin Eikel
-* Bjoern Ricks <[email protected]>
-* Brad Hards <[email protected]>
-* Christopher Harvey
-* Christoph Grüninger <[email protected]>
-* Clement Creusot <[email protected]>
-* Daniel Blezek <[email protected]>
-* Daniel Pfeifer <[email protected]>
-* Dawid Wróbel <[email protected]>
-* Enrico Scholz <[email protected]>
-* Eran Ifrah <[email protected]>
-* Esben Mose Hansen, Ange Optimization ApS
-* Geoffrey Viola <[email protected]>
-* Google Inc
-* Gregor Jasny
-* Helio Chissini de Castro <[email protected]>
-* Ilya Lavrenov <[email protected]>
-* Insight Software Consortium <insightsoftwareconsortium.org>
-* Intel Corporation <www.intel.com>
-* Jan Woetzel
-* Jordan Williams <[email protected]>
-* Julien Schueller
-* Kelly Thompson <[email protected]>
-* Konstantin Podsvirov <[email protected]>
-* Laurent Montel <[email protected]>
-* Mario Bensi <[email protected]>
-* Martin Gräßlin <[email protected]>
-* Mathieu Malaterre <[email protected]>
-* Matthaeus G. Chajdas
-* Matthias Kretz <[email protected]>
-* Matthias Maennich <[email protected]>
-* Michael Hirsch, Ph.D. <www.scivision.co>
-* Michael Stürmer
-* Miguel A. Figueroa-Villanueva
-* Mike Durso <[email protected]>
-* Mike Jackson
-* Mike McQuaid <[email protected]>
-* Nicolas Bock <[email protected]>
-* Nicolas Despres <[email protected]>
-* Nikita Krupen'ko <[email protected]>
-* NVIDIA Corporation <www.nvidia.com>
-* OpenGamma Ltd. <opengamma.com>
-* Patrick Stotko <[email protected]>
-* Per Øyvind Karlsen <[email protected]>
-* Peter Collingbourne <[email protected]>
-* Petr Gotthard <[email protected]>
-* Philip Lowman <[email protected]>
-* Philippe Proulx <[email protected]>
-* Raffi Enficiaud, Max Planck Society
-* Raumfeld <raumfeld.com>
-* Roger Leigh <[email protected]>
-* Rolf Eike Beer <[email protected]>
-* Roman Donchenko <[email protected]>
-* Roman Kharitonov <[email protected]>
-* Ruslan Baratov
-* Sebastian Holtermann <[email protected]>
-* Stephen Kelly <[email protected]>
-* Sylvain Joubert <[email protected]>
-* The Qt Company Ltd.
-* Thomas Sondergaard <[email protected]>
-* Tobias Hunger <[email protected]>
-* Todd Gamblin <[email protected]>
-* Tristan Carel
-* University of Dundee
-* Vadim Zhukov
-* Will Dicharry <[email protected]>
-
-See version control history for details of individual contributions.
-
-Copyright
-=========
-
-The above copyright notice applies to distributions of CMake
-in source and binary form.  We do not require any formal copyright
-assignment or contributor license agreement.  Any contributions
-intentionally sent upstream are presumed to be offered under terms
-of the OSI-approved BSD 3-clause License.
-
-Third-party software packages supplied with CMake under compatible
-licenses provide their own copyright notices documented in corresponding
-subdirectories or source files.
-
-Sponsorship
-===========
-
-CMake was initially developed by Kitware with the following sponsorship:
-
-* National Library of Medicine at the National Institutes of Health
-  as part of the Insight Segmentation and Registration Toolkit (ITK).
-
-* US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-  Visualization Initiative.
-
-* National Alliance for Medical Image Computing (NAMIC) is funded by the
-  National Institutes of Health through the NIH Roadmap for Medical Research,
-  Grant U54 EB005149.
-
-* Kitware, Inc.

+ 3 - 1
Source/CMakeCopyright.cmake

@@ -1,7 +1,9 @@
 # CMake license file and copyright line.
 set(CMake_LICENSE_FILE "${CMake_SOURCE_DIR}/LICENSE.rst")
 file(STRINGS "${CMake_LICENSE_FILE}" CMake_COPYRIGHT_LINE LIMIT_COUNT 1 REGEX "^Copyright ")
-if(NOT CMake_COPYRIGHT_LINE MATCHES [[^Copyright 2000-2[0-9][0-9][0-9] Kitware, Inc\. and Contributors$]])
+if(CMake_COPYRIGHT_LINE MATCHES [[^(Copyright 2000-2[0-9][0-9][0-9] Kitware, Inc\. and )`(Contributors) <CONTRIBUTORS.rst>`_$]])
+  set(CMake_COPYRIGHT_LINE "${CMAKE_MATCH_1}${CMAKE_MATCH_2}")
+else()
   message(FATAL_ERROR
     "The CMake license file:\n"
     "  ${CMake_LICENSE_FILE}\n"