浏览代码

LICENSE: Rename Copyright.txt to LICENSE.rst

The name `LICENSE` is now more conventional.
Format as reStructuredText to improve rendering.
Brad King 7 月之前
父节点
当前提交
2d42a5444f

+ 1 - 1
.codespellrc

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

+ 1 - 1
.gitlab/ci/cmake_version_update.sh

@@ -25,7 +25,7 @@ for try in $(seq $n); do
   git reset -q --hard FETCH_HEAD
   git reset -q --hard FETCH_HEAD
   Source/CMakeVersion.bash
   Source/CMakeVersion.bash
   git update-index -q --ignore-missing --refresh
   git update-index -q --ignore-missing --refresh
-  modified=$(git diff-index --name-only HEAD -- "Source/CMakeVersion.cmake" "Copyright.txt")
+  modified=$(git diff-index --name-only HEAD -- "Source/CMakeVersion.cmake" "LICENSE.rst")
   if test -n "$modified"; then
   if test -n "$modified"; then
     echo "version changed"
     echo "version changed"
     git add -u
     git add -u

+ 1 - 1
.typos.toml

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

+ 2 - 2
CONTRIBUTING.rst

@@ -74,6 +74,6 @@ License
 We do not require any formal copyright assignment or contributor license
 We do not require any formal copyright assignment or contributor license
 agreement.  Any contributions intentionally sent upstream are presumed
 agreement.  Any contributions intentionally sent upstream are presumed
 to be offered under terms of the OSI-approved BSD 3-clause License.
 to be offered under terms of the OSI-approved BSD 3-clause License.
-See `Copyright.txt`_ for details.
+See `LICENSE.rst`_ for details.
 
 
-.. _`Copyright.txt`: Copyright.txt
+.. _`LICENSE.rst`: LICENSE.rst

+ 0 - 0
Copyright.txt → LICENSE.rst


+ 2 - 2
README.rst

@@ -22,9 +22,9 @@ License
 =======
 =======
 
 
 CMake is distributed under the OSI-approved BSD 3-clause License.
 CMake is distributed under the OSI-approved BSD 3-clause License.
-See `Copyright.txt`_ for details.
+See `LICENSE.rst`_ for details.
 
 
-.. _`Copyright.txt`: Copyright.txt
+.. _`LICENSE.rst`: LICENSE.rst
 
 
 Building CMake
 Building CMake
 ==============
 ==============

+ 1 - 1
Source/CMakeCopyright.cmake

@@ -1,5 +1,5 @@
 # CMake license file and copyright line.
 # CMake license file and copyright line.
-set(CMake_LICENSE_FILE "${CMake_SOURCE_DIR}/Copyright.txt")
+set(CMake_LICENSE_FILE "${CMake_SOURCE_DIR}/LICENSE.rst")
 file(STRINGS "${CMake_LICENSE_FILE}" CMake_COPYRIGHT_LINE LIMIT_COUNT 1 REGEX "^Copyright ")
 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(NOT CMake_COPYRIGHT_LINE MATCHES [[^Copyright 2000-2[0-9][0-9][0-9] Kitware, Inc\. and Contributors$]])
   message(FATAL_ERROR
   message(FATAL_ERROR

+ 1 - 1
Source/CMakeVersion.bash

@@ -12,6 +12,6 @@ if version_patch_line=$(grep -E '^set\(CMake_VERSION_PATCH [0-9]{8}\)' "$version
   if [[ "$version_patch_year" =~ ^[0-9][0-9][0-9][0-9]$ ]] ; then
   if [[ "$version_patch_year" =~ ^[0-9][0-9][0-9][0-9]$ ]] ; then
     sed -i -e '
     sed -i -e '
       s/\(^Copyright 2000-\)[0-9][0-9][0-9][0-9]\( .*\)/\1'"$version_patch_year"'\2/
       s/\(^Copyright 2000-\)[0-9][0-9][0-9][0-9]\( .*\)/\1'"$version_patch_year"'\2/
-    ' "${BASH_SOURCE%/*}/../Copyright.txt"
+    ' "${BASH_SOURCE%/*}/../LICENSE.rst"
   fi
   fi
 fi
 fi

+ 4 - 4
Tests/CMakeCopyright.cmake

@@ -1,21 +1,21 @@
 if(CMAKE_VERSION MATCHES "\\.(20[0-9][0-9])[0-9][0-9][0-9][0-9](-|$)")
 if(CMAKE_VERSION MATCHES "\\.(20[0-9][0-9])[0-9][0-9][0-9][0-9](-|$)")
   set(version_year "${CMAKE_MATCH_1}")
   set(version_year "${CMAKE_MATCH_1}")
   set(copyright_line_regex "^Copyright 2000-(20[0-9][0-9]) Kitware")
   set(copyright_line_regex "^Copyright 2000-(20[0-9][0-9]) Kitware")
-  file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../Copyright.txt" copyright_line
+  file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/../LICENSE.rst" copyright_line
     LIMIT_COUNT 1 REGEX "${copyright_line_regex}")
     LIMIT_COUNT 1 REGEX "${copyright_line_regex}")
   if(copyright_line MATCHES "${copyright_line_regex}")
   if(copyright_line MATCHES "${copyright_line_regex}")
     set(copyright_year "${CMAKE_MATCH_1}")
     set(copyright_year "${CMAKE_MATCH_1}")
     if(copyright_year LESS version_year)
     if(copyright_year LESS version_year)
-      message(FATAL_ERROR "Copyright.txt contains\n"
+      message(FATAL_ERROR "LICENSE.rst contains\n"
         " ${copyright_line}\n"
         " ${copyright_line}\n"
         "but the current version year is ${version_year}.")
         "but the current version year is ${version_year}.")
     else()
     else()
-      message(STATUS "PASSED: Copyright.txt contains\n"
+      message(STATUS "PASSED: LICENSE.rst contains\n"
         " ${copyright_line}\n"
         " ${copyright_line}\n"
         "and the current version year is ${version_year}.")
         "and the current version year is ${version_year}.")
     endif()
     endif()
   else()
   else()
-    message(FATAL_ERROR "Copyright.txt has no Copyright line of expected format!")
+    message(FATAL_ERROR "LICENSE.rst has no Copyright line of expected format!")
   endif()
   endif()
 else()
 else()
   message(STATUS "SKIPPED: CMAKE_VERSION does not know the year: ${CMAKE_VERSION}")
   message(STATUS "SKIPPED: CMAKE_VERSION does not know the year: ${CMAKE_VERSION}")

+ 1 - 1
Tests/CMakeTests/ModuleNoticesTest.cmake.in

@@ -1,6 +1,6 @@
 # Regex to match license notices at the top of module files.
 # Regex to match license notices at the top of module files.
 set(notice_regex [[^# Distributed under the OSI-approved BSD 3-Clause License\.  See accompanying
 set(notice_regex [[^# Distributed under the OSI-approved BSD 3-Clause License\.  See accompanying
-# file Copyright\.txt or https://cmake\.org/licensing for details\.
+# file LICENSE\.rst or https://cmake\.org/licensing for details\.
 
 
 ]])
 ]])
 string(REPLACE "\n" "\r?\n" notice_regex "${notice_regex}")
 string(REPLACE "\n" "\r?\n" notice_regex "${notice_regex}")

+ 1 - 1
bootstrap

@@ -64,7 +64,7 @@ if test "$cmake_version_rc" != ""; then
   cmake_version="${cmake_version}-rc${cmake_version_rc}"
   cmake_version="${cmake_version}-rc${cmake_version_rc}"
 fi
 fi
 
 
-cmake_copyright="`grep '^Copyright .* Kitware' "${cmake_source_dir}/Copyright.txt"`"
+cmake_copyright="`grep '^Copyright .* Kitware' "${cmake_source_dir}/LICENSE.rst"`"
 
 
 cmake_bin_dir_keyword="OTHER"
 cmake_bin_dir_keyword="OTHER"
 cmake_data_dir_keyword="OTHER"
 cmake_data_dir_keyword="OTHER"