From 6ce9152a618b37e5a914248f6ca6c8b7b54ef3e3 Mon Sep 17 00:00:00 2001 From: Thomas Heinrichs <46387399+Thomas1664@users.noreply.github.com> Date: Thu, 30 Jun 2022 09:33:01 +0200 Subject: [PATCH] Rename to vcpkg_concat_copyright --- docs/maintainers/maintainer-guide.md | 2 +- docs/maintainers/portfile-functions.md | 2 +- ...nstall_copyright.md => vcpkg_concat_copyright.md} | 12 ++++++------ ..._copyright.cmake => vcpkg_concat_copyright.cmake} | 2 +- scripts/ports.cmake | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename docs/maintainers/{vcpkg_install_copyright.md => vcpkg_concat_copyright.md} (70%) rename scripts/cmake/{vcpkg_install_copyright.cmake => vcpkg_concat_copyright.cmake} (94%) diff --git a/docs/maintainers/maintainer-guide.md b/docs/maintainers/maintainer-guide.md index 6d40b6974c..b6d739807d 100644 --- a/docs/maintainers/maintainer-guide.md +++ b/docs/maintainers/maintainer-guide.md @@ -119,7 +119,7 @@ file(INSTALL "${SOURCE_PATH}LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/ Replace `LICENSE` with the actual file name. -If there are multiple license files, use [`vcpkg_install_copyright()`](vcpkg_install_copyright.md) instead. +If there are multiple license files, use [`vcpkg_concat_copyright()`](vcpkg_concat_copyright.md) instead. ## Features diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md index b1719b2837..6cb1618901 100644 --- a/docs/maintainers/portfile-functions.md +++ b/docs/maintainers/portfile-functions.md @@ -18,6 +18,7 @@ - [vcpkg\_clean\_executables\_in\_bin](vcpkg_clean_executables_in_bin.md) - [vcpkg\_clean\_msbuild](vcpkg_clean_msbuild.md) - [vcpkg\_common\_definitions](vcpkg_common_definitions.md) +- [vcpkg_concat_copyright](vcpkg_concat_copyright.md) - [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md) (deprecated, use [vcpkg\_cmake\_configure](vcpkg_cmake_configure.md)) - [vcpkg\_configure\_gn](vcpkg_configure_gn.md) (deprecated, use [vcpkg\_gn\_configure](ports/vcpkg-gn/vcpkg_gn_configure.md)) - [vcpkg\_configure\_make](vcpkg_configure_make.md) @@ -48,7 +49,6 @@ - [vcpkg\_host\_path\_list](vcpkg_host_path_list.md) - [vcpkg\_install\_cmake](vcpkg_install_cmake.md) (deprecated, use [vcpkg\_cmake\_install](ports/vcpkg-cmake/vcpkg_cmake_install.md)) - [vcpkg\_install\_gn](vcpkg_install_gn.md) (deprecated, use [vcpkg\_gn\_install](ports/vcpkg-gn/vcpkg_gn_install.md)) -- [vcpkg_install_copyright](vcpkg_install_copyright.md) - [vcpkg\_install\_make](vcpkg_install_make.md) - [vcpkg\_install\_meson](vcpkg_install_meson.md) - [vcpkg\_install\_msbuild](vcpkg_install_msbuild.md) diff --git a/docs/maintainers/vcpkg_install_copyright.md b/docs/maintainers/vcpkg_concat_copyright.md similarity index 70% rename from docs/maintainers/vcpkg_install_copyright.md rename to docs/maintainers/vcpkg_concat_copyright.md index 7a3ba03a8e..34461b5cd0 100644 --- a/docs/maintainers/vcpkg_install_copyright.md +++ b/docs/maintainers/vcpkg_concat_copyright.md @@ -1,13 +1,13 @@ -# vcpkg_install_copyright +# vcpkg_concat_copyright -The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_install_copyright.md). +The latest version of this document lives in the [vcpkg repo](https://github.com/Microsoft/vcpkg/blob/master/docs/maintainers/vcpkg_concat_copyright.md). Merges multiple copyright files into a single file and install it. ## Usage ```cmake -vcpkg_install_copyright(FILE_LIST ... [COMMENT]) +vcpkg_concat_copyright(FILE_LIST ... [COMMENT]) ``` ## Parameters @@ -57,16 +57,16 @@ Lorem ipsum dolor sit amet... ## Examples ```cmake -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE/license.md" "${SOURCE_PATH}/LICENSE/license_gpl.md" COMMENT "This is a comment") +vcpkg_concat_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE/license.md" "${SOURCE_PATH}/LICENSE/license_gpl.md" COMMENT "This is a comment") ``` You can also collect the required files using a `GLOB` pattern: ```cmake file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") -vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) +vcpkg_concat_copyright(FILE_LIST ${LICENSE_FILES}) ``` ## Source -[vcpkg_install_copyright.md](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_install_copyright.cmake) +[vcpkg_concat_copyright.md](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_concat_copyright.cmake) diff --git a/scripts/cmake/vcpkg_install_copyright.cmake b/scripts/cmake/vcpkg_concat_copyright.cmake similarity index 94% rename from scripts/cmake/vcpkg_install_copyright.cmake rename to scripts/cmake/vcpkg_concat_copyright.cmake index e4c50ddf62..607e6adb51 100644 --- a/scripts/cmake/vcpkg_install_copyright.cmake +++ b/scripts/cmake/vcpkg_concat_copyright.cmake @@ -1,4 +1,4 @@ -function(vcpkg_install_copyright) +function(vcpkg_concat_copyright) cmake_parse_arguments(PARSE_ARGV 0 arg "" "COMMENT" "FILE_LIST") if(DEFINED arg_UNPARSED_ARGUMENTS) diff --git a/scripts/ports.cmake b/scripts/ports.cmake index 312b02ff09..4c307b09e3 100644 --- a/scripts/ports.cmake +++ b/scripts/ports.cmake @@ -18,6 +18,7 @@ include("${SCRIPTS}/cmake/vcpkg_check_features.cmake") include("${SCRIPTS}/cmake/vcpkg_check_linkage.cmake") include("${SCRIPTS}/cmake/vcpkg_clean_executables_in_bin.cmake") include("${SCRIPTS}/cmake/vcpkg_clean_msbuild.cmake") +include("${SCRIPTS}/cmake/vcpkg_concat_copyright.cmake") include("${SCRIPTS}/cmake/vcpkg_configure_cmake.cmake") include("${SCRIPTS}/cmake/vcpkg_configure_gn.cmake") include("${SCRIPTS}/cmake/vcpkg_configure_make.cmake") @@ -45,7 +46,6 @@ include("${SCRIPTS}/cmake/vcpkg_get_program_files_platform_bitness.cmake") include("${SCRIPTS}/cmake/vcpkg_get_windows_sdk.cmake") include("${SCRIPTS}/cmake/vcpkg_host_path_list.cmake") include("${SCRIPTS}/cmake/vcpkg_install_cmake.cmake") -include("${SCRIPTS}/cmake/vcpkg_install_copyright.cmake") include("${SCRIPTS}/cmake/vcpkg_install_gn.cmake") include("${SCRIPTS}/cmake/vcpkg_install_make.cmake") include("${SCRIPTS}/cmake/vcpkg_install_meson.cmake")