diff --git a/.codespellrc b/.codespellrc index 2551ccab30..6b1398b25a 100644 --- a/.codespellrc +++ b/.codespellrc @@ -10,8 +10,8 @@ skip = .git, .typos.toml, build, - Copyright.txt, CTestCustom.cmake.in, + LICENSE.rst, Modules/Internal/CPack/NSIS.template.in, Source/CursesDialog/form/*, Source/kwsys/*, diff --git a/.gitlab/ci/cmake_version_update.sh b/.gitlab/ci/cmake_version_update.sh index 3c05dfeb23..e73419d78a 100755 --- a/.gitlab/ci/cmake_version_update.sh +++ b/.gitlab/ci/cmake_version_update.sh @@ -25,7 +25,7 @@ for try in $(seq $n); do git reset -q --hard FETCH_HEAD Source/CMakeVersion.bash 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 echo "version changed" git add -u diff --git a/.typos.toml b/.typos.toml index c06745a69c..d1ccb1224b 100644 --- a/.typos.toml +++ b/.typos.toml @@ -57,7 +57,7 @@ SEH = "SEH" ignore-hidden = false ignore-dot = false extend-exclude = [ - "Copyright.txt" + "LICENSE.rst" # Exclude third-party sources. , "Source/CursesDialog/form/" , "Source/kwsys/" diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 88f39f18ea..7247467b43 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -74,6 +74,6 @@ License 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. -See `Copyright.txt`_ for details. +See `LICENSE.rst`_ for details. -.. _`Copyright.txt`: Copyright.txt +.. _`LICENSE.rst`: LICENSE.rst diff --git a/Copyright.txt b/LICENSE.rst similarity index 100% rename from Copyright.txt rename to LICENSE.rst diff --git a/README.rst b/README.rst index 8a471db0e9..3eefaf9b5d 100644 --- a/README.rst +++ b/README.rst @@ -22,9 +22,9 @@ 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 ============== diff --git a/Source/CMakeCopyright.cmake b/Source/CMakeCopyright.cmake index 8965cf69e0..ce0d2ed363 100644 --- a/Source/CMakeCopyright.cmake +++ b/Source/CMakeCopyright.cmake @@ -1,5 +1,5 @@ # 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 ") if(NOT CMake_COPYRIGHT_LINE MATCHES [[^Copyright 2000-2[0-9][0-9][0-9] Kitware, Inc\. and Contributors$]]) message(FATAL_ERROR diff --git a/Source/CMakeVersion.bash b/Source/CMakeVersion.bash index 59f8ec284a..f0e4996d82 100755 --- a/Source/CMakeVersion.bash +++ b/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 sed -i -e ' 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 diff --git a/Tests/CMakeCopyright.cmake b/Tests/CMakeCopyright.cmake index a7201e97d1..2c3c95d098 100644 --- a/Tests/CMakeCopyright.cmake +++ b/Tests/CMakeCopyright.cmake @@ -1,21 +1,21 @@ if(CMAKE_VERSION MATCHES "\\.(20[0-9][0-9])[0-9][0-9][0-9][0-9](-|$)") set(version_year "${CMAKE_MATCH_1}") 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}") if(copyright_line MATCHES "${copyright_line_regex}") set(copyright_year "${CMAKE_MATCH_1}") if(copyright_year LESS version_year) - message(FATAL_ERROR "Copyright.txt contains\n" + message(FATAL_ERROR "LICENSE.rst contains\n" " ${copyright_line}\n" "but the current version year is ${version_year}.") else() - message(STATUS "PASSED: Copyright.txt contains\n" + message(STATUS "PASSED: LICENSE.rst contains\n" " ${copyright_line}\n" "and the current version year is ${version_year}.") endif() 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() else() message(STATUS "SKIPPED: CMAKE_VERSION does not know the year: ${CMAKE_VERSION}") diff --git a/Tests/CMakeTests/ModuleNoticesTest.cmake.in b/Tests/CMakeTests/ModuleNoticesTest.cmake.in index 7ae6607fa9..a9efd50de3 100644 --- a/Tests/CMakeTests/ModuleNoticesTest.cmake.in +++ b/Tests/CMakeTests/ModuleNoticesTest.cmake.in @@ -1,6 +1,6 @@ # 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 -# 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}") diff --git a/bootstrap b/bootstrap index 644260b556..e69f1ebcc3 100755 --- a/bootstrap +++ b/bootstrap @@ -64,7 +64,7 @@ if test "$cmake_version_rc" != ""; then cmake_version="${cmake_version}-rc${cmake_version_rc}" 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_data_dir_keyword="OTHER"