From patchwork Tue Dec 17 17:31:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 13912264 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86D841F8EF6 for ; Tue, 17 Dec 2024 17:32:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456727; cv=none; b=UDd5zKU+K0sdz4d5/+g2MTLBfoEtTHVZ6YpIjxgB0sK5vw2koaKh9EvPUbyJ32OfXzEq4/zLL6cfvsKeThlSCBYcLTq27pRRFOrHVDSx8tOUlhuFat3PctiIKf7ULTiMJBWoMoiROAy9TyB3pZNOraowGCldGOegTGwbGqioCeI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456727; c=relaxed/simple; bh=bgHXxMQSrD5tijJ6ez7EoXYM5JxCBx2QcB7M1ISAw6g=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=JDgGWQLEe+ut8ulZe0bfLLcOHb5obYUbguRSWcpa23Lb3De502+xZStyj4QdURHQuk/yoDMUdm+ms12sFvHXswVABc+yfR+w/Aig7UA83bIbrMhqw/57Yx+zA9Xzp9m5OLf2t+T4ijGNlwg1w4pVpXmfQOYybNURFPztnIxyJD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=AB/WqLHs; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AB/WqLHs" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43621d27adeso39289415e9.2 for ; Tue, 17 Dec 2024 09:32:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734456723; x=1735061523; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=/O/DpKuJJiAyJAaszUEC2BEOuV/2AgG46dlUjVauZbA=; b=AB/WqLHs2hp8BhoHz4Cp1KXQpMpaH6giBnKRfMb0THE8IDcG+qleiQY9sf/OWpHYVt 6r1C/7MZ1h6CSDyCFKOmaFngWfetuhuRrqleC/kDacZTno7ixyWVQ00TaxXgk6K7Jzna EJJ4x5Xx6u0Jwe9IyTcVSxtQo5r+yU/4rnwpgt0gZebvc20mXYBXf9c7Owb5sT+pxa9P 1cNU+/05sZWr6MzoLU0Dobnt66dQqAbGZtuvDWwvdYTjItK4PkYPSFbFl/8xoW2Ky3FZ 4Udbr0yE0KScEugoS2sOB/gASw+9lPAVRNk/aU+hpcp5jFRiZU2W95kY0oYNhxG8af0U c21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734456723; x=1735061523; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/O/DpKuJJiAyJAaszUEC2BEOuV/2AgG46dlUjVauZbA=; b=cqd/BYTd3sRz2ZFb7aivGR6XA063fJRROlFK6CsRFy4T6B/gpp0oEGEfE/Uj6mSvA8 Qj2ktI5DzwEzh3jqs+O5sbmxyv7p+s05z/1q6GSTDY1QkMXsatm7QKxp7oynrDpcOp3W C8z2C7R1u+AKcQZlbhleKf0Czj0G379qzdnDH4M7DRRtT/YKEMi/raRv/nevxX6U4z8F EWt2Zve1iD6tqbp6VOVCwtXiyuA47P/xMbOMuxDNrnmri7IbcGysvcdumu5HcEW3IrkT 4qUZkyGIqCB/GYUfHcV1qR1jf3JqMfYinauasZl99Op4Q0IatOVCZn4M9RHxQESYlj0S Kntg== X-Gm-Message-State: AOJu0YwFf32/Im/abfGiBlgrbYNmqCexuQO5ajxIX7pPQyACHaUs+Jeb l/DzkiLCXB7LtDgMCIMYdjoCJykveype52aoT+iffvBavDVHHA3bmJs3xw== X-Gm-Gg: ASbGnctGRNCYSmnirN4TyuklN7nJnr0Od3ZlxdpxYN1trcqwHTiSJbstNEdBD+TMtUj Py7EGddwG6hMH1v12MSMKEyTwoIkvFa97sbvErxQsI+QyIxfAp/sXQIQjoAoteCP7iVbZ5iN3TK ho3at+woeV4CAUaISG+NNepg8YALxTtZiiP4ZPFILS9UnRQdCLe2RzVsNRVRKEsmmDUIP+aUIpu PsxrPVs71Gu2UfpcIS5RC/+1S1GmRITUQqHbNBcFuDWPD+HFqce9w4+lg== X-Google-Smtp-Source: AGHT+IEHFiVjLIvDzweQiWNenJzjwcqSTMignUtakiGI3IMeVZo7UwxL6VbEKpI/Qcl7xvpEKUt8Eg== X-Received: by 2002:a05:6000:1ac9:b0:382:47d0:64b1 with SMTP id ffacd0b85a97d-38880ac61ebmr16066092f8f.2.1734456723188; Tue, 17 Dec 2024 09:32:03 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436360154c7sm123180125e9.1.2024.12.17.09.32.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 09:32:02 -0800 (PST) Message-Id: <187888ca9cd723d78b7bb96ba4d10a64450f553d.1734456721.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 17 Dec 2024 17:31:57 +0000 Subject: [PATCH 1/5] cmake: better support for out-of-tree builds follow-up Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Johannes Schindelin , Johannes Schindelin From: Johannes Schindelin From: Johannes Schindelin In 7e0730c8baa (t: better support for out-of-tree builds, 2024-12-06), the `bin-wrappers/` strategy was changed so that it no longer hard-codes the template directory to be `@BUILD_DIR@/templates/blt`, but instead interpolates the `@TEMPLATE_DIR@` placeholder during the build. However, this commit only adjusted the `Makefile`-based build. Let's adjust the CMake-based build as well. This fixes t0000.15 which would otherwise fail with: ++ echo ''\''t1234-verbose/err'\'' is not empty, it contains:' 't1234-verbose/err' is not empty, it contains: ++ cat t1234-verbose/err warning: templates not found in @TEMPLATE_DIR@ Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 49904ca8a93..926f0d7b86c 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -1087,6 +1087,7 @@ set(wrapper_test_scripts foreach(script ${wrapper_scripts}) file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME) string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}") + string(REPLACE "@TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" content "${content}") string(REPLACE "@PROG@" "${CMAKE_BINARY_DIR}/${script}${EXE_EXTENSION}" content "${content}") file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) endforeach() @@ -1094,12 +1095,14 @@ endforeach() foreach(script ${wrapper_test_scripts}) file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME) string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}") + string(REPLACE "@TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" content "${content}") string(REPLACE "@PROG@" "${CMAKE_BINARY_DIR}/t/helper/${script}${EXE_EXTENSION}" content "${content}") file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content}) endforeach() file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME) string(REPLACE "@BUILD_DIR@" "${CMAKE_BINARY_DIR}" content "${content}") +string(REPLACE "@TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" content "${content}") string(REPLACE "@GIT_TEXTDOMAINDIR@" "${CMAKE_BINARY_DIR}/po/build/locale" content "${content}") string(REPLACE "@GITPERLLIB@" "${CMAKE_BINARY_DIR}/perl/build/lib" content "${content}") string(REPLACE "@MERGE_TOOLS_DIR@" "${CMAKE_SOURCE_DIR}/mergetools" content "${content}") From patchwork Tue Dec 17 17:31:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 13912265 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BD57B1F8EF8 for ; Tue, 17 Dec 2024 17:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456728; cv=none; b=A7Q+mYf9LMWwyp4kbf/QwqranXNwK7JEDz0eC2BZQ+SJjpGv52gFBsoZpJGVLkbQuFl8xA3PltxE1RmwpoACNDADofVshA3rqqW7hzE/1ydbCvrXR66Dm0YAV5mqOINHn+d/bLVNrtgU6gJWDK3oW/UjEge6o+EvW7Xwlp1bPAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456728; c=relaxed/simple; bh=P6FA2brIU34vW7hhp1bnEEGgTpm5cTf03OWRiJtK4bk=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=oAoazMcz+mID/py+bY1mEtr19b3l3ksAV3gLxLXeoWEXoR826AEcRgRkTOP9qtByItxi+bw9qk3q816frOvrOZX6JyoHRQaSTq3sOYfSYBUEtdRqG/7Ruhdki64EGetTzXjHzdg6a19ankszTaXt66KBecncHi8P2UKjO7c+okw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ck3i6ESL; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ck3i6ESL" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4363ae65100so32632015e9.0 for ; Tue, 17 Dec 2024 09:32:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734456725; x=1735061525; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=UakZ+hvIcUvU724qRc20K/pSWwgLYi23Yx4m+v6xfWk=; b=ck3i6ESLWoonDGI1HQUlAgkdhTkt3xqTuj/rilPFaIHHe/3fsUHig2xmIS7434lhCC ZaUHIdIqPdAIzfX82AeIwW+c0XtuDAE0MigiqAnkwhI89JlTiNtQEfDhF6aWp+uprqzq WoZTQ13FkO6QNFncf8m/N+LtqAHR74VKfOqiiEksNCKcL5E1I1M4HENISSMYmOoYvbZG Ig+pE9tT/cM2Kjrqi8/JhSG5F7QYJz+DNuxh7zoVD2SxypTqyTgqfGxmP3T+u7+bZpVX RKe5dajr3ahMvwpDNu33XKlsn+YGyunS6Rlp+taxcw4vKD3QsiGErKMhIs8QOdtEfN55 9JpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734456725; x=1735061525; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UakZ+hvIcUvU724qRc20K/pSWwgLYi23Yx4m+v6xfWk=; b=OnFFJP1wTvd0w0SlGD48VpF4hrG5B8tCLHz4CPm8LzIhsO7xfGhRP2TNNcun4HNGZf krzyGQLsa62LJKXXGK9I8DzMJO8ShqAOVxeauEm5672zSTBYe2PluNhWgaizAt2Kzt+W MFsufCpCcCIabP8J3UQ6IOGOlNilpMnIUO1rfZ/icE7nl9eg70DUH8JAxytgOEZETF7U ZhIM9RpEU5BUjOVGhIOls/nHtqsxYBfD7d2Wpvi1JbKId0meL2PgAsgiKErBaLpuwZ5i yQJTC0DMIijaL6hsh+sSRWMw1S15BbB8OTcTNkjVlGRIj6jJgSstsp4KKXvgcJ0/SLBy 6nKA== X-Gm-Message-State: AOJu0Yx5toYHFZ18WY1TijvY9xcC3kAVZbwmSO52U6WJWg6hvRtSX9t6 ADDEzKcHx3AWnv/ifgi+gnU6ccKUlWuPZHVfGxCMn78VWoV4Aj6RTGB54g== X-Gm-Gg: ASbGncuZ51Oj+Wrd0MvuGUUIzanpHnJO7k8MRTcydlQWQ2pbdl+ChzATrukr9DyQ4HN eZT/8boJIcyVZrdUDHJBTfOP21kCYkoiiqwijgATN96764DY1ujSF8Qh6seVkXTdE5nn+6k0Jv3 /UCgfNrQ6edavETCqLekSGn/VlDlriZkS/CsJKuVfC0ZiMH/9uUIHMBlOjjFihW1bgmGMOQTpuX yHiIXbAjYEs0t8VD2BkZRlPeCiT5V5/cKMyN4K5hMcknotpH12GUORS0g== X-Google-Smtp-Source: AGHT+IFE8MsGfSqJBXm9SJVQvzdffG0uQywC0BTKSsEh7rAQ/nnQZTW3Bl0mdyQRkKQqPaqktl47WA== X-Received: by 2002:a05:600c:8518:b0:434:a04d:1670 with SMTP id 5b1f17b1804b1-4362a987aecmr185065525e9.0.1734456724534; Tue, 17 Dec 2024 09:32:04 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4363601574bsm123057005e9.7.2024.12.17.09.32.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 09:32:03 -0800 (PST) Message-Id: <1170b6d01f1a9aadd403a833650b16f9f3378e53.1734456721.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 17 Dec 2024 17:31:58 +0000 Subject: [PATCH 2/5] cmake(mergetools): better support for out-of-tree builds Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Johannes Schindelin , Johannes Schindelin From: Johannes Schindelin From: Johannes Schindelin In 7e0730c8baa (t: better support for out-of-tree builds, 2024-12-06) the strategy was changed from letting `t7609-mergetool--lib.sh` hard-code the directory where it expects to find the merge tools to hard-coding that value in the placeholder `@GIT_TEST_MERGE_TOOLS_DIR@` that is replaced during the build. However, likely due to a copy/paste mistake (and reviewers missed this, too), the CMake-based build was adjusted incorrectly, replacing that placeholder not with the path to the merge tools, but with a Boolean indicating whether to use a runtime-generated path prefix or not. Let's fix that, addressing this CMake-build's symptom: Initialized empty Git repository in D:/a/git/git/t/trash directory.t7609-mergetool--lib/.git/ ++ . true/vimdiff ./test-lib.sh: line 1021: true/vimdiff: No such file or directory Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 926f0d7b86c..3dd6b3a130e 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -1195,7 +1195,7 @@ string(REPLACE "@GIT_TEST_TEXTDOMAINDIR@" "'${CMAKE_BINARY_DIR}/po/build/locale' string(REPLACE "@GIT_TEST_POPATH@" "'${CMAKE_BINARY_DIR}/po'" git_build_options "${git_build_options}") string(REPLACE "@GIT_TEST_TEMPLATE_DIR@" "'${CMAKE_BINARY_DIR}/templates/blt'" git_build_options "${git_build_options}") string(REPLACE "@GIT_TEST_GITPERLLIB@" "'${CMAKE_BINARY_DIR}/perl/build/lib'" git_build_options "${git_build_options}") -string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}") +string(REPLACE "@GIT_TEST_MERGE_TOOLS_DIR@" "'${CMAKE_BINARY_DIR}/mergetools'" git_build_options "${git_build_options}") string(REPLACE "@RUNTIME_PREFIX@" "'${RUNTIME_PREFIX}'" git_build_options "${git_build_options}") string(REPLACE "@GITWEBDIR@" "'${GITWEBDIR}'" git_build_options "${git_build_options}") string(REPLACE "@USE_GETTEXT_SCHEME@" "" git_build_options "${git_build_options}") From patchwork Tue Dec 17 17:31:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 13912268 Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CEE01F8F02 for ; Tue, 17 Dec 2024 17:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456732; cv=none; b=s5TSH1HTl0jQJ3pHOgNBV0y1cS0SrfSEBTHIfBwLWX49igzeQdTdsIhrL2JFS89uy+jYOfpaBCPqpkFqyF8VCsJvjknX5q50N9FzMwFWJu2jgWPuX3NPLb/4EceH0OUlo++UgM+J15aGX1FZqv8t5V33VHtkDiLsYdCu8om57uU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456732; c=relaxed/simple; bh=C2cESSgGNnQgEaWwKXEfkHQO6Aeor5OmO4Jh1oJ5tYA=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=V1z3KTlE/xEUsXQ56Yn+u8wWD4K2Ozk64J4udnEfo0W32grkYAL+pyE2Q9q0G3lAsV3tCFa7CBRpHq5nyl8ULKg1ug33v2kCwY0BOCjgtLx02U65zQtPs1Q6nj3RAvS6YI7o5gDOilzT3I4UIOb0KSQMElY0eA0Q6XBoHcclzJA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=VXe5tt3V; arc=none smtp.client-ip=209.85.128.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VXe5tt3V" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-43634b570c1so27881945e9.0 for ; Tue, 17 Dec 2024 09:32:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734456725; x=1735061525; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=04q9NqqvW3HGbGsohWhTVicn0hqFEUGD2yemBcvOq7A=; b=VXe5tt3Ve7L0LZ4m2PNKaDsxixfVfv47PmHsaz9vNuJ4VdKX1PulDWWThlZqD5IROd GVFsZgrdjfd45L5/ZFAsl62kHwMxxiNafTwziqIlyL+YqBAZjgm/J0Uz2Q6R/jOMBPcu cwA7kfLruYD6DTSIM7PLKtzW3XmDK8GymEb7sY0g4fvZwlrYak8Mq2ODX0JRH5StyHsx naSYI5UJAMXY8iS4CKkadKb/BUm3nhxTWFIUyL/kCfBmSoraHvGsT7HiE+aLmLvDYHLL jPIwtnGJdTXg/W+u8OcNRT9IRA7xoFGTyDhZScBq3JV+COV+QoEx3toBxJNfCw/BnLm5 ixkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734456725; x=1735061525; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=04q9NqqvW3HGbGsohWhTVicn0hqFEUGD2yemBcvOq7A=; b=uviOTq59wDzFpoWLIdCDNS0Y6TEnYftMbNF4b4BU91qnoPtZI18WP6PszUp2b99sam ncG53hEYKRw7bDsy2C5a++YL8zaKxO6j77NqjqqX1GUzq4jxXTJ4mu/eKWD61C5cvnQS TIcCfJkymn1xE6w0DfA8jq3NAW/vvFXp4QVlOrGCBcwOStNwAe8wNFjNOxLZWzWJZX1Q u5FfgXCScu7RJqQFkNYefI3U3K7l10nSWb401wLevLmSjPYSmuniKcFXfzvKFwRtSetp xQ5I2CvqTZA1iZYrLyf/OBsE526lmb/GU+LhRaEuOjtcn/rG1FIBl5YADKy/IE9FQM6A u02A== X-Gm-Message-State: AOJu0Yxrgi3AAteKztWA28dOyrYwk7jIu/kw/elYQL6stA4/V9duxM8a aJpw/SVQxraSgpd4S/sMZGqsLbb3wSpG3sea1Sq7P45WyicNCGZQLd5YnA== X-Gm-Gg: ASbGncsy1j6TwRVCWd0zO3gElM0prSIovF4zcpz9PiUQ9uSYk0HjvlshsP9if3ADFUH GzAcpERtkHA49Lj33jlFnKyIyFvADfimsHySTDt1+waR8DLMikSmDrsfSh+Z60+xsRBV2Na3XF3 BysfU/ty4YY4uGAHfM5J6YjNy7kLyBOOp8Qo4kLHpBKDZZvxczLdxBMEmALuaa2961v+3ocR2NJ FY+ifObasxmZZJxSrc3ynqUBueMMAbcWC+gUojF08GW7IuiHFUAj0LPjQ== X-Google-Smtp-Source: AGHT+IE+aRua32MlQeG7WhWJBz12/RXnFxx5QmnP4otAV1LyfWU9wKT+HPcKRpKvgdBG6w0ZwyZ23Q== X-Received: by 2002:a5d:5984:0:b0:385:fc32:1ec6 with SMTP id ffacd0b85a97d-3888e0c081bmr13580835f8f.50.1734456725275; Tue, 17 Dec 2024 09:32:05 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c7fac5bbsm12114031f8f.0.2024.12.17.09.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 09:32:04 -0800 (PST) Message-Id: In-Reply-To: References: Date: Tue, 17 Dec 2024 17:31:59 +0000 Subject: [PATCH 3/5] cmake: use the correct file name for the Perl header Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Johannes Schindelin , Johannes Schindelin From: Johannes Schindelin From: Johannes Schindelin In e4b488049a5 (Makefile: extract script to massage Perl scripts, 2024-12-06), the code was refactored that is used to transform the Perl scripts/modules to their final form. Even the CMake-based build was adjusted, but the change used the file name `PERL-HEADER` instead of the file name used by the Makefile-based build (same name but with the `GIT-` prefix). Let's adjust the former to the latter. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 3dd6b3a130e..6f35cd66f39 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -867,7 +867,7 @@ list(TRANSFORM perl_modules REPLACE "${CMAKE_SOURCE_DIR}/" "") file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header ) string(REPLACE "@PATHSEP@" ":" perl_header "${perl_header}") string(REPLACE "@INSTLIBDIR@" "${INSTLIBDIR}" perl_header "${perl_header}") -file(WRITE ${CMAKE_BINARY_DIR}/PERL-HEADER ${perl_header}) +file(WRITE ${CMAKE_BINARY_DIR}/GIT-PERL-HEADER ${perl_header}) add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/GIT-VERSION-FILE" COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN" @@ -888,7 +888,7 @@ foreach(script ${git_perl_scripts} ${perl_modules}) COMMAND "${SH_EXE}" "${CMAKE_SOURCE_DIR}/generate-perl.sh" "${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS" "${CMAKE_BINARY_DIR}/GIT-VERSION-FILE" - "${CMAKE_BINARY_DIR}/PERL-HEADER" + "${CMAKE_BINARY_DIR}/GIT-PERL-HEADER" "${CMAKE_SOURCE_DIR}/${script}" "${CMAKE_BINARY_DIR}/${perl_gen_path}" DEPENDS "${CMAKE_SOURCE_DIR}/generate-perl.sh" From patchwork Tue Dec 17 17:32:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 13912266 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D54FF1FC7C8 for ; Tue, 17 Dec 2024 17:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456730; cv=none; b=c6NDg5IX9PN/aV7mHmY0nvJg0fRCD4eCQHlA9bBjIVihF/HZJPXK9KRfJEccaeGv0LDk0BSzbhGle8JynFSJS/xquEZwmpOeliHfG8SsptawBROGNV1aAA29rT77TnnbNL2nGjeZXZVpfzlFuDQLxd1BwjOrPjl71QJhIlVbK9Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456730; c=relaxed/simple; bh=Vmce3Ha7lf1+N8vpiVco7VGKSUTdr/BXT9Jqzf3Ol98=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=f7jJgCxeJmiCw0Q/WjRt2hOpVB0FFETY+3WGo9jvuzBcYI3nEvnuRkfF/90aUrrapyi6+4tJVXH8xeUlYflJgJc1GVLmMyTWg+CLozQJPZ6z5Fm8UCgqqhiTrV3T/gezfUEKNhFJLc7S2WbQsI+fVIMtEi5Qb9hJlXx3YlxA92Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EGvLHzay; arc=none smtp.client-ip=209.85.128.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EGvLHzay" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43626213fffso32969765e9.1 for ; Tue, 17 Dec 2024 09:32:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734456726; x=1735061526; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=nc2Va2Ub81JAcP6Q8sTqHrN/bsyf/Ds1wGkBpC4DqVQ=; b=EGvLHzayx0yUCQyvx6Kq2RFHfV8kvWer+2yqn3jIFZbS7HYrSNUmJon40GCWiwQZYA MWOaarCF7h31MmMpkDGaN5S7bh+fQvvMXk8n4BLXvPi+1ksBuFfxEIItuIxGN5FIs4hN cZPIs4BkLJ1msxKDHREHa82QEtKlm2xERyNzb729YJcVFDiJhfwnSC7izuIE+6nilBbM qhwvkhLKkJVQzawT5XN965kM1PG3MqqYW1fpK2AV6P/Iu+IEsupPzhSLG/ESITnCO8nZ bh43vHM+8zZcY5BSBMl6Y1S28ttinlrRNgSeQfibsBkYUZCFzvzp8Qus5WywXy6stiS6 0XiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734456726; x=1735061526; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nc2Va2Ub81JAcP6Q8sTqHrN/bsyf/Ds1wGkBpC4DqVQ=; b=WZWbVTAJUGGPntG1oXoHEvC6wPp5UkbV8picN7sZQa4xxNF8QzenB+Xwed58NPpKi8 VWICfbHPQCy3iu9d8rC6uQGXLjhh9hnX3E2aMkzefe7pfHzchyrLmaGlTPrYsJD2Cqzu 6xbNqli8bm5JKqXCD6Mi6V005Ao30rs1olLgek9W9AyRnLyM+YAlU4E47V6CjLfErwZZ hDphuIm+NAuqifE6KOvRcTXhmPA2eQQIft/lnfiO8J0UPi82kHM1PIWn+cTFSE2ChvcW LDIS6J51L0MnwNwkZrchEsJ7C1oFKhpNyTTuV5Ng8raluBZKUWBoPieCSo/yMBTIuOe9 u6bQ== X-Gm-Message-State: AOJu0YyADjti/8DZePkRYufbqvjvSDpWB/jbLR45w3EvQVOsCQvayD+D nNP5+Kp5GRre3J3yAW6OOh3ecviaiNgVAwvsZwuJsih97aSMTFdloFIwBA== X-Gm-Gg: ASbGncuPwa6IG6XTfALAPf1U08I3IwBUdC1bk86Tb2Y0xZET1k7OjXaeU5sb9dtdWU0 2K6ams6yuqnqfgRVJaRV7gtXVIUM6No7/+ZmHT0Puhhv1LLibbfaEABKRZbiCy6kPtomQif/RO7 wEBVwgXeuPWHhjLu8rRGMiEpdQfCRD1uLBjOZdydlvO5+sBr9r80fFi00ax5pcnuP6lxLGRfupq hqb9dr/teXkvBG/H5sTfTrjHATPXEepVuH4Nmib0fEK7WEMSw2Si0Vvnw== X-Google-Smtp-Source: AGHT+IHkC8P1ucEABdTpochPEuf0X85SS227VE9fqgvNoW26zL5REQRB5KDAYbHcmm96+uXzVC6bvg== X-Received: by 2002:a05:6000:794:b0:385:faec:d945 with SMTP id ffacd0b85a97d-388db239bc6mr3824076f8f.9.1734456726429; Tue, 17 Dec 2024 09:32:06 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c8061038sm11593156f8f.104.2024.12.17.09.32.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 09:32:05 -0800 (PST) Message-Id: <0f1808e37cc75ac6d2bd5f28deb7c91bfeedcba9.1734456721.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Tue, 17 Dec 2024 17:32:00 +0000 Subject: [PATCH 4/5] cmake: put the Perl modules into the correct location again Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Johannes Schindelin , Johannes Schindelin From: Johannes Schindelin From: Johannes Schindelin In ccfba9e0c45 (Makefile: use "generate-perl.sh" to massage Perl library, 2024-12-06), the previous strategy (which avoided spawning a shell script to transform the files) was replaced by the same `generate-perl.sh` invocation as for the Makefile-based build. The only difference is that now the transformation tries to handle the Perl modules in-place (which ends up in empty files because the same file is used as input and output via stdin/stdout redirection), and the Perl script cannot find them anymore because they are not in the expected place. Let's put them into the expected place again, i.e. into `perl/build/lib/` instead of `perl/`. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 6f35cd66f39..36f18ab2dd1 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -882,6 +882,10 @@ foreach(script ${git_perl_scripts} ${perl_modules}) string(REPLACE ".perl" "" perl_gen_path "${script}") get_filename_component(perl_gen_dir "${perl_gen_path}" DIRECTORY) + if(script MATCHES "\.pm$") + string(REGEX REPLACE "^perl" "perl/build/lib" perl_gen_dir "${perl_gen_dir}") + string(REGEX REPLACE "^perl" "perl/build/lib" perl_gen_path "${perl_gen_path}") + endif() file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/${perl_gen_dir}") add_custom_command(OUTPUT "${CMAKE_BINARY_DIR}/${perl_gen_path}" From patchwork Tue Dec 17 17:32:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 13912267 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D5DE1FC7CC for ; Tue, 17 Dec 2024 17:32:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456731; cv=none; b=oHmuCyo5D6rFYHVPJKEvfvCLgtEcxYhCPWR5Ox4y4Lv+USLB/2OrciDS5p9PuQHOzijr8DxldifvNa9WRcACzYJTKHhwHCXZsb9tI2S9wdfjzMBeDQO1yoNiCR95zVqFG62cobQ8XWiwPLz75O5hxSpPbgOOjQOjfkmIzvkZH7w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734456731; c=relaxed/simple; bh=EbqOnR0WeSPPHuqqC9iUc+FhZRPjT7a0fCItxCrwnDk=; h=Message-Id:In-Reply-To:References:From:Date:Subject:Content-Type: MIME-Version:To:Cc; b=asR2J/ZoGM+Wga7tE5NbGMlTRHMoeZ24nuJ6Y1hVSX5vFRtmApICapjqWVL0rByymXNvF2WEGtUejuz6ltYrk1Xr3aPFI7Qn+kT8OOOfYnwkEWBkyQIClRABMq3Q2z9RpH3C8CgCECMWxyhdEa1zUYYKRmJamIt0TfrN5eYOLMM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Xi8X25PA; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Xi8X25PA" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-43621d27adeso39289725e9.2 for ; Tue, 17 Dec 2024 09:32:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734456727; x=1735061527; darn=vger.kernel.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=g7QqL+BMAPchUH65wWTiYb1YjOcN45jjN13iy41PKfU=; b=Xi8X25PArVlbVAYiB7cAiv3CGhQD02HzgbRcTssTw0++MegJgKn6TJz86kpeokb8Z6 bi+iS0u7SAXQ4QA2KewzrigHwRZI0NuQt48eiPeWPIlqR+6op54FAWKoXPpqwvvSzXRU LcYanSCcuJ5F6Cs3NR90AytMHPyDt2Bxx8+5enpWW5gpeAo14DgErq9fyyrKiZugA4CY IX47Gi3kVvFzaBneBXrXxn8dCEg50cJkW/Q4wDaJ0Z8YDpXUayhyc3xnoffp6KV/cm1G hhaY+G998Po0sNy9rD7FaCBtp5+SWG9whN0IIRDPDymNDcIUm5NCsIAXX82omC2E61FG J1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734456727; x=1735061527; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g7QqL+BMAPchUH65wWTiYb1YjOcN45jjN13iy41PKfU=; b=hGiL8OgXByv4MAe/ju5QJyWxRQPpTCIPgyD2kyA3gPQonvTKrPkkfqgeBpm7FFrHhN GGgG9xR9BxJGK5x15Be/1SCctP1DcYgVtqHXUwMl7EQvEGmVvqrwj7Yyvxgdz5ilO+Me frlD6o2+4/1IUhR7isgUzs9qfaQ7A0ih9CdgcNwKCwDDMHFPdDAdB4Xo5qvcDVz0ZhgL vtMnGpUs7lRqVYBS1OGQbemSXagc5rQe7q8t98nvCfOGnLK+yHrulWliruD+Bd9Xox3N nOisrR37jrtX6ce/M5EVzInVFh8wcOKKZsHr3vb5TdIXlEmPUDnf/jXBypidVImwybZ9 hokQ== X-Gm-Message-State: AOJu0YxbTBB9CvzEMtugrdeyeGcEv97XEbTbw4xEEqr1oE0YnExwSzxX +O7dAr+Tm/Cnuu9I/4oR3l1tF5O4KFvqZ9/emeOO4SJHoUlEe83qNuyx9w== X-Gm-Gg: ASbGnct+TEef0AylEAIjiPYpvXeFXPAAJ91VAW9pVH0vnl99wQBxBEtCDCPR4nFHxA7 s/VCcGyuUQy26bkcsEfvaZSSU0CTJqBuEYUG+CJchug6jXVO2uGS+FgtMBlIATxtdoo6FJlIjos 0ortKQGRWAmbHDUJgea7+bPBhgr+owUy5ZTNCcwLM2SGO7z+51jEyjMYwRFVV+z9F6tBgnv6bxM nXKNIJkeat+l0I7zJjgdMyz8NvTiM4c0XWS4i2oLkOMgKfbXLVtHKiyJg== X-Google-Smtp-Source: AGHT+IGl6nAAKeGVffPqnbmeCKMpgkV9X5EfU2laWFpA3OSEoVa+Y5fOcn9lP+tHCZKoUi1d5pYYnA== X-Received: by 2002:a05:600c:4f4f:b0:436:346a:fa9b with SMTP id 5b1f17b1804b1-436346afda1mr119690705e9.20.1734456727240; Tue, 17 Dec 2024 09:32:07 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-388c80120e8sm11906141f8f.6.2024.12.17.09.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2024 09:32:06 -0800 (PST) Message-Id: In-Reply-To: References: Date: Tue, 17 Dec 2024 17:32:01 +0000 Subject: [PATCH 5/5] cmake/vcxproj: stop special-casing `remote-ext` Fcc: Sent Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To: git@vger.kernel.org Cc: Patrick Steinhardt , Johannes Schindelin , Johannes Schindelin From: Johannes Schindelin From: Johannes Schindelin When the `vcxproj` target was introduced in `config.mak.uname` to allow building Git with the Visual C toolchain, the `git remote-ext` command was always executed in its dashed form. Therefore, it was impossible to pass the test suite unless that command existed in its dashed form, and we had to special-case this. Later, when the `vcxproj` target got out of fashion because Visual Studio gained native support for CMake builds, this special-casing was copied without questioning it. But as of 675df192c5f (transport-helper: do not run git-remote-ext etc. in dashed form, 2020-08-26), the reason for this special-casing no longer exists. So let's just drop it. Signed-off-by: Johannes Schindelin --- config.mak.uname | 4 ---- contrib/buildsystems/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index d5112168a4c..b12d4e168ae 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -819,10 +819,6 @@ vcxproj: sed -i 's|\(git\)-\([-a-z]*\)\.exe"|\1.exe" \2|g' \ bin-wrappers/git-{receive-pack,upload-archive} git add -f $(test_bindir_programs) - # remote-ext is a builtin, but invoked as if it were external - sed 's|receive-pack|remote-ext|g' \ - bin-wrappers/git-remote-ext - git add -f bin-wrappers/git-remote-ext # Add templates $(MAKE) -C templates diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt index 36f18ab2dd1..802445c1eb0 100644 --- a/contrib/buildsystems/CMakeLists.txt +++ b/contrib/buildsystems/CMakeLists.txt @@ -1082,7 +1082,7 @@ endif() #wrapper scripts set(wrapper_scripts - git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext scalar) + git git-upload-pack git-receive-pack git-upload-archive git-shell scalar) set(wrapper_test_scripts test-fake-ssh test-tool)