[PATCH 1/6] cmake: don't copy chainlint.pl to build directory
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Dec 19, 2022, 18:39 UTC
- Message-ID
- <patch-1.6-95a6ce2f1c7-20221219T183623Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.6-00000000000-20221219T183623Z-avarab@gmail.com>
When [1] made this copy of "chainlint.sed" the script was invoked in the test-lib.sh as:
[...] sed -f "$GIT_BUILD_DIR/t/chainlint.sed" [...]
But when [2] replaced "chainlint.sed" with a "chainlint.pl" it also replaced that "$GIT_BUILD_DIR" with "$TEST_DIRECTORY", invoking it as:
"$PERL_PATH" "$TEST_DIRECTORY/chainlint.pl" "$0"
So this line could have been deleted in [2] but wasn't. Let's do that now.
1. 7f5397a07c6 (cmake: support for testing git when building out of the source tree, 2020-06-26) 2. 23a14f30166 (test-lib: replace chainlint.sed with chainlint.pl, 2022-09-01)
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- contrib/buildsystems/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-)
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 80290edd72a..c641e9349c9 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -1106,7 +1106,6 @@ if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH}) file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake "file(WRITE ${CMAKE_SOURCE_DIR}/GIT-BUILD-DIR \"${CMAKE_BINARY_DIR}\")") #misc copies - file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.pl DESTINATION ${CMAKE_BINARY_DIR}/t/) file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/) file(GLOB mergetools "${CMAKE_SOURCE_DIR}/mergetools/*") file(COPY ${mergetools} DESTINATION ${CMAKE_BINARY_DIR}/mergetools/)
-- 2.39.0.1071.g97ce8966538