From patchwork Mon Sep 21 22:28:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin via GitGitGadget X-Patchwork-Id: 11791245 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8402E16BC for ; Mon, 21 Sep 2020 22:28:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6657D23A65 for ; Mon, 21 Sep 2020 22:28:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RsqmIFbx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728554AbgIUW2W (ORCPT ); Mon, 21 Sep 2020 18:28:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726457AbgIUW2V (ORCPT ); Mon, 21 Sep 2020 18:28:21 -0400 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94D24C061755 for ; Mon, 21 Sep 2020 15:28:21 -0700 (PDT) Received: by mail-wm1-x32b.google.com with SMTP id b79so1158564wmb.4 for ; Mon, 21 Sep 2020 15:28:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=uV6nip7fkrMMbddQ2fp7UKuaRL1b7PYVD0dXMSsFnFU=; b=RsqmIFbxJr4dOKfhywiR3QS2KssuBM5j8jL2IDHf+hKnwAfragBrDM//QEtf+5iMDz WCS5VH8b8TupKarjBh8DakMVQwxLb2m5yuE5vStjIDlMfT7TfsPmJwm34Rgjrt1QMkFt /u76wvG9EP3R7IRBb04doCnCs9hi0UyV5T5o1gqgUVy206IAv2NnWimLQmuUUjx9IjDA tAtBmjnsPXMeO3iBXmRZFl9gj3GBcqxABwOmPaOPOtwsJqbfYAAM1t9fgRNaMscoFcap M3pSzU0ExJYhucIo00ArCXiVC6jREYlyCsA8WWOA58bESLrojSjbWUHhbvQUBpZGyXZo nRAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=uV6nip7fkrMMbddQ2fp7UKuaRL1b7PYVD0dXMSsFnFU=; b=jgLJsDA7NEwqDc21z7qSt2L28zJD5Pt+LmQfkFHKszarIrIqEfGrl5RZ3m8XYWJ9Zr Vrvmeq12u0a5FJ2UCWKBeoCmppvNdMS2fMiGqUu3U7Di3rpZuc/ZREXFCPacVX6RMWpI iAYLR09wySyguhTQvvSDEgrz1Hg6iyK4ft9z55zHxfs8ncnmx5kkHEGYw7xpwJ/SmANI F/eNY618M679tpjSCpofyzNoirVM6GikI6qvOEFAbeCslzYTD6MaNTSOBapN+UcuYMfv D6FPuFlEY3tt2fwYcCQNLE7zseKxrIQIF6vBJNpSw4sSHjeq4ApFAshfMBsv1ka04GzL Sgbg== X-Gm-Message-State: AOAM532HWaF8rNhCda6H5kSYnWbTMMG3kmMg3545Ya7w0eAOObKNFt3u TRsPRLqxmv4SPdXeZimUgQCsjn/fpzs= X-Google-Smtp-Source: ABdhPJzooLQJUhQCR8xMvdfIDTx2SnBC2+5Oh4FgdThVaORshCb83yLjZXvdqF9y2DgaK4LmrkZGTw== X-Received: by 2002:a7b:ca4a:: with SMTP id m10mr1369397wml.11.1600727300105; Mon, 21 Sep 2020 15:28:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 18sm1306942wmj.28.2020.09.21.15.28.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Sep 2020 15:28:19 -0700 (PDT) Message-Id: <5df767c9190b70f91a982c6eacec34aa4ef32bbc.1600727297.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Date: Mon, 21 Sep 2020 22:28:15 +0000 Subject: [PATCH v4 1/3] msvc: copy the correct `.pdb` files in the Makefile target `install` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: SZEDER =?utf-8?b?R8OhYm9y?= , Johannes Schindelin , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin There is a hard-coded list of `.pdb` files to copy. But we are about to introduce the `SKIP_DASHED_BUILT_INS` knob in the `Makefile`, which might make this hard-coded list incorrect. Let's switch to a dynamically-generated list instead. Signed-off-by: Johannes Schindelin --- Makefile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index f1b1bc8aa0..ce072c4fb8 100644 --- a/Makefile +++ b/Makefile @@ -2921,15 +2921,8 @@ ifdef MSVC # have already been rolled up into the exe's pdb file. # We DO NOT have pdb files for the builtin commands (like git-status.exe) # because it is just a copy/hardlink of git.exe, rather than a unique binary. - $(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)' - $(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' - $(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' ifndef DEBUG $(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)' $(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'