From patchwork Thu Jul 18 13:19:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048945 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0AC6514DB for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE15628767 for ; Thu, 18 Jul 2019 13:19:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E1FD628806; Thu, 18 Jul 2019 13:19:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CF002880A for ; Thu, 18 Jul 2019 13:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390431AbfGRNTF (ORCPT ); Thu, 18 Jul 2019 09:19:05 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:54276 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfGRNTE (ORCPT ); Thu, 18 Jul 2019 09:19:04 -0400 Received: by mail-wm1-f68.google.com with SMTP id p74so25552342wme.4 for ; Thu, 18 Jul 2019 06:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=hu/n5CDL5X3Jv5DVGBhVY2pi1aH+fZYcHe356KwKrSo=; b=p6lDPwC+PyiS7NaSMeAgb3Je/Bu9mflUW8zkKOhGLvSmPeE/xNcHASuhsVcd8xARgx QmU5Qy/xEuQfkESOGLoeBMsmflfmoaHmMteeO2eySF8/YIHso4iIvXeDDBliOmFZboQw QDJg5Q3k1BJBl/TWnYXozxgATPx1ygCZkTXdPD11KD9/oRk3xVt2DZnJBt/TYvsKwro3 dUK8fWwiJ3iHV2YhEyntq/dstJG7rwuWjJOtcJetzdpJAnSJCFBfZ7ZNGJi1rfuS37Rk ct2+YEE1Ldt71EVqfj/C9bJDy6iCtu8RWBIPaJWOMaXmHtBuiIqUADSbHx7wjDK0tF7J 9cDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=hu/n5CDL5X3Jv5DVGBhVY2pi1aH+fZYcHe356KwKrSo=; b=XutRAtG4CGmncJTMCtVQadeKQbKrEAmnOK9DZIKqAM4N0oXRMMmqPD6o/opNaBPj+4 MVSp2sa4/n2YymzFmdQkWlImOi1en/oJt7EuxedIV/IcJDkGpZ243t6mMIhrL1ajQIwc rQ2DBvVzsLaglt5gdvUCw3edrGHIgNa/hzxuw1N8Ad5h2wLh12cqc13UpxFIOBjYRgdW h304B3B9oTXabi/xLGsrgtKyO8a0tVxay5fAn9Hzg6o29MSJ9J0pMhhaaZDxVIbzsK2Q z/8J2YeFGXU16Ab3CMbQHu7YWQ8V8QheVU2IBjWmpM990HmMtGGfDhfJvpKtBiYx4kMf Uc3A== X-Gm-Message-State: APjAAAXf68xzwfpHqjBxPRYja81cenQdN7Q+j8s9vLVpOQRf7Im8Udqb a9nzveSm/YGq6/cJV8llJ0Ti0YiE X-Google-Smtp-Source: APXvYqxcGvDhVQ9Nv9WKnzX/Zm2tJgmWMMuc7p5T4Itfw6DwZPisphYz6qXtvDpBbpe1r1dcfG4Lzw== X-Received: by 2002:a1c:407:: with SMTP id 7mr44950414wme.113.1563455941765; Thu, 18 Jul 2019 06:19:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c65sm24704339wma.44.2019.07.18.06.19.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:01 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:01 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:36 GMT Message-Id: <240ff4251774fbede9cce21a5140af655e05d7ba.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 01/24] Vcproj.pm: auto-generate GUIDs Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin We ran out GUIDs. Again. But there is no need to: we can generate them semi-randomly from the target file name of the project. Note: the Vcproj generator is probably only interesting for historical reasons; nevertheless, the upcoming Vcxproj generator (to support modern Visual Studio versions) is based on the Vcproj generator and it is better to fix this here first. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 66 ++++------------------- 1 file changed, 9 insertions(+), 57 deletions(-) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index cfa74adcc2..c79b706bc8 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -3,6 +3,7 @@ package Generators::Vcproj; use strict; use vars qw($VERSION); +use Digest::SHA qw(sha256_hex); our $VERSION = '1.00'; our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE); @@ -12,59 +13,12 @@ BEGIN push @EXPORT_OK, qw(generate); } -my $guid_index = 0; -my @GUIDS = ( - "{E07B9989-2BF7-4F21-8918-BE22BA467AC3}", - "{278FFB51-0296-4A44-A81A-22B87B7C3592}", - "{7346A2C4-F0FD-444F-9EBE-1AF23B2B5650}", - "{67F421AC-EB34-4D49-820B-3196807B423F}", - "{385DCFE1-CC8C-4211-A451-80FCFC31CA51}", - "{97CC46C5-D2CC-4D26-B634-E75792B79916}", - "{C7CE21FE-6EF8-4012-A5C7-A22BCEDFBA11}", - "{51575134-3FDF-42D1-BABD-3FB12669C6C9}", - "{0AE195E4-9823-4B87-8E6F-20C5614AF2FF}", - "{4B918255-67CA-43BB-A46C-26704B666E6B}", - "{18CCFEEF-C8EE-4CC1-A265-26F95C9F4649}", - "{5D5D90FA-01B7-4973-AFE5-CA88C53AC197}", - "{1F054320-036D-49E1-B384-FB5DF0BC8AC0}", - "{7CED65EE-F2D9-4171-825B-C7D561FE5786}", - "{8D341679-0F07-4664-9A56-3BA0DE88B9BC}", - "{C189FEDC-2957-4BD7-9FA4-7622241EA145}", - "{66844203-1B9F-4C53-9274-164FFF95B847}", - "{E4FEA145-DECC-440D-AEEA-598CF381FD43}", - "{73300A8E-C8AC-41B0-B555-4F596B681BA7}", - "{873FDEB1-D01D-40BF-A1BF-8BBC58EC0F51}", - "{7922C8BE-76C5-4AC6-8BF7-885C0F93B782}", - "{E245D370-308B-4A49-BFC1-1E527827975F}", - "{F6FA957B-66FC-4ED7-B260-E59BBE4FE813}", - "{E6055070-0198-431A-BC49-8DB6CEE770AE}", - "{54159234-C3EB-43DA-906B-CE5DA5C74654}", - "{594CFC35-0B60-46F6-B8EF-9983ACC1187D}", - "{D93FCAB7-1F01-48D2-B832-F761B83231A5}", - "{DBA5E6AC-E7BE-42D3-8703-4E787141526E}", - "{6171953F-DD26-44C7-A3BE-CC45F86FC11F}", - "{9E19DDBE-F5E4-4A26-A2FE-0616E04879B8}", - "{AE81A615-99E3-4885-9CE0-D9CAA193E867}", - "{FBF4067E-1855-4F6C-8BCD-4D62E801A04D}", - "{17007948-6593-4AEB-8106-F7884B4F2C19}", - "{199D4C8D-8639-4DA6-82EF-08668C35DEE0}", - "{E085E50E-C140-4CF3-BE4B-094B14F0DDD6}", - "{00785268-A9CC-4E40-AC29-BAC0019159CE}", - "{4C06F56A-DCDB-46A6-B67C-02339935CF12}", - "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}", - "{3A62D3FD-519E-4EC9-8171-D2C1BFEA022F}", - "{9392EB58-D7BA-410B-B1F0-B2FAA6BC89A7}", - "{2ACAB2D5-E0CE-4027-BCA0-D78B2D7A6C66}", - "{86E216C3-43CE-481A-BCB2-BE5E62850635}", - "{FB631291-7923-4B91-9A57-7B18FDBB7A42}", - "{0A176EC9-E934-45B8-B87F-16C7F4C80039}", - "{DF55CA80-46E8-4C53-B65B-4990A23DD444}", - "{3A0F9895-55D2-4710-BE5E-AD7498B5BF44}", - "{294BDC5A-F448-48B6-8110-DD0A81820F8C}", - "{4B9F66E9-FAC9-47AB-B1EF-C16756FBFD06}", - "{72EA49C6-2806-48BD-B81B-D4905102E19C}", - "{5728EB7E-8929-486C-8CD5-3238D060E768}" -); +sub generate_guid ($) { + my $hex = sha256_hex($_[0]); + $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/; + $hex =~ tr/a-z/A-Z/; + return $hex; +} sub generate { my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_; @@ -92,9 +46,8 @@ sub createLibProject { $target =~ s/\//_/g; $target =~ s/\.a//; - my $uuid = $GUIDS[$guid_index]; + my $uuid = generate_guid($libname); $$build_structure{"LIBS_${target}_GUID"} = $uuid; - $guid_index += 1; my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"LIBS_${libname}_SOURCES"}})); my @sources; @@ -311,9 +264,8 @@ sub createAppProject { $target =~ s/\//_/g; $target =~ s/\.exe//; - my $uuid = $GUIDS[$guid_index]; + my $uuid = generate_guid($appname); $$build_structure{"APPS_${target}_GUID"} = $uuid; - $guid_index += 1; my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"APPS_${appname}_SOURCES"}})); my @sources; From patchwork Thu Jul 18 13:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048949 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AEAC71800 for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9D3AD28767 for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9120428784; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2003E2880A for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390448AbfGRNTG (ORCPT ); Thu, 18 Jul 2019 09:19:06 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34388 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390416AbfGRNTE (ORCPT ); Thu, 18 Jul 2019 09:19:04 -0400 Received: by mail-wr1-f67.google.com with SMTP id 31so28715634wrm.1 for ; Thu, 18 Jul 2019 06:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:mime-version :content-transfer-encoding:fcc:to:cc; bh=IpYxuyg0d7h+PkcMcFpH5/CrbD7XZfHhe7dTuXO7RfQ=; b=h4aYuniVkesHL9f24toKHoMLPneANtpykMkku9DdGbPOnV7xhReg6GHUY6CIJJHr9k bi3UVBdhSA2zUHRkI3uyqSgvmUVRl0/sm4/doKayTDu64eYbemc6Z/A7pQsapo4lgEL4 lUvWZB9oRskpq9owA8ieMxY4sD/LCbcOvEycpTQkMeKwkKe11aaVjfwlh663AU5HVeQg iFI0qA+HVV7kIjmfF7wg8DrN+KzElKhzSHhn85aOTsNZcjT88R9o59ctSZXZHLYrXvn8 F59NdS3eEz2ouezMdjje0OB90/eynh9qFg07akV/6Ctt1YNNl+zIlAIeDjYFSNrVIwRQ 7e5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:mime-version:content-transfer-encoding:fcc:to:cc; bh=IpYxuyg0d7h+PkcMcFpH5/CrbD7XZfHhe7dTuXO7RfQ=; b=OahM1ZuZG0FvDkNqd2H/oUZ7PzV0KNEzBC47OrfGujZwAB/CcHWAK+MNHChUjprElp gmds1amExfw6EQxsHI8JyVFY/hYBERf6dJ0glPREbnZpElFodfExt5JGeVqi5Ae7Tdou 2tp1KPaBUY1AGdgNGYBwHRBCwzwJrellh/4JNY36j6p+OJuAs0nPLp6DBi9ZHVfqYz78 +bPND2d3giUXrRhzQBaOU6Fgo6/A388nfBWhcj850kWwvQSj8gVvT46PwDT7ouvO5qaZ QleQhccRGjj0Thtacr6pzZzGh/49t4RytrWHAAqlApB9E2Dp5Fm5NvlLgsxIgVX0KtCw KtLA== X-Gm-Message-State: APjAAAUkGpmifOHkyTwtDeDS2HAnjP7iwS8AIZYGuo3uC+EuPwjoVhSC 0pb39SptaoJ0pvlpjEX5rSlvSdG7 X-Google-Smtp-Source: APXvYqwluHOj/lqaokF6lRK8jsxzYvi5JKfYW/bjjw+qcpthYrHtXRXTtkIVpLnOZz1jD4nNYNifEQ== X-Received: by 2002:adf:e790:: with SMTP id n16mr34847894wrm.120.1563455942558; Thu, 18 Jul 2019 06:19:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y16sm26624105wrw.33.2019.07.18.06.19.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:02 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:02 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:37 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 02/24] Vcproj.pm: list git.exe first to be startup project MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Visual Studio takes the first listed application/library as the default startup project [1]. Detect the 'git' project and place it at the head of the project list, rather than at the tail. Export the apps list before libs list for both the projects and global structures of the .sln file. [1] http://stackoverflow.com/questions/1238553/ vs2008-where-is-the-startup-project-setting-stored-for-a-solution "In the solution file, there are a list of pseudo-XML "Project" entries. It turns out that whatever is the first one ends up as the Startup Project, unless it’s overridden in the suo file. Argh. I just rearranged the order in the file and it’s good." "just moving the pseudo-xml isn't enough. You also have to move the group of entries in the "GlobalSection(ProjectConfigurationPlatforms) = postSolution" group that has the GUID of the project you moved to the top. So there are two places to move lines." Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 33 +++++++++++++---------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index c79b706bc8..d862cae503 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -513,20 +513,18 @@ sub createGlueProject { foreach (@apps) { $_ =~ s/\//_/g; $_ =~ s/\.exe//; - push(@tmp, $_); + if ($_ eq "git" ) { + unshift(@tmp, $_); + } else { + push(@tmp, $_); + } } @apps = @tmp; open F, ">git.sln" || die "Could not open git.sln for writing!\n"; binmode F, ":crlf"; print F "$SLN_HEAD"; - foreach (@libs) { - my $libname = $_; - my $uuid = $build_structure{"LIBS_${libname}_GUID"}; - print F "$SLN_PRE"; - print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\""; - print F "$SLN_POST"; - } + my $uuid_libgit = $build_structure{"LIBS_libgit_GUID"}; my $uuid_xdiff_lib = $build_structure{"LIBS_xdiff_lib_GUID"}; foreach (@apps) { @@ -540,6 +538,13 @@ sub createGlueProject { print F " EndProjectSection"; print F "$SLN_POST"; } + foreach (@libs) { + my $libname = $_; + my $uuid = $build_structure{"LIBS_${libname}_GUID"}; + print F "$SLN_PRE"; + print F "\"${libname}\", \"${libname}\\${libname}.vcproj\", \"${uuid}\""; + print F "$SLN_POST"; + } print F << "EOM"; Global @@ -551,17 +556,17 @@ sub createGlueProject { print F << "EOM"; GlobalSection(ProjectConfigurationPlatforms) = postSolution EOM - foreach (@libs) { - my $libname = $_; - my $uuid = $build_structure{"LIBS_${libname}_GUID"}; + foreach (@apps) { + my $appname = $_; + my $uuid = $build_structure{"APPS_${appname}_GUID"}; print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n"; print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n"; print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n"; print F "\t\t${uuid}.Release|Win32.Build.0 = Release|Win32\n"; } - foreach (@apps) { - my $appname = $_; - my $uuid = $build_structure{"APPS_${appname}_GUID"}; + foreach (@libs) { + my $libname = $_; + my $uuid = $build_structure{"LIBS_${libname}_GUID"}; print F "\t\t${uuid}.Debug|Win32.ActiveCfg = Debug|Win32\n"; print F "\t\t${uuid}.Debug|Win32.Build.0 = Debug|Win32\n"; print F "\t\t${uuid}.Release|Win32.ActiveCfg = Release|Win32\n"; From patchwork Thu Jul 18 13:19:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048947 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D09713BD for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1A26A28800 for ; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DF5928767; Thu, 18 Jul 2019 13:19:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F028828800 for ; Thu, 18 Jul 2019 13:19:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390436AbfGRNTF (ORCPT ); Thu, 18 Jul 2019 09:19:05 -0400 Received: from mail-wr1-f51.google.com ([209.85.221.51]:43538 "EHLO mail-wr1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726513AbfGRNTF (ORCPT ); Thu, 18 Jul 2019 09:19:05 -0400 Received: by mail-wr1-f51.google.com with SMTP id p13so28643789wru.10 for ; Thu, 18 Jul 2019 06:19:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=bSwfkqEvi1VIklZAWl7sQi5JjPiQoxI4fZFH4WoHeuY=; b=HSNAzMPdFFfenLI4ZQSjp92sOxFqss4wo2p1Ad5R0Ah06Qp+jBdt8zOPo79sjo0bUZ t4A87kiBFNCap6DA4V4hkUqrFUlKaNCnyQzRHGhkzZsMDTjOUUXb4O4Dt2NoNtqyorHZ jVxEDyean8FtIDFeD0KMeX325mLwqH0G+g1kzc8isoYwGOaOdRX+Kqa41ufdSIqoZtWx 0un42UYvkSKLoCW5BCQT8Dp+UZ4YaHjRpUfIs/KNzmRp6GbS1YB9CgPu7x4G0Yw/rZEu F1vY7X51a/eBD1o5ef5awO8jfRfZKPMRzaJ7Du4/xK2jHupI7vzHuPHXjPl74LI/Wzzu 3mPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=bSwfkqEvi1VIklZAWl7sQi5JjPiQoxI4fZFH4WoHeuY=; b=r0zb1XV6XB+gW4oyZghfabK2LJlR3xhCjPdg+w13amSKgH6IqpKwQv+rEPhqNFVlIh z+I+b30LmM+etKnkftUVCsgzMo2Dt02CleAeEGjYxDTTbDgx/f+CAmorYiJtx0/2gGk4 ijaLb+9ePJTwvaYu5hfeVh5JOgtGVuuI6SUj/eKDlLp81AqhQt2p29DORlQFALdYdvl9 drLgslrUpq/ER7J53T2ErkwsRKdx+ehNPZxco+nNb3oKrSTuAXZ3/K08OKuCO5X6mcph ew9zothMyDkfvKE3aPJOSjioRcFT6NPHT7RT851U3+n5m+JksBhXpW5j6rJboJLxEZeJ AQ5A== X-Gm-Message-State: APjAAAUp1oBzgyvKlgMXj3Fl1CP1VahrT8gYBYK+7Yvw8nJGrdgIqQLJ Xsn9c+IOCEiHTMlWxv8Q5fpi58uQ X-Google-Smtp-Source: APXvYqw1PwMwb1C4kkM9vHryf3qgOZu0TsXKCtYgSMyEQQZQHlBgaPbRFCclZXj6MztkV0AGadpK7Q== X-Received: by 2002:adf:cd90:: with SMTP id q16mr50579990wrj.118.1563455943205; Thu, 18 Jul 2019 06:19:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x129sm24619219wmg.44.2019.07.18.06.19.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:02 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:02 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:38 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 03/24] Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin It is not necessary, and Visual Studio 2015 no longer supports it, anyway. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index d862cae503..b17800184c 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -115,9 +115,6 @@ sub createLibProject { - @@ -181,9 +178,6 @@ sub createLibProject { - @@ -339,9 +333,6 @@ sub createAppProject { - @@ -410,9 +401,6 @@ sub createAppProject { - From patchwork Thu Jul 18 13:19:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048991 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A93B514DB for ; Thu, 18 Jul 2019 13:19:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 97A7528767 for ; Thu, 18 Jul 2019 13:19:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C01628800; Thu, 18 Jul 2019 13:19:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D832828767 for ; Thu, 18 Jul 2019 13:19:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390454AbfGRNTJ (ORCPT ); Thu, 18 Jul 2019 09:19:09 -0400 Received: from mail-wm1-f52.google.com ([209.85.128.52]:52107 "EHLO mail-wm1-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726665AbfGRNTG (ORCPT ); Thu, 18 Jul 2019 09:19:06 -0400 Received: by mail-wm1-f52.google.com with SMTP id 207so25582070wma.1 for ; Thu, 18 Jul 2019 06:19:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=WbI3jo5hS0woR7wltjg1GZrZ7cNQ7AjPnEAyvlrHHUY=; b=gf/kqTjyYibYGXwfKc+dFHBzDokMFlQ/BRzFXhOFOC5+Z+EHZR8bCwExHRay2NlLY6 Z3t6iOolVQn9Km5ZhBZ8Vrj5eqQYzGmBEx60OJsWRWuBpUdjJIdc1Y9hlsuXh/40Rr9D LtqT4u4l6hmu2goYpHUXjZ4BgmKvopnlA2q+hcuLWptEDB1+2MZ8nOrfhWNOtu/FD4Si ++Gzjku1pM6GIFBfQ7O6iNHCUTAT1E0VcDbeIMj0eWUYBjGKco3RsiX0Kial55IWN9ZG XPBO9FM64uCErQBureB53be0I/tcJxWesMRLwUe52wodrHsVQaliF6a/pkN3XL4OyXk+ SVTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=WbI3jo5hS0woR7wltjg1GZrZ7cNQ7AjPnEAyvlrHHUY=; b=p3d7KdmNNcGO5hZhWLA4Bs7PmLCyS1qxd1NnEfzgQ3JB82s7GO1aDlNbF5Ab1xTE6m XTkOcqQZOUDukgkbAomYIZhsnaxROL4h4Y+Rkw7KV8h8i4X06dAYsf+1UY1+60qu5wzS ftiVnH/i58Ium+T9Xqn93bN16ZJLm2w6iiTrtSkuBPoQSIoDq43ohbSviUQq4ZEfQwCc p2QzgAr01uAv/6FeatWi/WpAxsRKnVPdIq+7PxmwnmZs4mckJ8Lry2bCOzb605CAzTRW +GDGAjSfOHLouzdwKVRSHT6y5vhnHy3MaKmC9q7jTP+WpVQ+CtXQoBi6J4YreyQy6PkF QWiw== X-Gm-Message-State: APjAAAXGisWEnMC9bnak9BxohBH+cxXr+7JoLRkWEFgcjDYincA9eiXN 5S5346HzrCqpLOwcrzwkOiKbDouK X-Google-Smtp-Source: APXvYqyiSGgJMCMfBPVSuOfBk7i59XqAcZLUfcJfQ74uv+ZWzp878+3J2orx0aPRd49gvjHnaVA5ew== X-Received: by 2002:a05:600c:1150:: with SMTP id z16mr41307815wmz.168.1563455943878; Thu, 18 Jul 2019 06:19:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q1sm22361271wmq.25.2019.07.18.06.19.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:03 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:03 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:39 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 04/24] Vcproj.pm: urlencode '<' and '>' when generating VC projects Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcproj.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index b17800184c..737647e76a 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -59,6 +59,8 @@ sub createLibProject { my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"LIBS_${libname}_INCLUDES"}}))); my $cflags = join(" ", sort(@{$$build_structure{"LIBS_${libname}_CFLAGS"}})); $cflags =~ s/\"/"/g; + $cflags =~ s//>/g; my $cflags_debug = $cflags; $cflags_debug =~ s/-MT/-MTd/; @@ -80,6 +82,8 @@ sub createLibProject { $defines =~ s/-D//g; $defines =~ s/\"/\\"/g; + $defines =~ s//>/g; $defines =~ s/\'//g; $includes =~ s/-I//g; mkdir "$target" || die "Could not create the directory $target for lib project!\n"; @@ -271,6 +275,8 @@ sub createAppProject { my $includes= join(";", sort(map(""$rel_dir\\$_"", @{$$build_structure{"APPS_${appname}_INCLUDES"}}))); my $cflags = join(" ", sort(@{$$build_structure{"APPS_${appname}_CFLAGS"}})); $cflags =~ s/\"/"/g; + $cflags =~ s//>/g; my $cflags_debug = $cflags; $cflags_debug =~ s/-MT/-MTd/; @@ -297,6 +303,8 @@ sub createAppProject { $defines =~ s/-D//g; $defines =~ s/\"/\\"/g; + $defines =~ s//>/g; $defines =~ s/\'//g; $defines =~ s/\\\\/\\/g; $includes =~ s/-I//g; From patchwork Thu Jul 18 13:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55A4713BD for ; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43E3828775 for ; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3820F28784; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE7BB28767 for ; Thu, 18 Jul 2019 13:19:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390486AbfGRNTM (ORCPT ); Thu, 18 Jul 2019 09:19:12 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:55431 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726735AbfGRNTG (ORCPT ); Thu, 18 Jul 2019 09:19:06 -0400 Received: by mail-wm1-f65.google.com with SMTP id a15so25558731wmj.5 for ; Thu, 18 Jul 2019 06:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MswVhO2Yoph6d7/DqSxFIx79+SyDFpptAibZXsGzuXc=; b=PybcT27zwXUVBF2P+iYhnTD+c/eXnSVpfMGC2dvYwSVjJSzfAwjIb/e0+a9/2NS8s0 sFDsR99Wa5dQhdFfPa3jV2dSBSvlEPW2huq3R/+o/Cs0bS0Heh2wc8/DfNIAqoHpkEgk jV9WAn7K+8ssegMsQzok6PThHxjBxa1/0IQrGN7m6/JnuoYNa5NgMiWiHNMddTqk8mvV AMGwRkKp8IKuUcDlZM20NthREoulezjXa/exe/EVRQ4kbJsyqZHGPPpRy6QNJWl0mvE7 FnVlhNL3+HA997UxMvSiYS09f4LEyo6lDiTyhqepx6NM9ksw68QDJ3mzuBW4R82r2Saa M/kQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MswVhO2Yoph6d7/DqSxFIx79+SyDFpptAibZXsGzuXc=; b=ZMyNEbLmKniesQZOeWxxFUwBIulwcoY435mbbqd+jdZBokVL634HGV2TdLB3U6O9ky izXzTqMWlLS7iUhtyzRctBbUlBDgOG6WYnCCc+MIJP06NsrTFVidDuGYH4/I/B0hq40j 2yEXaHP9n5tqxpO5UiDPF8Yrpchyc3NJRL49zOi6S+cAcoEsp/7FDhU33oEBKuBdgPgk utMVhYQlwuiyUZw5ZYo5qcBdUS317aYG+1r0Dv/5RbZUUI5cvfuDrc3zIUKfej4lZaU4 JZCq7+kvH2rCPd2SH+4E+qveBo2JM9RKaN5BxEXOuFH2tdBIH9PIfBXjIcK0JdVyPZ2/ q6cw== X-Gm-Message-State: APjAAAWaCNDsmZ2+ExHqJwBXHOabcHR8VhZfaGjtv8tFbWSJbNfRgGye ztXeVbjO5U5TE2MbYLp1y3SDJPIY X-Google-Smtp-Source: APXvYqw2kMN1ItIfc8gnymEjEfl/W6BG5+D886PqVdfXdpZQYRloCg3a6bwfI2qQsT3SPSfScaVl6Q== X-Received: by 2002:a7b:c5c2:: with SMTP id n2mr41515281wmk.92.1563455944550; Thu, 18 Jul 2019 06:19:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id v23sm24190622wmj.32.2019.07.18.06.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:04 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:04 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:40 GMT Message-Id: <82e820017b6ab7ce8612742a85679ea837d3596b.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 05/24] contrib/buildsystems: ignore invalidcontinue.obj Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Since 4b623d8 (MSVC: link in invalidcontinue.obj for better POSIX compatibility, 2014-03-29), invalidcontinue.obj is linked in the MSVC build, but it was not parsed correctly by the buildsystem. Ignore it, as it is known to Visual Studio and will be handled elsewhere. Also only substitute filenames ending with .o when generating the source .c filename, otherwise we would start to expect .cbj files to generate .obj files (which are not generated by our build)... In the future there may be source files that produce .obj files so keep the two issues (.obj files with & without source files) separate. Signed-off-by: Philip Oakley Signed-off-by: Duncan Smart Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 23da787dc5..53e65d4db7 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -282,7 +282,7 @@ sub handleLibLine # exit(1); foreach (@objfiles) { my $sourcefile = $_; - $sourcefile =~ s/\.o/.c/; + $sourcefile =~ s/\.o$/.c/; push(@sources, $sourcefile); push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}}); push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}}); @@ -326,8 +326,12 @@ sub handleLinkLine } elsif ($part =~ /\.(a|lib)$/) { $part =~ s/\.a$/.lib/; push(@libs, $part); - } elsif ($part =~ /\.(o|obj)$/) { + } elsif ($part eq 'invalidcontinue.obj') { + # ignore - known to MSVC + } elsif ($part =~ /\.o$/) { push(@objfiles, $part); + } elsif ($part =~ /\.obj$/) { + # do nothing, 'make' should not be producing .obj, only .o files } else { die "Unhandled lib option @ line $lineno: $part"; } @@ -336,7 +340,7 @@ sub handleLinkLine # exit(1); foreach (@objfiles) { my $sourcefile = $_; - $sourcefile =~ s/\.o/.c/; + $sourcefile =~ s/\.o$/.c/; push(@sources, $sourcefile); push(@cflags, @{$compile_options{"${sourcefile}_CFLAGS"}}); push(@defines, @{$compile_options{"${sourcefile}_DEFINES"}}); From patchwork Thu Jul 18 13:19:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6297613BD for ; Thu, 18 Jul 2019 13:19:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5195628767 for ; Thu, 18 Jul 2019 13:19:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 45A3028800; Thu, 18 Jul 2019 13:19:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ED3CE28767 for ; Thu, 18 Jul 2019 13:19:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390467AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38531 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390440AbfGRNTH (ORCPT ); Thu, 18 Jul 2019 09:19:07 -0400 Received: by mail-wr1-f67.google.com with SMTP id g17so28683328wrr.5 for ; Thu, 18 Jul 2019 06:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=Tou9s6+lKBEd+336v5AuGx7s+2YDAAuPHyoFqMGnXRQ=; b=WfhQ8RIckQrezGR2weIw4A0Hvt3FS/TENZ2wyuO1pkBeo7ypwEBypYXZ+o3GZAL30I TXBULrFGysmE9EJZ3CXKxbf0+ISz+XJCKluhMpxkcTBQXqQscZ8DzpaR4zDEZ57set/K Md/mJqzRbDtvY9Vsbf8N+Ij1LnmOlB/ZlhBlWrACFw3lXuhsvo/6vbTfB5I3B1o86BA1 /FNIzLO1WskmzvZgj6RwLcp3+h4DSZwynEkLW5DZUJCeeogMjA7k8JwVZ5GGlN11aB8u c8lFFlxzrP75q7Mgqa5Vxs8JJ5thwvHdftd11l2ljGfN/1jBJVfZQ1YfdamdxFF5NKu8 3+0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=Tou9s6+lKBEd+336v5AuGx7s+2YDAAuPHyoFqMGnXRQ=; b=iileme3iYu0nULenZCOSDr0SYJ++QLMtwbr2JanBaRkEPRiMf3zmhuGNcvinu4Haj+ niSDV0I91Ji2dil21IIJv5NXXEt7qk4/rfMgPlbNi8EAVc3i2h+LRAHEnshFQQDjvYBT xRB8eqPOu9KqYHwH06fs/mIIeUB7LxPqv4lCn5GD2///XImDZorlDkboSTUiHSWPJ3wb kN/GnExAGqN9XkTAEtmcHJJ4+Zbc3h3oZyExdFnFWtfzGnwWGZFDcKNEx6S4SleO+vJP cca/YzhT1SSU7DQ9FBG2CXVueMhQVKzN+SYneIPolff/iX4V0DY5MBere5m16/PGU8Ok /WUA== X-Gm-Message-State: APjAAAW6EpNycu+biqX5pLNGteITY+hot7okWNaceo/mvKrLiGgi6iGr GZZIWIK0JztdSmEe2BuR+SEcRaD6 X-Google-Smtp-Source: APXvYqyKLdc667j5nK5IIuZUnHaztdvK+2Y62U2uED8Vq6tu+W4df2XQwc8NBDHT06SiHrIuBd7KLw== X-Received: by 2002:a5d:4403:: with SMTP id z3mr51219347wrq.29.1563455945336; Thu, 18 Jul 2019 06:19:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c3sm31440792wrx.19.2019.07.18.06.19.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:04 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:04 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:41 GMT Message-Id: <60a45f26948989f928ca439a2860433c0f08f412.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 06/24] contrib/buildsystems: ignore irrelevant files in Generators/ Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The Generators/ directory can contain spurious files such as editors' backup files. Even worse, there could be .swp files which are not even valid Perl scripts. Let's just ignore anything but .pm files in said directory. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsystems/Generators.pm b/contrib/buildsystems/Generators.pm index 408ef714b8..aa4cbaa2ad 100644 --- a/contrib/buildsystems/Generators.pm +++ b/contrib/buildsystems/Generators.pm @@ -17,7 +17,7 @@ BEGIN $me = dirname($me); if (opendir(D,"$me/Generators")) { foreach my $gen (readdir(D)) { - next if ($gen =~ /^\.\.?$/); + next unless ($gen =~ /\.pm$/); require "${me}/Generators/$gen"; $gen =~ s,\.pm,,; push(@AVAILABLE, $gen); From patchwork Thu Jul 18 13:19:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048955 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 29E881510 for ; Thu, 18 Jul 2019 13:19:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 175A128767 for ; Thu, 18 Jul 2019 13:19:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0B15028784; Thu, 18 Jul 2019 13:19:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B1E2D28767 for ; Thu, 18 Jul 2019 13:19:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390480AbfGRNTL (ORCPT ); Thu, 18 Jul 2019 09:19:11 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:41669 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390444AbfGRNTH (ORCPT ); Thu, 18 Jul 2019 09:19:07 -0400 Received: by mail-wr1-f66.google.com with SMTP id c2so25468760wrm.8 for ; Thu, 18 Jul 2019 06:19:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=ZsMTYhK2ok2pSdGHeJ351sDFGcg+R6HsHq5y8VmRNuU=; b=ckQuryfu7HYvLbbDRYkUUmLd4jPcItl9zMMXubNF5gjYm6NwaMXDvtoK3whuIKlhjf Pz6eR5BUpMKD1XQl5hZEIn6LwXGDU5xLXsj12QyRbYdHnMo5AbPlj9+3mRGHGumEX22p Ek5hPm26HFXy65Ai//UkLu5gtPX0EYCFbm8Zl4j1ZiNPj1IVeAebzt/pN4MoJ1pNU1jX 8cJQvP6cP1yAXtfS9jS1Eo0a1ZGrFoXRCN9lA8zt1KpbeyyzLoVxnZT45O/bL7SYYqGa x7zQfUeOz5WQSJFuxKyEraYUXPT9dldEF55rkGxR4kAOg+S2JwNJafKZkIsVXMrLsKcn l+nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=ZsMTYhK2ok2pSdGHeJ351sDFGcg+R6HsHq5y8VmRNuU=; b=XzFVdOrcU9QHRJJJQnvc//0jZSQ6tCw7Oq557TZXn9xTdnZYu70xq3MksN1ij8It5w IKECy/XE91YUoEO+OzeMc3FJWePrEoXHrJesDyYYjde7sycwtaYsHrBiaoLQ0jAxf4GM GvJaeBxrHsa+qh7rRN4/Z65lrv/pa9L+KV7HBDv3aieqdT1f6N7d+LUakj2jri1MF5mg jjxyyi1RtxVY9YV76YnuIwajLDQAwMbFsP8WpBKcKGgYqO2wCZ6PM4OTMfJpjAALn9a3 iijiF39Gt048ryFRFf7J4fjfMTH6z+z8oZWvwiT2KeOahMIOagvuMa0la6V4qP/8C6Ot xPAA== X-Gm-Message-State: APjAAAXgFwlu9ltmv0cWnPE6UQUUbOBbwcJ8s3lpz8b3SM+ATB+/z9qe 4XjD65EJbWK6HqgbjOvNnh8ejc6V X-Google-Smtp-Source: APXvYqxALZxv7S90u3zuc0DP6ioLhJRaL/iqr9XYxSUTnjK4miPsOMBgr6Fg5VshykScVPIUrJ47YQ== X-Received: by 2002:a5d:6406:: with SMTP id z6mr49133569wru.280.1563455946013; Thu, 18 Jul 2019 06:19:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o11sm26574488wmh.37.2019.07.18.06.19.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:05 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:05 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:42 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 07/24] contrib/buildsystems: fix misleading error message Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley The error message talked about a "lib option", but it clearly referred to a link option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 53e65d4db7..11f0e16dda 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -333,7 +333,7 @@ sub handleLinkLine } elsif ($part =~ /\.obj$/) { # do nothing, 'make' should not be producing .obj, only .o files } else { - die "Unhandled lib option @ line $lineno: $part"; + die "Unhandled link option @ line $lineno: $part"; } } # print "AppOut: '$appout'\nLFlags: @lflags\nLibs : @libs\nOfiles: @objfiles\n"; From patchwork Thu Jul 18 13:19:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048989 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4EC5514DB for ; Thu, 18 Jul 2019 13:19:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D93728767 for ; Thu, 18 Jul 2019 13:19:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3217128800; Thu, 18 Jul 2019 13:19:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 860DA28767 for ; Thu, 18 Jul 2019 13:19:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390463AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:42076 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390445AbfGRNTI (ORCPT ); Thu, 18 Jul 2019 09:19:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id x1so13672589wrr.9 for ; Thu, 18 Jul 2019 06:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=78g8+gaDXo8uS1s5S5WVm7dLUprygkhQyQhnC+pZgoE=; b=fN47fop3fMrRmgQKWYFxls5BaU1bTINa1gLrgAVqJ8iu+ZSKqjXcXqBGfrFk1c4KX5 J+6ZnYuQXx/TyTpKIMs+gs895QIZemSU3Tpvq7Rm21y3uRn3a6vc9yCCZnD78xf95l7W YNuJ8yLu7XalfqJ36Hx2AKp16YgKSsMr0/Kv0LlDhUZowalLyhJV6FNA5kof81m7FYPC VhEAINPu6/Q5ve11P/CkRAMT50eqJOJ+ZfI3D7ob5XyQxCa7VWqB4oKWZ24tc/8r6bB0 Vm7esRhD3RmluXjFi4KiM6kG5/LAtmLHcOTmtReZC/2EhbN9l52a6qTT4AYKmsztRgj9 emqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=78g8+gaDXo8uS1s5S5WVm7dLUprygkhQyQhnC+pZgoE=; b=IaOzX3Njq72QgO/R9JCARvjOozLmoAD8lf5hTEN3gLp1gje8xFDjbEQeIRavmT233f SSgyvopFckJeNxqpkMdNpTJmC0P9ckzT6S3RT/ucBZ826kE2QOjX06ipTkA9d661WVo7 anCxX9uQsrGZQQd101bIMGREfiXChMK0n+qt7EHethD5PWYz5nrt2WZfPmyoaisldrfB BrH9NdXRtsplSpReWL0RXfdLZ6Fk+zuYnh4c+vXhBwBa3hf8RZmub+3AHGkqrlYTWyha hQ+wTZheZIa70Cv5JgINCdMzXzeH3Ug6YT9sqSZecgH22qYfR8aMrc+KTt+MDjK5rthr Ac9w== X-Gm-Message-State: APjAAAW6TAPm7PaUEDrdM9WyQ5en3W9SxZgMxPfGq1lFvU14C5hBPdQ4 A5aj5fO6PvZ7wWlqvyNxNWPLrtn+ X-Google-Smtp-Source: APXvYqzCBa1onqGoyFpG02vPX/diFiIhhLhNMUEBYwJi5Av/ssMSB4chA2Cj7G3TvnoaXWfdcfVPmQ== X-Received: by 2002:a5d:60c5:: with SMTP id x5mr49725276wrt.253.1563455946630; Thu, 18 Jul 2019 06:19:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c9sm23564375wml.41.2019.07.18.06.19.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:06 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:06 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:43 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 08/24] contrib/buildsystems: handle quoted spaces in filenames Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley The engine.pl script expects file names not to contain spaces. However, paths with spaces are quite prevalent on Windows. Use shellwords() rather than split() to parse them correctly. Helped-by: Junio C Hamano Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 11f0e16dda..ad6a82c30c 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -12,6 +12,7 @@ use File::Spec; use Cwd; use Generators; +use Text::ParseWords; my (%build_structure, %compile_options, @makedry); my $out_dir = getcwd(); @@ -231,7 +232,7 @@ sub removeDuplicates sub handleCompileLine { my ($line, $lineno) = @_; - my @parts = split(' ', $line); + my @parts = shellwords($line); my $sourcefile; shift(@parts); # ignore cmd while (my $part = shift @parts) { @@ -265,7 +266,7 @@ sub handleLibLine my (@objfiles, @lflags, $libout, $part); # kill cmd and rm 'prefix' $line =~ s/^rm -f .* && .* rcs //; - my @parts = split(' ', $line); + my @parts = shellwords($line); while ($part = shift @parts) { if ($part =~ /^-/) { push(@lflags, $part); @@ -306,7 +307,7 @@ sub handleLinkLine { my ($line, $lineno) = @_; my (@objfiles, @lflags, @libs, $appout, $part); - my @parts = split(' ', $line); + my @parts = shellwords($line); shift(@parts); # ignore cmd while ($part = shift @parts) { if ($part =~ /^-IGNORE/) { From patchwork Thu Jul 18 13:19:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3705C13BD for ; Thu, 18 Jul 2019 13:19:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 25F7228767 for ; Thu, 18 Jul 2019 13:19:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19EAB28800; Thu, 18 Jul 2019 13:19:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C017528767 for ; Thu, 18 Jul 2019 13:19:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390458AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:52040 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390416AbfGRNTI (ORCPT ); Thu, 18 Jul 2019 09:19:08 -0400 Received: by mail-wm1-f66.google.com with SMTP id 207so25582255wma.1 for ; Thu, 18 Jul 2019 06:19:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=XPn/tHCgwc2NQ5JCW3FcsauVSFsTJYzJ8/MQzYnX054=; b=E1xMuPHWC5vxBZpIP9UFHVOv59unW7S/BQxKrcYLF/eYyuaHTOWUDK+T5a7j1NPftj Q7LvvxiOJRpsA0FYcU7vejJELcPstyyh/PqwYLWXAM7hfZiDCFr9cAazeTdnNeTsd0f+ +BpDKzhgIMmKY+h8bLyFoiE398pZD2jwB7QF1pB020hnyNXsB82m6F6b7bzdmoeuuvJt AOUHpSMj+0SBTBUeLxgXuebMhp++NM+/DRj7XYp86m7+1qkrqtzffBREPvsKkYcy5w9H EQaubbYF4kLUT1qSfha4pTpilv7IvArOeXgsFrbt/kcugm4UGDiSnbnAPFWvmMZbRX/F Wq8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=XPn/tHCgwc2NQ5JCW3FcsauVSFsTJYzJ8/MQzYnX054=; b=SlD1k7bbrZ+fB7XQU8qs31qtvgWlUzeBsILAPZI/3y5W2N1j9r6EjrLHCFaa/1ry3z 35JCRnjbcpbgX59wk92Vn9dey5Ezf0/4CCk6A2EP9boZrGSThweogQl42tAA7JG3BMcu K6C8wXLwgREXSN14pzVR4fyVOP5iHuXid/L7gf4e7/OkFKRrb6yAwHeDNNfb7MBqDOAo X1kftIbAQChG9V6ZS4IOJVbQkkc3izKG5cFFwJ+Sbv8niYdzbw9/uZAYvSLwYYg9vhn+ 9Dq3Gt/7wj8Uj+oS8iDQOaxL1oAJkCZGCf2AyzrgOwa00Xzc48Nmho1p+IDsC2nZvWh2 CD8Q== X-Gm-Message-State: APjAAAVdEbiJLMNV34xHMvF5TRb44aOnjMFZssElp7q7zeMRGVqevUDn l7GXVFHaVUjRwyU7cJO7MfUTEPGL X-Google-Smtp-Source: APXvYqwEmlkTGmvhmj7CjMn37Hsb+lYJmB88XL3o91qqmzjMl/A20cuNRj8DTbry/t9L7P5KSESGDw== X-Received: by 2002:a1c:e90d:: with SMTP id q13mr38942510wmc.89.1563455947268; Thu, 18 Jul 2019 06:19:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j33sm61722735wre.42.2019.07.18.06.19.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:06 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:06 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:44 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 09/24] contrib/buildsystems: ignore gettext stuff Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Git's build contains steps to handle internationalization. This caused hiccups in the parser used to generate QMake/Visual Studio project files. As those steps are irrelevant in this context, let's just ignore them. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index ad6a82c30c..9db3d43a1e 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -141,6 +141,12 @@ sub parseMakeOutput next; } + if ($text =~ /^(mkdir|msgfmt) /) { + # options to the Portable Object translations + # the line "mkdir ... && msgfmt ..." contains no linker options + next; + } + if($text =~ / -c /) { # compilation handleCompileLine($text, $line); From patchwork Thu Jul 18 13:19:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B2ACB1510 for ; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FB9928767 for ; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93DC228784; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3A6B228767 for ; Thu, 18 Jul 2019 13:19:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390491AbfGRNTM (ORCPT ); Thu, 18 Jul 2019 09:19:12 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40893 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390449AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: by mail-wr1-f68.google.com with SMTP id r1so28655629wrl.7 for ; Thu, 18 Jul 2019 06:19:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=zuklBnmBkOH1DW/KuvkOJnWKJpRaISv/StUbkCyU4xc=; b=JQR0fsaCWXzYDios6pijrwH8AKldikj5F3bAe/waXoRmfBrZZoMvPkP+Q0+GCJt09L B7mQAI22SJ0DOwNPyAqZdTpQRxaMaCbFtErderW/nwGEM+LD4SEJc3TOzWWE5B/uq+yy x2pc2NUkdpbnVfTFD2PrwRA27fzorSDcOrlDbi6gfaCVEK0IuDkcR5yzpqo/fURHU1xz Z/9RIvLXEoS+NLoJusj9XsQ+J5h7bUyQxUtLoukBokMyiPzQtHuwrQgO65a57SDSp8YZ ujlYDwG73iVzdrKhY8OBXy6Ph+B/bW69GjaOLvnFDYaGphUhbZkXWVA+MYvbiQRzJfUD fVbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=zuklBnmBkOH1DW/KuvkOJnWKJpRaISv/StUbkCyU4xc=; b=Mf8iobDmzSZfDFjPDrINyrzSbrdRDFspjmYwskJLblSWGdTwRuWLj/TsHXjfgTrGgn +Gb9NNNa2W46XKWv2QckccEFGCPWSMHnqTwg10FcgIRcEUeju3ZFmrDRqniBsXqAxf91 tvwq5DwlvcXeE0uNqki89iyX9AZ430XtcGH/wTua+MODZnoyrjTbcx6F3AwOCrC8PNoq OwiJi5U07QcCrRU0puVF0tWg+saj+LLgJfG5q4ssiqJcKrjMeEdNUmDL2pTJaD+o6Dv8 Ac3nYvQxwLaigumwZo/FvND6T4SwSYIQH+Ne8NGTM4X13NmOZ64o+TYKtmyzpNfddF8s 91+A== X-Gm-Message-State: APjAAAVxeNMe3jH1cpuMfMBqjvNz3n718p5NcYlR4TPy6o+Dr82qrTVP 6toZCHY/DnZORXNmr7uerLM19su3 X-Google-Smtp-Source: APXvYqz+3XOA4bdyBzixV3cuBtPE8IL+b+wnEnv/z5wUdhJkkUUrnLJhUYQtPjGQuXbZo+R6yXQOTQ== X-Received: by 2002:adf:f544:: with SMTP id j4mr50365519wrp.150.1563455947930; Thu, 18 Jul 2019 06:19:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c9sm23564433wml.41.2019.07.18.06.19.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:07 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:07 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:45 GMT Message-Id: <3cfbb7843ac3a27c79da4554cc550608b19f2d55.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 10/24] contrib/buildsystems: redirect errors of the dry run into a log file Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Rather than swallowing the errors, it is better to have them in a file. To make it obvious what this is about, use the file name 'msvc-build-makedryerrors.txt'. Further, if the output is empty, simply delete that file. As we target Git for Windows' SDK (which, unlike its predecessor msysGit, offers Perl versions newer than 5.8), we can use the quite readable syntax `if -f -z $ErrsFile` (available in Perl >=5.10). Note that the file will contain the new values of the GIT_VERSION and GITGUI_VERSION if they were generated by the make file. They are omitted if the release is tagged and indentically defined in their respective GIT_VERSION_GEN file DEF_VER variables. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 9db3d43a1e..de5c0b6b25 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -73,7 +73,12 @@ sub showUsage EOM # Pipe a make --dry-run into a variable, if not already loaded from file -@makedry = `cd $git_dir && make -n MSVC=1 V=1 2>/dev/null` if !@makedry; +# Capture the make dry stderr to file for review (will be empty for a release build). + +my $ErrsFile = "msvc-build-makedryerrors.txt"; +@makedry = `make -C $git_dir -n MSVC=1 V=1 2>$ErrsFile` if !@makedry; +# test for an empty Errors file and remove it +unlink $ErrsFile if -f -z $ErrsFile; # Parse the make output into usable info parseMakeOutput(); From patchwork Thu Jul 18 13:19:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 762E013BD for ; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6497D28767 for ; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5919128800; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F352F28767 for ; Thu, 18 Jul 2019 13:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390501AbfGRNTO (ORCPT ); Thu, 18 Jul 2019 09:19:14 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35582 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390452AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: by mail-wr1-f66.google.com with SMTP id y4so28695067wrm.2 for ; Thu, 18 Jul 2019 06:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=OUw7wM3WNOYiu6Xi2N0y7apcoGabVxzK3EzQKZinpnw=; b=EDnKNX/4nMDERo47Lhk7ciNpBLHd0X/iy0rJH1OThhqiOycIV1hqsyJtBjhmLOYzmW KtOlCcH3eoylJ+qZYUt2506Y7S58JorEbQ2wOYFTMkvveFece0aOYoozxxv4WlH83BYe oj9ZKo7m8fBrNWdcG7x2IYD7MH1diSLA0m+SZgOtm0KneP3HDlwNIG6SoOC2a0aAeoA5 I3eKcz2wM9xl8qZD/YzShn83B3QRroTe4PV6elyAWQrcGQoYcl8agxeiB5dIodmPbTbO 4tKRMyR14fXb7BlTxMPkSIZL6ftBlypDicb+ZCjwdIu+jhf2LkpVJGHecR9srVBQ+yQg km/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=OUw7wM3WNOYiu6Xi2N0y7apcoGabVxzK3EzQKZinpnw=; b=XdVGRQjSDxjJ06XwGLVk2tqPSLW+3p64HNickdmEbf955MpBQP4mbTvUBXQpGtYIp/ ZBOSlbmreP68bdf1Eqqpz6WBsM/qf3FRgEOknMW1ZSiwEdgwp+ofrQqIx/e4nNIF7qL0 gHhzN5v/cN3ED9NvalnpJLQvrflN3wbHQVPwguJGzhTfF7+3CAuEZ6GUSnbmn5B1qNA7 VkcvS3ezrE2aXT93T3j2CNUkTiHrkv3zVOcCpy1SF7hooUNxVjQ7V4KZAzQBvi2PMl5a SQdwqtWdfOC76PYky7c0Fh9iCyc9RU6M6Cct90iU0horXoehY7FEayg9mLjYdV7/KMGV 8RxA== X-Gm-Message-State: APjAAAWDo8pZV7uidzidSSJ2fZ+0KqTsU9ba7kLk3mGe3MjVId5IUR1g sQ50Pa4lohxSu72CZ78mixEAEYUO X-Google-Smtp-Source: APXvYqxXYye+Z5Ev6NZ2VkYeJuErYzDfwaFVLUtiIajJIxtVlgeXDFMEhA0RB/8OsqFi5rsIY2RxJA== X-Received: by 2002:adf:90e7:: with SMTP id i94mr21185244wri.224.1563455948616; Thu, 18 Jul 2019 06:19:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s10sm21053311wrt.49.2019.07.18.06.19.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:08 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:08 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:46 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 11/24] contrib/buildsystems: optionally capture the dry-run in a file Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out ` in subsequent runs via the `--in ` option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index de5c0b6b25..732239d817 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -32,6 +32,7 @@ sub showUsage -g --gen Specify the buildsystem generator (default: $gen) Available: $genlist -o --out Specify output directory generation (default: .) + --make-out Write the output of GNU Make into a file -i --in Specify input file, instead of running GNU Make -h,-? --help This help EOM @@ -39,6 +40,7 @@ sub showUsage } # Parse command-line options +my $make_out; while (@ARGV) { my $arg = shift @ARGV; if ("$arg" eq "-h" || "$arg" eq "--help" || "$arg" eq "-?") { @@ -46,6 +48,8 @@ sub showUsage exit(0); } elsif("$arg" eq "--out" || "$arg" eq "-o") { $out_dir = shift @ARGV; + } elsif("$arg" eq "--make-out") { + $make_out = shift @ARGV; } elsif("$arg" eq "--gen" || "$arg" eq "-g") { $gen = shift @ARGV; } elsif("$arg" eq "--in" || "$arg" eq "-i") { @@ -80,6 +84,12 @@ sub showUsage # test for an empty Errors file and remove it unlink $ErrsFile if -f -z $ErrsFile; +if (defined $make_out) { + open OUT, ">" . $make_out; + print OUT @makedry; + close OUT; +} + # Parse the make output into usable info parseMakeOutput(); From patchwork Thu Jul 18 13:19:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048967 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6381B14DB for ; Thu, 18 Jul 2019 13:19:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5342128775 for ; Thu, 18 Jul 2019 13:19:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47B5228800; Thu, 18 Jul 2019 13:19:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F19402880A for ; Thu, 18 Jul 2019 13:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390529AbfGRNTS (ORCPT ); Thu, 18 Jul 2019 09:19:18 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:39763 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390416AbfGRNTL (ORCPT ); Thu, 18 Jul 2019 09:19:11 -0400 Received: by mail-wm1-f67.google.com with SMTP id u25so15308687wmc.4 for ; Thu, 18 Jul 2019 06:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=IrxWEx8GtkHx4fIAP4Or72H4HaPYjZzV1xwU+EApZWE=; b=VdUq5ZyZ/1y1RAaBv5RjF5cBIcsZlCs7hFViPZsW7vSY3tjYaa9LH/ioEkjMEjv+6T xXQKDmN/eEc5GZpXchhXh8BVx1uAMBQ25vbzkWSe2ZmX2t+N3FKfujmzVokLTrYq+z61 JErBs9tHam8poFo2fOIcO9tFCSKGiI37Hzn7yCXiYmr7398WzSmRiSsmxV+0hwJwNVLI IaAnxhfLAV8WZDIYe07MGpkpw5MYhYeemBO/TxKO4wBLOL45+Ra/Rvb8UyO3kOPo650J EVJHFDZYvno1nbNp9H/H0ZAgNSixvbErn5FXbKKnARXwAY4aopFB9x2484+G8H6pKLFS dtHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=IrxWEx8GtkHx4fIAP4Or72H4HaPYjZzV1xwU+EApZWE=; b=R5COhgDxIF0crwVW/CQcwWjJeoszwETGoZdKDHBE2KERfr/DM1ZlurPtqzf6kvDRCt 9By3ioPu4QPRhIqEUng+F2M18KARO0Yz78R1VdAbMob4lgDA0GYPRv6MROxXFMpPsZcV SBZ1rwb+ruX4FVlXrLhF/j3xnBQIqfPPKU3VPJivApd6VgymU9y+5A4DJKzBiMi7PHYC CTDtWt5kAbmOMmAS4OkW7WGtmpp/vhDeC+TzL5HG98OAONqqSw7+ck1REAJdJ/1ytwN1 KPC3uFoNeIrIAE6H/BRAEGu++fPohTdCZrwOLwq8/Eu88EiUfp+3D4PGn+DmcL2KhMd9 0tbw== X-Gm-Message-State: APjAAAVh8Ahw2kQ0IMo3v1uFsxREUUKKKtuy35uIwC4OZQ57LRfBJrVj dj+Lr5xdpc+C+2vrm7R7ajHKHdS0 X-Google-Smtp-Source: APXvYqw3APoPdGzFFOOYVDv7/ow0pSxJCRjQK9tsfQtdcBglqYjJslF1SvKSUVhkSx1jrAAhKNwy/g== X-Received: by 2002:a7b:c106:: with SMTP id w6mr44916188wmi.80.1563455949255; Thu, 18 Jul 2019 06:19:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 15sm19483045wmk.34.2019.07.18.06.19.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:08 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:08 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:47 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 12/24] contrib/buildsystems: error out on unknown option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin One time too many did this developer call the `generate` script passing a `--make-out=` option that was happily ignored (because there should be a space, not an equal sign, between `--make-out` and the path). And one time too many, this script not only ignored it but did not even complain. Let's fix that. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 732239d817..1a12f4d556 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -57,6 +57,8 @@ sub showUsage open(F, "<$infile") || die "Couldn't open file $infile"; @makedry = ; close(F); + } else { + die "Unknown option: " . $arg; } } From patchwork Thu Jul 18 13:19:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048965 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0EAEB13BD for ; Thu, 18 Jul 2019 13:19:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F043C28775 for ; Thu, 18 Jul 2019 13:19:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4E7928806; Thu, 18 Jul 2019 13:19:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5998028775 for ; Thu, 18 Jul 2019 13:19:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390525AbfGRNTR (ORCPT ); Thu, 18 Jul 2019 09:19:17 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36351 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390469AbfGRNTL (ORCPT ); Thu, 18 Jul 2019 09:19:11 -0400 Received: by mail-wm1-f66.google.com with SMTP id g67so21559613wme.1 for ; Thu, 18 Jul 2019 06:19:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=s8x/aF7+M7okFuPWVldB+ez6mGXAol2RuujBgyVBXLU=; b=t6LErc1o3BaitAkrEBAitXv/E5EMbe6nk7ZWR6q/nnE602NTTDP9aFY4aNwEVLfpUK EH++9SzwNhXl4asP3J6k5TUiouUrC4mJjlLSMo7l1AEYjcURtHzPCUZ0x2bhU3TrPcew nAAkasUgmIIvqASM81dCQ+4QJTAQ78fyV7x1CqweRjwAdE/PMm8WndfPdg/dz3mDa+23 xVYCqs3n+FONcKdL65PkBs2lhukRWAFpCr072I5lAKhWSkeOdpyOtSt/4IcZiebiqide x9LIzXcjsKsT3VYCw2NPu4hzQ/um7YypVrEu3zwEn1A/9lnAx7zWPlW3O86tk27KgrcN 8wIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=s8x/aF7+M7okFuPWVldB+ez6mGXAol2RuujBgyVBXLU=; b=DNnUyLDhH0et/XCi8eATAvcYmSMMP9wFBAO3d/2+Qflypci0ohbwSApDhtugpWVS9C 7lSN93sj5tCgcLo0Y/q7Rb5Z6Gc/bp3U99Dlp1040CTI+oC2ze+aO7VlvkGx31Pm+Sf2 K8Fw4gOWBPjy0YmHinhoAhdku/m7Ym8DgKR1wW8ngtDUFaYubPsKXUEqf/r5XXgN8M8E nRhTV8Pmse0ffv+4uDSrSoCIdpyl77+93fKWHhdTiGT6UP2gqVgt+zgvz9GZlDhXevj9 jAb+9hZa76ZNTK7+QrY1218hBHmDPsfOT2Gdc396wFD0+Tg4pfB3wk4Tr+6rofPLyR8a DBWw== X-Gm-Message-State: APjAAAUrt+HY8JC93GbO5698McusL9RrzENr9XFV4h2HWh6qRYMkW2Tu mRSr2tGwk8wx4Ayxr0IcVIPUo3LU X-Google-Smtp-Source: APXvYqz6mVwzSvvOylKQ5tBUDkQq07MmSQuzfNwFjMPnHht0OIqapCzHyWkmNHM+BG5ObfPt+BStsw== X-Received: by 2002:a1c:a1c1:: with SMTP id k184mr44007732wme.81.1563455949871; Thu, 18 Jul 2019 06:19:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n8sm20981529wro.89.2019.07.18.06.19.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:09 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:09 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:48 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 13/24] contrib/buildsystems: handle the curl library option Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Upon seeing the '-lcurl' option, point to the libcurl.lib. While there, fix the elsif indentation. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 1a12f4d556..d613277595 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -341,10 +341,12 @@ sub handleLinkLine $appout = shift @parts; } elsif ("$part" eq "-lz") { push(@libs, "zlib.lib"); - } elsif ("$part" eq "-lcrypto") { + } elsif ("$part" eq "-lcrypto") { push(@libs, "libeay32.lib"); } elsif ("$part" eq "-lssl") { push(@libs, "ssleay32.lib"); + } elsif ("$part" eq "-lcurl") { + push(@libs, "libcurl.lib"); } elsif ($part =~ /^-/) { push(@lflags, $part); } elsif ($part =~ /\.(a|lib)$/) { From patchwork Thu Jul 18 13:19:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048981 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2CCF414DB for ; Thu, 18 Jul 2019 13:19:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BDED28767 for ; Thu, 18 Jul 2019 13:19:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1066B28800; Thu, 18 Jul 2019 13:19:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAEE028767 for ; Thu, 18 Jul 2019 13:19:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390517AbfGRNTQ (ORCPT ); Thu, 18 Jul 2019 09:19:16 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:41688 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390470AbfGRNTM (ORCPT ); Thu, 18 Jul 2019 09:19:12 -0400 Received: by mail-wr1-f67.google.com with SMTP id c2so25469076wrm.8 for ; Thu, 18 Jul 2019 06:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=kXc66PEqxg+GbFYsh0oZ7XdTgPZq9GqHCXpd+lonCGA=; b=f93uDuJnMuWt0b+2s7SxP/zf+V4oSS9UFUEb0eIouvN5+WwqtMgD6IMMWKQpkQztNA qFwISXC3+4rP16unfa2SKn6WawD5pgvKvVjO5GXBKT68PNnSm5Md0tPZa+CKggSlb+F4 2/l46NQOt2ZfJ1QKjCJM3zfXWzD/tjy/SMHToc/2CFqrLNfCT3QXPXD8GdtWRPeJ+n3l aCKKtzf8FjYPcscjAUDsOm/gYGEemryKy+JhFRz6DtSmHm5EnZuXODybR2xlSYe4ZVVN yGHEkTHOI5drIDFiCiFYysQqz51KiCOj60BFGY9T+aaZBeHLVLT6ISV529vezODaP6Xh K7Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=kXc66PEqxg+GbFYsh0oZ7XdTgPZq9GqHCXpd+lonCGA=; b=BDU4z+gjaCGQFj3wlbiW2T9Hr8kqt9Py9x/3D5JiFUbqTjU60WfBz/CudGQJwJZAkl rn7v477Ka8Kx3bCY99rh17J/n3A4Eu/2j3qM34s/Zx8eC66zWygIJZHe4srim6CkQlho c/rLbMD61uXeOh3w1WZeSHQW4liAPSP6LgqhXW48mApXZZSicfWoMqR8h0eEpq43mfqA 3+2SZL61/QI8ilbV03xNqE4nHeZ9BsWsMZfmFc5nTuJrMl30aQEw6kT7QwuhbjwE81Um rN5oV6M6QoJdDsspL7y63Vf2SZDWi/Af0DCFJzup3/vRK7l4U2/CK7451N96gYt1v1oh F1Ow== X-Gm-Message-State: APjAAAWH6DdG+Xwvog+ST4xYaw1iV3VALj+3UN17fc2bVKLqHn66F7Om SQLO1KF8zzLlcO4CXiyJVW4iODtz X-Google-Smtp-Source: APXvYqzBMP8tu/wEq3Er0Hnp7UfAZ4yd2W1o3/oWSUZx6HxkvfgmELO/zi8Ors2ydCld3DQIwtR7lQ== X-Received: by 2002:adf:ed11:: with SMTP id a17mr50308047wro.112.1563455950476; Thu, 18 Jul 2019 06:19:10 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n5sm22697134wmi.21.2019.07.18.06.19.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:10 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:10 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:49 GMT Message-Id: <052a98b8bb8aef572cba41dbdaf15a7b987b8270.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 14/24] contrib/buildsystems: handle libiconv, too Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Git's test suite shows tons of breakages unless Git is compiled *without* NO_ICONV. That means, in turn, that we need to generate build definitions *with* libiconv, which in turn implies that we have to handle the -liconv option properly. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index d613277595..c35844a0c7 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -347,6 +347,8 @@ sub handleLinkLine push(@libs, "ssleay32.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); + } elsif ("$part" eq "-liconv") { + push(@libs, "libiconv.lib"); } elsif ($part =~ /^-/) { push(@lflags, $part); } elsif ($part =~ /\.(a|lib)$/) { From patchwork Thu Jul 18 13:19:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048963 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5B3EF13BD for ; Thu, 18 Jul 2019 13:19:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A41728767 for ; Thu, 18 Jul 2019 13:19:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3ECCB28800; Thu, 18 Jul 2019 13:19:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E076E28767 for ; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390510AbfGRNTP (ORCPT ); Thu, 18 Jul 2019 09:19:15 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39775 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390482AbfGRNTM (ORCPT ); Thu, 18 Jul 2019 09:19:12 -0400 Received: by mail-wm1-f65.google.com with SMTP id u25so15308858wmc.4 for ; Thu, 18 Jul 2019 06:19:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=1/ePF9dc8ys6tF+gVCZz4s2sJE19gkqnhPeIJjYhB9w=; b=eFIMgwwrmktgmPztkkrvGw6MUhcqKVpmvHPOavxH4U04BLqyIpSkgFGUEpr+zN3gR3 yrLdEF7zDSeZUxRCI875lwdWmS+96ngy0jcKT6bZ0O+7BW/MvSBqZ2UAiZ8m6965amGp NmDnOvNJAlIkKbIW5IY3o8zOCExRsCRh7K6hvfza1TXQLxtLouSOGjVF+/AO1DsxP/TO 9h/A1AtiqRQS7qsi2+4gYOmNeYz+94lU8HwVhBJEL+vcdQvvluriD4OMwnQbK98Rcz23 Q2o3eWo/9kBKr3I3L30UQ5RHyttJb/NUAOnEbFyh3Fc/T7AOdCCuM0pmcAmZJHHSGZgG HPQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=1/ePF9dc8ys6tF+gVCZz4s2sJE19gkqnhPeIJjYhB9w=; b=oJ8kgZJBXhRmMD7lotl+AD1xVC9JknhgRVgJ2+fszTxmqu5lNIXIx+ZA6xIjtUnmH6 AxyfV32+HhwhJPpwsk8TlGfL01TxWrFuhMBG1r+3WLWT7Ai1fqxAV+OgOg2GFeC3M6BC wFy4jsiTi2Y9NFfFiF6aW7Fq/UYULlvUnlm+rfSHH9C4d6h61swyE4etgG6ZwATOFrxr 1bIYKr0EQf70x21E6R+fPeUtC1N9DBghvKeuhVhCbj5MwShNqEywfT8Us+2HwzQB+lMO FVGCtJZgUHVKalLRZJo+5G2IR5IZP3/UKAZr0t4gb0j99reeyMbR0JBDMGsZwZrHLkjG a61w== X-Gm-Message-State: APjAAAVuBR4CVFHx9UKM+w75b4gAOIormtFFpOieJv/N28frGPzFvbqa sfHGg9Kn5G7unhubFuM81fLByd54 X-Google-Smtp-Source: APXvYqydgZ9AR6JH6KvVAjLlcnOAPfidCuPcryEhZ6C1Ut0KRHiSOyXSMpYKukeqk2SdCqt4AhJXGQ== X-Received: by 2002:a1c:f018:: with SMTP id a24mr41392867wmb.66.1563455951124; Thu, 18 Jul 2019 06:19:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c9sm23564564wml.41.2019.07.18.06.19.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:10 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:10 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:50 GMT Message-Id: <5c9702ea50fa2eac880e5a3d02b4e6734593d445.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 15/24] contrib/buildsystems: also handle -lexpat Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin This is a dependency required for the non-smart HTTP backend. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index c35844a0c7..9bde7ae15b 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -347,6 +347,8 @@ sub handleLinkLine push(@libs, "ssleay32.lib"); } elsif ("$part" eq "-lcurl") { push(@libs, "libcurl.lib"); + } elsif ("$part" eq "-lexpat") { + push(@libs, "expat.lib"); } elsif ("$part" eq "-liconv") { push(@libs, "libiconv.lib"); } elsif ($part =~ /^-/) { From patchwork Thu Jul 18 13:19:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EAE5413BD for ; Thu, 18 Jul 2019 13:19:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D954228767 for ; Thu, 18 Jul 2019 13:19:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CDD8928800; Thu, 18 Jul 2019 13:19:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FA0028767 for ; Thu, 18 Jul 2019 13:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390591AbfGRNTe (ORCPT ); Thu, 18 Jul 2019 09:19:34 -0400 Received: from mail-wm1-f50.google.com ([209.85.128.50]:34942 "EHLO mail-wm1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390487AbfGRNTN (ORCPT ); Thu, 18 Jul 2019 09:19:13 -0400 Received: by mail-wm1-f50.google.com with SMTP id l2so25677670wmg.0 for ; Thu, 18 Jul 2019 06:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=D4hbnnz1wl16W68xXYb3sjuP3z16WnFfPUUKFYLJTlU=; b=gyaKNea/PoHWNXCd5oajLXwC6GnmxfiH76UEzLYNf6Qr36vDG01/RUQXqkVAP77nRi vMddAVBeWOmeq/kOLbGr6+AXWmwk7NdZLjCp/SUyLVgsaEVJfU4H2QNuFjb+CJbskowM OpeTcxzA8K2QtNRxkjf/hwWkbteK81NB7kDmRu/2b7L0Tws4pfSjcpBkcWWX02vYyzxz x6Ik0hCMFXrO5ilGLTcQluoSmv79JC1GzLmgQc05auiHEI/D6MtOko/XO7hkDjODspC/ 7MKoVVUTKzsw/cdKcFpEbx4YBddVrowW1/3kROJbgDIAa9r91FQ2iaJwQk9ploFLXAkP Pgpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=D4hbnnz1wl16W68xXYb3sjuP3z16WnFfPUUKFYLJTlU=; b=gVw/nUMo9I5yYt15QXrvQaT/EJgxNa3CHR4y+IkTD5bR8i2TYXOEA7d0Kyc04XznMn vzJs473J2S+QEpcImYSC139SNHLR1qfUKaiOthgtJ1TZ2jj6eA0FhU7tuufhPGQuXy8B Nrh31HC8f70UW0f0sBXYXOEyUgm8XO/4fKcsHeldqyc7OQgjFVGHk85WFQVXmKJXWmlt bNZD5k/9pV2Fcc6Gw51EbrpFlnCKBHyen3+y6+IBggtwk2vLHQqt2HIeh6jTWCpAgaFp xzQnsa0UnTesqvc6Y6iuY766IbAuiFOeDv/pXLZ1aiNfcDbzHiGkpensAY34bYH2gOnW cU9w== X-Gm-Message-State: APjAAAXm3cjYpG/iAmAMieANh6S2/RVR8TqxxR8gQYManyCY8kiE2fZK nPgE8w71o93UelV5iUyzwKYydA1y X-Google-Smtp-Source: APXvYqyvMj/eogJyhB4RJ0HhnUlZq2+hJc9hvxOuTV0yhOgimGlUcX9x8Tf5ocAgtQCKhMpeRyJiPQ== X-Received: by 2002:a05:600c:24a:: with SMTP id 10mr43522296wmj.7.1563455951742; Thu, 18 Jul 2019 06:19:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y6sm21575843wrp.12.2019.07.18.06.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:11 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:11 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:51 GMT Message-Id: <1d4c5539ef5e9c1e83e0ce6d641c535dabf5d242.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 16/24] contrib/buildsystems: handle options starting with a slash Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin With the recent changes to allow building with MSVC=1, we now pass the /OPT:REF option to the compiler. This confuses the parser that wants to turn the output of a dry run into project definitions for QMake and Visual Studio: Unhandled link option @ line 213: /OPT:REF at [...] Let's just extend the code that passes through options that start with a dash, so that it passes through options that start with a slash, too. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 9bde7ae15b..8bb07e8e25 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -351,7 +351,7 @@ sub handleLinkLine push(@libs, "expat.lib"); } elsif ("$part" eq "-liconv") { push(@libs, "libiconv.lib"); - } elsif ($part =~ /^-/) { + } elsif ($part =~ /^[-\/]/) { push(@lflags, $part); } elsif ($part =~ /\.(a|lib)$/) { $part =~ s/\.a$/.lib/; From patchwork Thu Jul 18 13:19:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E24E714DB for ; Thu, 18 Jul 2019 13:19:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CECBF28767 for ; Thu, 18 Jul 2019 13:19:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C274428806; Thu, 18 Jul 2019 13:19:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3C6B28767 for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390540AbfGRNTT (ORCPT ); Thu, 18 Jul 2019 09:19:19 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:33374 "EHLO mail-wm1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390494AbfGRNTP (ORCPT ); Thu, 18 Jul 2019 09:19:15 -0400 Received: by mail-wm1-f53.google.com with SMTP id h19so21502444wme.0 for ; Thu, 18 Jul 2019 06:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=JqEGn0iA9IcZlVsF3NPyPohrppKBFD3c4h35f5Za8Is=; b=StBejCXq7vCu34WQgeqB1sXM8oekRNAoBzAvluB9My/GnDgfeaS3Xfmkgst+0fLDXB VijSwwRjTZHqduTNf7RF/SRmrPLY2Bz9mXxIhKZ1U8Sz4DnCyVGvXeertybiIdXOFhgi /mTb/owj5nKm2fdlvYcEd0Pu1vykPK05yLneDxlsgcbdSnVUnIWNt0D5do5wfrZSlkEq ZzbUl092k95CganD/0W4KQ3IiSfjS3h1jz92bSh28muD/u8i1uLnUK5wgZ4RSJaHq23d fD2ayK9X8tQoYQ+RMTQxzNEeX77wm8mSllf0tj07EgVr+abooWHrsCYS8sAf4PfEkV/I LZ5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=JqEGn0iA9IcZlVsF3NPyPohrppKBFD3c4h35f5Za8Is=; b=mztv2h/ZtLtWQrXvp5fFskUH2OIgITJWSV4vKAlt30Xqxbpe64QhX7YvjLGZ2C52Bs JGBNNw9AiTXvUXwtc3WF6yL102or1KOLv+Byob5sdReVdLkwTSjylKpkIOfOcC0lyUKp +Hp/Y2kTKQSLxvsKnbsLXwScwvOIryRSCqvexoPTWXl9HgxLtiXrhAO+k0vscXVXDAPJ 8Y3q5xGqmnT08GH+3uMPzvaQtH2Cqk2zX4vvwl0RvVWB5vNdklfjAmEwW0AvcIRbFbsT DqvcQYxtUbxWpdRDDKmGd1Z3FUW3BHsNYcPxkncicL6LwHsWAgRH2olBQiPyZLIZkbQe 2yOw== X-Gm-Message-State: APjAAAWtfac0eyRHnZ4xI5JBR6pkNSQs+wihV/spi1fbl3NTRwaMp3hB IokQ7oO4VfTimLZil0ZpJKpqv/F1 X-Google-Smtp-Source: APXvYqzsJOUgiNfxSst9J/AiJ8hebZilv/asdVQjP3I1vNy+GV5JBFR/ZtCviDjxngvVjLC2DlwD2w== X-Received: by 2002:a1c:63d7:: with SMTP id x206mr43135915wmb.19.1563455952501; Thu, 18 Jul 2019 06:19:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o6sm50706661wra.27.2019.07.18.06.19.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:12 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:12 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:52 GMT Message-Id: <59c50989eabc9da12246e58ddc3d87b34e6b46e4.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 17/24] contrib/buildsystems: add a backend for modern Visual Studio versions Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Based on the previous patches in this patch series that fixed the generator for `.vcproj` files (which were used by Visual Studio prior to 2015 to define projects), this patch offers to generate project definitions for neweer versions of Visual Studio (which use `.vcxproj` files). To that end, this patch copy-edits the generator of the `.vcproj`. In addition, we now use the `vcpkg` system which allows us to build Git's dependencies (e.g. curl, libexpat) conveniently. The support scripts were introduced in the `jh/msvc` patch series, and with this patch we initialize the `vcpkg` conditionally, in the `libgit` project's `PreBuildEvent`. To allow for parallel building of the projects, we therefore put `libgit` at the bottom of the project hierarchy. Signed-off-by: Johannes Schindelin --- contrib/buildsystems/Generators/Vcxproj.pm | 384 +++++++++++++++++++++ 1 file changed, 384 insertions(+) create mode 100644 contrib/buildsystems/Generators/Vcxproj.pm diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm new file mode 100644 index 0000000000..9e7ed24912 --- /dev/null +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -0,0 +1,384 @@ +package Generators::Vcxproj; +require Exporter; + +use strict; +use vars qw($VERSION); +use Digest::SHA qw(sha256_hex); + +our $VERSION = '1.00'; +our(@ISA, @EXPORT, @EXPORT_OK, @AVAILABLE); +@ISA = qw(Exporter); + +BEGIN { + push @EXPORT_OK, qw(generate); +} + +sub generate_guid ($) { + my $hex = sha256_hex($_[0]); + $hex =~ s/^(.{8})(.{4})(.{4})(.{4})(.{12}).*/{$1-$2-$3-$4-$5}/; + $hex =~ tr/a-z/A-Z/; + return $hex; +} + +sub generate { + my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_; + my @libs = @{$build_structure{"LIBS"}}; + foreach (@libs) { + createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 1); + } + + my @apps = @{$build_structure{"APPS"}}; + foreach (@apps) { + createProject($_, $git_dir, $out_dir, $rel_dir, \%build_structure, 0); + } + + createGlueProject($git_dir, $out_dir, $rel_dir, %build_structure); + return 0; +} + +sub createProject { + my ($name, $git_dir, $out_dir, $rel_dir, $build_structure, $static_library) = @_; + my $label = $static_library ? "lib" : "app"; + my $prefix = $static_library ? "LIBS_" : "APPS_"; + my $config_type = $static_library ? "StaticLibrary" : "Application"; + print "Generate $name vcxproj $label project\n"; + my $cdup = $name; + $cdup =~ s/[^\/]+/../g; + $cdup =~ s/\//\\/g; + $rel_dir = $rel_dir eq "." ? $cdup : "$cdup\\$rel_dir"; + $rel_dir =~ s/\//\\/g; + + my $target = $name; + if ($static_library) { + $target =~ s/\.a//; + } else { + $target =~ s/\.exe//; + } + + my $uuid = generate_guid($name); + $$build_structure{"$prefix${target}_GUID"} = $uuid; + my $vcxproj = $target; + $vcxproj =~ s/(.*\/)?(.*)/$&\/$2.vcxproj/; + $vcxproj =~ s/([^\/]*)(\/lib)\/(lib.vcxproj)/$1$2\/$1_$3/; + $$build_structure{"$prefix${target}_VCXPROJ"} = $vcxproj; + + my @srcs = sort(map("$rel_dir\\$_", @{$$build_structure{"$prefix${name}_SOURCES"}})); + my @sources; + foreach (@srcs) { + $_ =~ s/\//\\/g; + push(@sources, $_); + } + my $defines = join(";", sort(@{$$build_structure{"$prefix${name}_DEFINES"}})); + my $includes= join(";", sort(map { s/^-I//; s/\//\\/g; File::Spec->file_name_is_absolute($_) ? $_ : "$rel_dir\\$_" } @{$$build_structure{"$prefix${name}_INCLUDES"}})); + my $cflags = join(" ", sort(map { s/^-[GLMOWZ].*//; s/.* .*/"$&"/; $_; } @{$$build_structure{"$prefix${name}_CFLAGS"}})); + $cflags =~ s//>/g; + + my $libs_release = "\n "; + my $libs_debug = "\n "; + if (!$static_library) { + $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.lib)/, @{$$build_structure{"$prefix${name}_LIBS"}})); + $libs_debug = $libs_release; + $libs_debug =~ s/zlib\.lib/zlibd\.lib/; + } + + $defines =~ s/-D//g; + $defines =~ s//>/g; + $defines =~ s/\'//g; + + die "Could not create the directory $target for $label project!\n" unless (-d "$target" || mkdir "$target"); + + open F, ">$vcxproj" or die "Could not open $vcxproj for writing!\n"; + binmode F, ":crlf :utf8"; + print F chr(0xFEFF); + print F << "EOM"; + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + $uuid + Win32Proj + x86-windows + x64-windows + $cdup\\compat\\vcbuild\\vcpkg\\installed\\\$(VCPKGArch) + \$(VCPKGArchDirectory)\\debug\\bin + \$(VCPKGArchDirectory)\\debug\\lib + \$(VCPKGArchDirectory)\\bin + \$(VCPKGArchDirectory)\\lib + \$(VCPKGArchDirectory)\\include + $libs_debug + $libs_release + + + + true + true + + + false + true + + + $config_type + v140 + + ..\\ + + + + + + + + + + + + + false + true + + + + $cflags %(AdditionalOptions) + $cdup;$cdup\\compat;$cdup\\compat\\regex;$cdup\\compat\\win32;$cdup\\compat\\poll;$cdup\\compat\\vcbuild\\include;\$(VCPKGIncludeDirectory);%(AdditionalIncludeDirectories) + + OnlyExplicitInline + + ProgramDatabase + + + true + + + \$(VCPKGLibDirectory);%(AdditionalLibraryDirectories) + \$(VCPKGLibs);\$(AdditionalDependencies) + invalidcontinue.obj %(AdditionalOptions) + wmainCRTStartup + $cdup\\compat\\win32\\git.manifest + Console + +EOM + if ($target eq 'libgit') { + print F << "EOM"; + + Initialize VCPKG + del "$cdup\\compat\\vcbuild\\vcpkg" + call "$cdup\\compat\\vcbuild\\vcpkg_install.bat" + +EOM + } + print F << "EOM"; + + + + MachineX86 + + + + + Disabled + WIN32;_DEBUG;$defines;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + + + true + + + + + MaxSpeed + true + WIN32;NDEBUG;$defines;%(PreprocessorDefinitions) + MultiThreadedDLL + true + Speed + + + true + true + true + + + +EOM + foreach(@sources) { + print F << "EOM"; + +EOM + } + print F << "EOM"; + +EOM + if (!$static_library || $target =~ 'vcs-svn' || $target =~ 'xdiff') { + my $uuid_libgit = $$build_structure{"LIBS_libgit_GUID"}; + my $uuid_xdiff_lib = $$build_structure{"LIBS_xdiff/lib_GUID"}; + + print F << "EOM"; + + + $uuid_libgit + false + +EOM + if (!($name =~ 'xdiff')) { + print F << "EOM"; + + $uuid_xdiff_lib + false + +EOM + } + if ($name =~ /(test-(line-buffer|svn-fe)|^git-remote-testsvn)\.exe$/) { + my $uuid_vcs_svn_lib = $$build_structure{"LIBS_vcs-svn/lib_GUID"}; + print F << "EOM"; + + $uuid_vcs_svn_lib + false + +EOM + } + print F << "EOM"; + +EOM + } + print F << "EOM"; + +EOM + if (!$static_library) { + print F << "EOM"; + + + + + + +EOM + } + print F << "EOM"; + +EOM + close F; +} + +sub createGlueProject { + my ($git_dir, $out_dir, $rel_dir, %build_structure) = @_; + print "Generate solutions file\n"; + $rel_dir = "..\\$rel_dir"; + $rel_dir =~ s/\//\\/g; + my $SLN_HEAD = "Microsoft Visual Studio Solution File, Format Version 11.00\n# Visual Studio 2010\n"; + my $SLN_PRE = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = "; + my $SLN_POST = "\nEndProject\n"; + + my @libs = @{$build_structure{"LIBS"}}; + my @tmp; + foreach (@libs) { + $_ =~ s/\.a//; + push(@tmp, $_); + } + @libs = @tmp; + + my @apps = @{$build_structure{"APPS"}}; + @tmp = (); + foreach (@apps) { + $_ =~ s/\.exe//; + if ($_ eq "git" ) { + unshift(@tmp, $_); + } else { + push(@tmp, $_); + } + } + @apps = @tmp; + + open F, ">git.sln" || die "Could not open git.sln for writing!\n"; + binmode F, ":crlf :utf8"; + print F chr(0xFEFF); + print F "$SLN_HEAD"; + + foreach (@apps) { + my $appname = $_; + my $uuid = $build_structure{"APPS_${appname}_GUID"}; + print F "$SLN_PRE"; + my $vcxproj = $build_structure{"APPS_${appname}_VCXPROJ"}; + $vcxproj =~ s/\//\\/g; + $appname =~ s/.*\///; + print F "\"${appname}\", \"${vcxproj}\", \"${uuid}\""; + print F "$SLN_POST"; + } + foreach (@libs) { + my $libname = $_; + my $uuid = $build_structure{"LIBS_${libname}_GUID"}; + print F "$SLN_PRE"; + my $vcxproj = $build_structure{"LIBS_${libname}_VCXPROJ"}; + $vcxproj =~ s/\//\\/g; + $libname =~ s/\//_/g; + print F "\"${libname}\", \"${vcxproj}\", \"${uuid}\""; + print F "$SLN_POST"; + } + + print F << "EOM"; +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection +EOM + print F << "EOM"; + GlobalSection(ProjectConfigurationPlatforms) = postSolution +EOM + foreach (@apps) { + my $appname = $_; + my $uuid = $build_structure{"APPS_${appname}_GUID"}; + print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n"; + print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n"; + print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n"; + print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n"; + print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n"; + print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n"; + print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n"; + print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n"; + } + foreach (@libs) { + my $libname = $_; + my $uuid = $build_structure{"LIBS_${libname}_GUID"}; + print F "\t\t${uuid}.Debug|x64.ActiveCfg = Debug|x64\n"; + print F "\t\t${uuid}.Debug|x64.Build.0 = Debug|x64\n"; + print F "\t\t${uuid}.Debug|x86.ActiveCfg = Debug|Win32\n"; + print F "\t\t${uuid}.Debug|x86.Build.0 = Debug|Win32\n"; + print F "\t\t${uuid}.Release|x64.ActiveCfg = Release|x64\n"; + print F "\t\t${uuid}.Release|x64.Build.0 = Release|x64\n"; + print F "\t\t${uuid}.Release|x86.ActiveCfg = Release|Win32\n"; + print F "\t\t${uuid}.Release|x86.Build.0 = Release|Win32\n"; + } + + print F << "EOM"; + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal +EOM + close F; +} + +1; From patchwork Thu Jul 18 13:19:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 97C3513BD for ; Thu, 18 Jul 2019 13:19:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 854F528767 for ; Thu, 18 Jul 2019 13:19:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7916728800; Thu, 18 Jul 2019 13:19:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AD6C828775 for ; Thu, 18 Jul 2019 13:19:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390533AbfGRNTS (ORCPT ); Thu, 18 Jul 2019 09:19:18 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43613 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390386AbfGRNTP (ORCPT ); Thu, 18 Jul 2019 09:19:15 -0400 Received: by mail-wr1-f65.google.com with SMTP id p13so28644452wru.10 for ; Thu, 18 Jul 2019 06:19:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=GM/y04ajKEys86gTJ1hKFc0hqj5SVtYCPH4UF6OpRqg=; b=qEDOpGf83n0SZFX0Hnj59DOseoti6xRjhPifbhyyjzUePAeUtz5lQS8cFSRUz7FHGi lR2M5b9vFMUvoM1i8IgJflchsKm5xDNZQXSyfM/QBJt+GdSF9yTJjhq18HJXAZgItVmg chmTXI7l2wCaLGV++ZkO7Jg4cD4VoSXEUA1mfAErULpgxBJ811MGeACcpEMrKHtiZAPP hhQCch84/5ajo1jSZY5fC9sMsdS/Ptz5fMXXrQLrAXsfRLBxRhelpxVMkV0toBjaZ0rH SZMXlDCimviRrOi/BplRRk0yCExI0WR92UujrPsyYJzkvGO6wZHxifvFFr8pQNS2EwNo WMkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=GM/y04ajKEys86gTJ1hKFc0hqj5SVtYCPH4UF6OpRqg=; b=sAuO+QCXVYpSdITdlVtvqI+O4GLVO6jRAkwpIfUDBxMwwB6OS+AYu2dmnCdGCsHHFl 5T/k8e2HHwkK3Hve3w5lCauPxkBxTpB3E0KJQ7O1LYkbD0JEKoJmkAZfvmbDNgEhJ28Q MCfRwLDTiSbbVUCY/gb19JsDiHpmGbGznnP2LkkBxOHYPgRx4MJEj3/OCTXEa2GCzd1a YZfdP7rBqfOjKtkfq6NogQQXEVa3GLO5CQeDiUOFgs/f4Kj4Ai8yFJ2Er8VinMK9Fw/4 iLS5eBsoK4H0rXnJ+uVEwF8AgpWNabqePKzs9wX18fEB2IxX2fj1A4MFPz3WTFsBUlfx 8dag== X-Gm-Message-State: APjAAAXnottWZBRSNHdwaa14wstSNN5M1nKws1T1j0mhM6Kgn28ME4V6 BPoQyuGzRHtFg45ILb4IaqEb68Ty X-Google-Smtp-Source: APXvYqxsbvPbAE/u3XbL3Wmp3YACJawIZN0gmQYdP6ffPlSNTqLHmr015Ud2zEEzyRqtNxQhoXlTqg== X-Received: by 2002:a5d:4309:: with SMTP id h9mr48362403wrq.221.1563455953177; Thu, 18 Jul 2019 06:19:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f17sm23091353wmf.27.2019.07.18.06.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:12 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:12 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:53 GMT Message-Id: <23615bc8cfd6e3d12d769f99051916ca5b2641e8.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 18/24] msvc: add a Makefile target to pre-generate the Visual Studio solution Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The entire idea of generating the VS solution makes only sense if we generate it via Continuous Integration; otherwise potential users would still have to download the entire Git for Windows SDK. If we pre-generate the Visual Studio solution, Git can be built entirely within Visual Studio, and the test scripts can be run in a regular Git for Windows (e.g. the Portable Git flavor, which does not include a full GCC toolchain and therefore weighs only about a tenth of Git for Windows' SDK). So let's just add a target in the Makefile that can be used to generate said solution; The generated files will then be committed so that they can be pushed to a branch ready to check out by Visual Studio users. To make things even more useful, we also generate and commit other files that are required to run the test suite, such as templates and bin-wrappers: with this, developers can run the test suite in a regular Git Bash after building the solution in Visual Studio. Note: for this build target, we do not actually need to initialize the `vcpkg` system, so we don't. Signed-off-by: Johannes Schindelin --- compat/vcbuild/README | 23 +++++++++++++ config.mak.uname | 61 ++++++++++++++++++++++++++++++++++ contrib/buildsystems/engine.pl | 3 +- 3 files changed, 86 insertions(+), 1 deletion(-) diff --git a/compat/vcbuild/README b/compat/vcbuild/README index b633e7db98..1b6dabf5a2 100644 --- a/compat/vcbuild/README +++ b/compat/vcbuild/README @@ -37,6 +37,29 @@ The Steps to Build Git with VS2015 or VS2017 from the command line. ================================================================ +Alternatively, run `make vcxproj` and then load the generated `git.sln` in +Visual Studio. The initial build will install the vcpkg system and build the +dependencies automatically. This will take a while. + +Instead of generating the `git.sln` file yourself (which requires a full Git +for Windows SDK), you may want to consider fetching the `vs/master` branch of +https://github.com/git-for-windows/git instead (which is updated automatically +via CI running `make vcxproj`). The `vs/master` branch does not require a Git +for Windows to build, but you can run the test scripts in a regular Git Bash. + +Note that `make vcxproj` will automatically add and commit the generated `.sln` +and `.vcxproj` files to the repo. This is necessary to allow building a +fully-testable Git in Visual Studio, where a regular Git Bash can be used to +run the test scripts (as opposed to a full Git for Windows SDK): a number of +build targets, such as Git commands implemented as Unix shell scripts (where +`@@SHELL_PATH@@` and other placeholders are interpolated) require a full-blown +Git for Windows SDK (which is about 10x the size of a regular Git for Windows +installation). + +If your plan is to open a Pull Request with Git for Windows, it is a good idea +to drop this commit before submitting. + +================================================================ The Steps of Build Git with VS2008 1. You need the build environment, which contains the Git dependencies diff --git a/config.mak.uname b/config.mak.uname index 48a6723222..6d0ed923b8 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -25,10 +25,12 @@ include compat/vcbuild/MSVC-DEFS-GEN # See if vcpkg and the vcpkg-build versions of the third-party # libraries that we use are installed. We include the result # to get $(vcpkg_*) variables defined for the Makefile. +ifeq (,$(SKIP_VCPKG)) compat/vcbuild/VCPKG-DEFS: compat/vcbuild/vcpkg_install.bat @"$<" include compat/vcbuild/VCPKG-DEFS endif +endif # We choose to avoid "if .. else if .. else .. endif endif" # because maintaining the nesting to match is a pain. If @@ -689,3 +691,62 @@ ifeq ($(uname_S),QNX) NO_STRCASESTR = YesPlease NO_STRLCPY = YesPlease endif + +vcxproj: + # Require clean work tree + git update-index -q --refresh && \ + git diff-files --quiet && \ + git diff-index --cached --quiet HEAD -- + + # Make .vcxproj files and add them + unset QUIET_GEN QUIET_BUILT_IN; \ + perl contrib/buildsystems/generate -g Vcxproj + git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj + + # Add command-list.h + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h + git add -f command-list.h + + # Add scripts + rm -f perl/perl.mak + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 \ + $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) + # Strip out the sane tool path, needed only for building + sed -i '/^git_broken_path_fix ".*/d' git-sh-setup + git add -f $(SCRIPT_LIB) $(SCRIPT_SH_GEN) $(SCRIPT_PERL_GEN) + + # Add Perl module + $(MAKE) $(LIB_PERL_GEN) + git add -f perl/build + + # Add bin-wrappers, for testing + rm -rf bin-wrappers/ + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 $(test_bindir_programs) + # Ensure that the GIT_EXEC_PATH is a Unix-y one, and that the absolute + # path of the repository is not hard-coded (GIT_EXEC_PATH will be set + # by test-lib.sh according to the current setup) + sed -i -e 's/^\(GIT_EXEC_PATH\)=.*/test -n "$${\1##*:*}" ||\ + \1="$$(cygpath -u "$$\1")"/' \ + -e "s|'$$(pwd)|\"\$$GIT_EXEC_PATH\"'|g" bin-wrappers/* + # Ensure that test-* helpers find the .dll files copied to top-level + sed -i 's|^PATH=.*|&:"$$GIT_EXEC_PATH"|' bin-wrappers/test-* + # We do not want to force hard-linking builtins + 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 + git add -f templates/boilerplates.made templates/blt/ + + # Add build options + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 GIT-BUILD-OPTIONS + git add -f GIT-BUILD-OPTIONS + + # Commit the whole shebang + git commit -m "Generate Visual Studio solution" \ + -m "Auto-generated by \`$(MAKE)$(MAKEFLAGS) $@\`" diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 8bb07e8e25..fba8a3f056 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -82,7 +82,8 @@ sub showUsage # Capture the make dry stderr to file for review (will be empty for a release build). my $ErrsFile = "msvc-build-makedryerrors.txt"; -@makedry = `make -C $git_dir -n MSVC=1 V=1 2>$ErrsFile` if !@makedry; +@makedry = `make -C $git_dir -n MSVC=1 SKIP_VCPKG=1 V=1 2>$ErrsFile` +if !@makedry; # test for an empty Errors file and remove it unlink $ErrsFile if -f -z $ErrsFile; From patchwork Thu Jul 18 13:19:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048985 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A511113BD for ; Thu, 18 Jul 2019 13:19:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92B1128767 for ; Thu, 18 Jul 2019 13:19:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8614A28800; Thu, 18 Jul 2019 13:19:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2968028767 for ; Thu, 18 Jul 2019 13:19:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390585AbfGRNTc (ORCPT ); Thu, 18 Jul 2019 09:19:32 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35598 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390498AbfGRNTP (ORCPT ); Thu, 18 Jul 2019 09:19:15 -0400 Received: by mail-wr1-f66.google.com with SMTP id y4so28695402wrm.2 for ; Thu, 18 Jul 2019 06:19:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=aXe9EIRDefNaQtmt5Ie/2gp0jjIY/w2vx+N62wojQGE=; b=JgCH7tfboi4QDnXhxM04O90LShi5an2yB2TT4OW2uorO8Sf9fE3BTCT153/Sl9j1Yz o+XZQJltUp76fNTyGVom9AQqYRpG/Q6rCZKYCXTINIZiPXcb6yFZCxbiQPEZfqEaZg0i dnE3SuNrjqt5rzJzNkrhMtOGVOX+DBYpoSPOfhmpniujBaTeWyCntQV7qlko8vycYt+P Kx4gsOrfePzkb6oQpqZwN0mwx+Vddajq6WbMjGB+L47bbO1BDqsYsfkrSBxYwM+PoPKH VB+B2TI6fO6pOOCDDiKyNgUHPQtko4Kg++yTSrFWW3nzc93yI6BLx3bOaw7CkiJQFvad V2LA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=aXe9EIRDefNaQtmt5Ie/2gp0jjIY/w2vx+N62wojQGE=; b=USp7yuzqlGsv8gzyZC0TaIubJWL8EnxLJLtef79eWlhXPNPLGX/9hPi9WpZ8RO/csG CJHSIpeiimRr+FtlSejXLqMhdylFJ9fTmlncSUQi75uYdeJ+jN9pDAHZenLwdzeHbj1N Kl+hbHOUFCOmXvCOjmA+WqLfPAXyOjvKl2Hjd3dM/ZHyyEktz92DxE2V5DTz7/ML1LIa JA9BpsfYdA7/BIUz78jv405zOMIVIINLv4P7A35d0ocLC/+8DztPH45kBbYwHt/ySDU9 6BxSmyqIIhAFEP8ESV+RCpeUl2dZnAJm3/ehttOxfDdKhjK+7ae0QvXfpgmpYysE7QVQ 0KrA== X-Gm-Message-State: APjAAAUckatE3KpbHDaGVBSwHWlwf1TEF7gQfb1OdYArP8WaD7GjE8zn tmKn8A4JsP/CijTCOsD4gAiWZ6Sp X-Google-Smtp-Source: APXvYqzS0+2EG+JzcpqasJW2gxUe1BjeAW6478U+uMBB/Z2K2Gq2hPBMy3eOq8PmyU4qBlA0n13+GQ== X-Received: by 2002:a5d:514f:: with SMTP id u15mr50594566wrt.183.1563455953851; Thu, 18 Jul 2019 06:19:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t6sm27080502wmb.29.2019.07.18.06.19.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:13 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:13 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:54 GMT Message-Id: <33bed9a7a6b3ac16108e90463d695dcb49d39720.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 19/24] vcxproj: also link-or-copy builtins Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin The default location for `.exe` files linked by Visual Studio depends on the mode (debug vs release) and the architecture. Meaning: after a full build, there is a `git.exe` in the top-level directory, but none of the built-ins are linked.. When running a test script in Git Bash, it therefore would pick up the wrong, say, `git-receive-pack.exe`: the one installed at the same time as the Git Bash. Absolutely not what we want. We want to have confidence that our test covers the MSVC-built Git executables, and not some random stuff. Signed-off-by: Johannes Schindelin --- config.mak.uname | 15 +++++++++++++++ contrib/buildsystems/Generators/Vcxproj.pm | 3 +++ 2 files changed, 18 insertions(+) diff --git a/config.mak.uname b/config.mak.uname index 6d0ed923b8..db7f06b95f 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -703,6 +703,21 @@ vcxproj: perl contrib/buildsystems/generate -g Vcxproj git add -f git.sln {*,*/lib,t/helper/*}/*.vcxproj + # Generate the LinkOrCopyBuiltins.targets file + (echo '' && \ + echo ' ' && \ + for name in $(BUILT_INS);\ + do \ + echo ' '; \ + done && \ + for name in $(REMOTE_CURL_ALIASES); \ + do \ + echo ' '; \ + done && \ + echo ' ' && \ + echo '') >git/LinkOrCopyBuiltins.targets + git add -f git/LinkOrCopyBuiltins.targets + # Add command-list.h $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h git add -f command-list.h diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm index 9e7ed24912..4b02524b10 100644 --- a/contrib/buildsystems/Generators/Vcxproj.pm +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -273,6 +273,9 @@ sub createProject { EOM } + if ($target eq 'git') { + print F " \n"; + } print F << "EOM"; EOM From patchwork Thu Jul 18 13:19:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048971 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 559C213BD for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4615128767 for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AEDB28806; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E3A0528767 for ; Thu, 18 Jul 2019 13:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390542AbfGRNTU (ORCPT ); Thu, 18 Jul 2019 09:19:20 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:33482 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390452AbfGRNTQ (ORCPT ); Thu, 18 Jul 2019 09:19:16 -0400 Received: by mail-wr1-f68.google.com with SMTP id n9so28741402wru.0 for ; Thu, 18 Jul 2019 06:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=hku9jaOYCPh/VIAjzFkLvA7T0bv0+a/Vv/In5VsUblU=; b=ZHuroJMDHtj/9LPGh7vXVdkTid8MGilr2C4Cj1VpOqB/fNi6DCvzFfeCSYbCibS868 C4JZGgB3j2iTClI7fEYMDAo+OndNLKG1LAgRdCPKYR8aCqq5Zd3D3K97cvu3Iq1sQb4l 2+kVVyt/wwKRp9elVl88r8EVgzJje2vfyrHAIDafUG/wZ5tWbZoaWHjWhdZZ5OYaVUo6 xPpc2xePR93zjlb7HKUB9X7O3ipa8xfTO3GyZQdiH0Ty2Hq8GFKin8iTR/nPhCN6ytLK QTw73CLwKAeUpQDUN8YTGKgNHAe34j38+N+phxTxl9Bv1ChqsgrAVCVVSP7Yx37HAmWG pyGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=hku9jaOYCPh/VIAjzFkLvA7T0bv0+a/Vv/In5VsUblU=; b=H52+b/cjCmJOCsQRYZdDE23iqKs6prsO2LZHEqrKC/ca5oP3Pq60hJF3zyVjtfVJwH HJ39crttaCXAnII35aah6fzO05/HPy9zLaTe5DyCqMGCO6E+kdKyOHfbstefUF2OhT+V Hqr+NV+2zGV+K2hsAIn/w/GFTFC5w9E7VUEmJ19kK0JxBt8o7UrO//PGH0q+ScBHaGga XyTu5aLFlevIMeDBlDf6NtvNay0DEVfyJgRHD17wxJlH3IktPu/4NHMj/Cl6sI0Z7lkU 7NSzUxmkqOLuvTscVbz7IuFkBGfbbQzgWRb08feSS4cv90r9YRmcY3h3sX808YwmwQ2s 8Qhw== X-Gm-Message-State: APjAAAVHmaewR/sn8VAb/GP06bFcWMQbKmwW0uuJYm0akl0G2HTe/NHl T6e+PbcVOqlKHjfqZQP/2Z7IaEaQ X-Google-Smtp-Source: APXvYqyww9YdU4umB3yjOZVjGln+/ayYWcBqEg38oUTpWYImGt1y5lnqvlWxsrkwceaCeZ3OqztZOA== X-Received: by 2002:a5d:4b11:: with SMTP id v17mr8636328wrq.173.1563455954608; Thu, 18 Jul 2019 06:19:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z1sm29552206wrv.90.2019.07.18.06.19.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:14 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:14 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:55 GMT Message-Id: <44f0f3235e3cf801a19e2be30384a9e48a0aa3d6.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 20/24] .gitignore: touch up the entries regarding Visual Studio Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Add the Microsoft .manifest pattern, and do not anchor the 'Debug' and 'Release' entries at the top-level directory, to allow for multiple projects (one per target). Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- .gitignore | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e096e0a51c..e7bb15d301 100644 --- a/.gitignore +++ b/.gitignore @@ -230,6 +230,7 @@ *.ipdb *.dll .vs/ -/Debug/ -/Release/ +*.manifest +Debug/ +Release/ *.dSYM From patchwork Thu Jul 18 13:19:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048983 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7299814DB for ; Thu, 18 Jul 2019 13:19:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5FE9528767 for ; Thu, 18 Jul 2019 13:19:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5483728800; Thu, 18 Jul 2019 13:19:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08DB428767 for ; Thu, 18 Jul 2019 13:19:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390534AbfGRNTa (ORCPT ); Thu, 18 Jul 2019 09:19:30 -0400 Received: from mail-wr1-f50.google.com ([209.85.221.50]:35378 "EHLO mail-wr1-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390482AbfGRNTR (ORCPT ); Thu, 18 Jul 2019 09:19:17 -0400 Received: by mail-wr1-f50.google.com with SMTP id y4so28695474wrm.2 for ; Thu, 18 Jul 2019 06:19:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=rJs8zLNJc5W3EABytVF5MZ2gJQf9eTWKZGXO/abrFIY=; b=XgYy5d6AFCM4qhhvlYizDMT0nHuco6xIOT18k7pgCgFI8zqwCUDR3e9UGnQU2on7rQ 5yqDhkGJhFLm9AWHQ/fZFDO6AE9m4lRYvkG2LSrTuwzGFYfQGLNM5q3yjTV+t8yGze7H Fa/otWKEUTqb1+iNmFhD2dRWAy4/e+c9lYKAxWlUjyDhY6zs2dqB2u/9iQzBlYWyhkZV Gqh/mV1q8BH3ay0KtTaQh3gPKImi7JDr0i0396EC+wf3a+O7xg7bukR1jVdtvINfeYkE x/RQCVD1h2XLXqEr1ODqEkJMqKEb8c/i1DI2mtDmDVwbH7jlQdyyTfAHb7zWXfEguPrl C7Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=rJs8zLNJc5W3EABytVF5MZ2gJQf9eTWKZGXO/abrFIY=; b=B1vEcMKmTDGJ3eX7F4lrFqEeBarps5GS82jCbnwntPz/u7THsjjbc0aTqNlJj2EUHC eGN1Pa5XjKExZ76CnE0sgW5gUqetxNul2h/qKk1g0k0G4cpy+yYLjABT/zhBa6zagop8 jJUxyjYiAtsrljX2sn1K9tOOmv8KniJatk1PveMlA1RSRjQe5xIMY31V8heVSji+cPnl 8eG1L7pXX4m222Q6NKK/edPOuPXSLO8nhkUlWS2w1jqy/aMfbczDstcvcWiF08MTML2E Tmk70gCYxhra7x2SjnYNuUxA4ojp0trb9lbQ1QnSAgP0XyCwKywltq0saZW/irfx0pWQ d0QA== X-Gm-Message-State: APjAAAXZYU2v5G4B7v3DbxN3z2fBBM8TAEqOSyKuiXd4WUJedbeXCZXW PfIcQJyNJMY4dMFiEG18zPIZGTkT X-Google-Smtp-Source: APXvYqzv3GlekuD/j0v6lJw9xFDuykeF8p47QZNm4zAnnUW1W4YimzhXxARB9UCqLEsKyxxmExcUqQ== X-Received: by 2002:adf:db0b:: with SMTP id s11mr3992887wri.7.1563455955250; Thu, 18 Jul 2019 06:19:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g17sm18900490wrm.7.2019.07.18.06.19.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:14 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:14 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:56 GMT Message-Id: <8f19bb5a8c816c4a269a946670b94940a7616247.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 21/24] .gitignore: ignore Visual Studio's temporary/generated files Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin Signed-off-by: Johannes Schindelin --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index e7bb15d301..fcfb708b9e 100644 --- a/.gitignore +++ b/.gitignore @@ -233,4 +233,7 @@ *.manifest Debug/ Release/ +/UpgradeLog*.htm +/git.VC.VC.opendb +/git.VC.db *.dSYM From patchwork Thu Jul 18 13:19:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 775A714DB for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 655B328800 for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59B5528767; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0CFC828775 for ; Thu, 18 Jul 2019 13:19:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390544AbfGRNTV (ORCPT ); Thu, 18 Jul 2019 09:19:21 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:53533 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390515AbfGRNTS (ORCPT ); Thu, 18 Jul 2019 09:19:18 -0400 Received: by mail-wm1-f68.google.com with SMTP id x15so25576233wmj.3 for ; Thu, 18 Jul 2019 06:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=T5sC/K2nocoacN82eqyh9pXAZYpl+oGpqVWb7MKvpJg=; b=u1+zPFBB5ljuFEfuuOF8c9UuRLLfD0yFfF/O0v+C/eGRjvT3Rv6SoaThAbJU2YD5jr 2ykz1o8EJ4vS/up5dZS/0I31oqFKwBs1goYdTmAO3zfFrLAJ8kdVGwylhFzweZhbo9qS tRXNEzzRL1MziTRxx9dJ8Fjx82bRDrZA1g3fYCxpn2KqOsVZOVHFMAC7EXftHi2FtwOt bwom2Ep/UNNpYQ+FeKVzpADucDJCFXxCuZe020loqH2frqczp4ggDwGY6jgQNh1TVJGH 13yRmfsVrf9uhUI5/rJfD2UqWlI3Ze2OslCdymDsH1fWuV+0VW4N9Y4HWwd9CJAGXJxJ s9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=T5sC/K2nocoacN82eqyh9pXAZYpl+oGpqVWb7MKvpJg=; b=UfUGSYnzs+zXinWjcGQzB/yOzxUJZ78JiDS4J9gpspjsr0GrlRZPqSu38G9Ut+kvG2 WE58efqz7dCUgOGCD7thrNb3fPDJcxTbPDqg4qX3W2ezlWSRXAE5V9aiC7wXFvKdPBlN epqgm3fpqoEbO4CdqQfNXDC9dlMhw+9s9seLeNQS6f7i4lwM2WQzW0tgH5dq+i/DRAHi 9aZC7pV/2KSFzLP/KK9FZ+m7AvdNsl/Ep7as3xOfLWLDRM/zq+p0pvuv9c2tVQrghfgp EFD8Sc0wvFMZLuZCUZ5kZbTGT8L/ICXW05QOpcARLZr+9PvDOTWQeHs0eRR7b3341VF8 PmxQ== X-Gm-Message-State: APjAAAVXoIHRtAVObOvvFuSpoWDgjWyAtQu1GCr3rIUmZ33pRCkE3xrp pSkzZ7q5SywAhjF6WhelPK0dZZv9 X-Google-Smtp-Source: APXvYqyIhjg4EqDs1sE6u6JP1MwuN2fW351yKWg5i/kkl1uNxdVzlUhZi1r4ru+KE0ZUkbC0zBbhBw== X-Received: by 2002:a1c:9a4b:: with SMTP id c72mr17230039wme.102.1563455955857; Thu, 18 Jul 2019 06:19:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u18sm22343689wmd.19.2019.07.18.06.19.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:15 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:15 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:57 GMT Message-Id: <971247e32056a564161e10d05237c41d041e7ff8.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 22/24] bin-wrappers: append `.exe` to target paths if necessary Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin When compiling with Visual Studio, the projects' names are identical to the executables modulo the extensions. Read: there will exist both a directory called `git` as well as an executable called `git.exe` in the end. Which means that the bin-wrappers *need* to target the `.exe` files lest they try to execute directories. Signed-off-by: Johannes Schindelin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 98a0588416..3716dadc08 100644 --- a/Makefile +++ b/Makefile @@ -2717,7 +2717,7 @@ bin-wrappers/%: wrap-for-bin.sh @mkdir -p bin-wrappers $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@BUILD_DIR@@|$(shell pwd)|' \ - -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \ + -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%$(X),$(@F))$(patsubst git%,$(X),$(filter $(@F),$(BINDIR_PROGRAMS_NEED_X)))|' < $< > $@ && \ chmod +x $@ # GNU make supports exporting all variables by "export" without parameters. From patchwork Thu Jul 18 13:19:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048979 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 69F4D14DB for ; Thu, 18 Jul 2019 13:19:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5876B28767 for ; Thu, 18 Jul 2019 13:19:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CA9928800; Thu, 18 Jul 2019 13:19:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F9B428767 for ; Thu, 18 Jul 2019 13:19:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390571AbfGRNTY (ORCPT ); Thu, 18 Jul 2019 09:19:24 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39238 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390523AbfGRNTT (ORCPT ); Thu, 18 Jul 2019 09:19:19 -0400 Received: by mail-wr1-f65.google.com with SMTP id x4so28651035wrt.6 for ; Thu, 18 Jul 2019 06:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=+6H0fHX/mTATCap1vwfdLXRxarE76b8uk9+FtkHdS0I=; b=Ca4uBMVSQeY+/KXBOka2+R8an5lbpCcPGYNP7hR1fih+su5tuB719O7nO0gABXocFs Xcv904hSGqKoTlKx7Fk1Idy+tZEdGE0c2ajReJ80N0uyk6XjsjxXMQsZICfkYAdyJHGp 0RiVyR20rspcBPoEhAkrvkBRv03AjyHpSYGHdiFOHI9yT+Cfbx9Hx9EohbbOyufQEEFm X+K0jl0hdbM6jWSctA7EHW65le1rZoLEFnMSDgWrEifCJLK0XVN3qDmj69u2UYtDOkUI n1Nisj6SOEEK8jQxCKzipZ40U2O5pBezsfdRJlePPXkzGqFaswypkjBerfxZkJvnqRkW YpEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=+6H0fHX/mTATCap1vwfdLXRxarE76b8uk9+FtkHdS0I=; b=EjG5AqreK/eFQEJkrjtBuORxSdXZxaGNnPJ8Bdr/XKx7JJVeqXy58VVHCiVr1ZBK1R X6CpVizkTVB4fnc3rZS+8mb0ApMXQKlsKyN+5f+Z9U7kRPtudR9QwFkrxpe7qp4id1jL 6szzQBpxCGl7eHkKEyX3yn9j35gHQ/64is5+cVo/AnVN5pi/Xop6yTfYoFImmN1h6R9t 6To5oOWa+kGNnX7llcFrj4lzkj8tcC6dsTC5Pi4ujhuQxfFz1HFfRmS4hn/rnpd44iNS HdW0lVqKSU+mvbnyKuXGgWV5jmMtc3Bq1q8YYi9jQv1a6qSYKI7Lfs/OnFzI8e7WalYZ 3KRw== X-Gm-Message-State: APjAAAUJUb8H0K/MkqBSi9Y40npyIy8N8LpqCWscND1jcvUKkfVmUMDm IuFCTWHHneWl+E7Ix5GFYxKIUmux X-Google-Smtp-Source: APXvYqyEeyZMjG9ClTpe/uqHHAnroMoeWN/QyvZTmHoKBtg8LjrQllehagHJ07zZBRZddI95uI/Dzw== X-Received: by 2002:adf:f3d1:: with SMTP id g17mr20437279wrp.38.1563455956551; Thu, 18 Jul 2019 06:19:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s15sm13218439wrw.21.2019.07.18.06.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:16 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:16 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:58 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 23/24] t5505,t5516: create .git/branches/ when needed Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin It is a real old anachronism from the Cogito days to have a .git/branches/ directory. And to have tests that ensure that Cogito users can migrate away from using that directory. But so be it, let's continue testing it. Let's make sure, however, that git init does not need to create that directory. This bug was noticed when testing with templates that had been pre-committed, skipping the empty branches/ directory of course because Git does not track empty directories. Signed-off-by: Johannes Schindelin --- t/t5505-remote.sh | 2 ++ t/t5516-fetch-push.sh | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 883b32efa0..1132964044 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -824,6 +824,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' ' ( cd six && git remote rm origin && + mkdir -p .git/branches && echo "$origin_url" >.git/branches/origin && git remote rename origin origin && test_path_is_missing .git/branches/origin && @@ -838,6 +839,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches (2)' ( cd seven && git remote rm origin && + mkdir -p .git/branches && echo "quux#foom" > .git/branches/origin && git remote rename origin origin && test_path_is_missing .git/branches/origin && diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index c81ca360ac..47c2959a90 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -866,6 +866,7 @@ test_expect_success 'fetch with branches' ' mk_empty testrepo && git branch second $the_first_commit && git checkout second && + mkdir -p testrepo/.git/branches && echo ".." > testrepo/.git/branches/branch1 && ( cd testrepo && @@ -879,6 +880,7 @@ test_expect_success 'fetch with branches' ' test_expect_success 'fetch with branches containing #' ' mk_empty testrepo && + mkdir -p testrepo/.git/branches && echo "..#second" > testrepo/.git/branches/branch2 && ( cd testrepo && @@ -893,6 +895,7 @@ test_expect_success 'fetch with branches containing #' ' test_expect_success 'push with branches' ' mk_empty testrepo && git checkout second && + mkdir -p .git/branches && echo "testrepo" > .git/branches/branch1 && git push branch1 && ( @@ -905,6 +908,7 @@ test_expect_success 'push with branches' ' test_expect_success 'push with branches containing #' ' mk_empty testrepo && + mkdir -p .git/branches && echo "testrepo#branch3" > .git/branches/branch2 && git push branch2 && ( From patchwork Thu Jul 18 13:19:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Arver via GitGitGadget X-Patchwork-Id: 11048977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E0E5E14DB for ; Thu, 18 Jul 2019 13:19:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF79E28806 for ; Thu, 18 Jul 2019 13:19:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C43442880A; Thu, 18 Jul 2019 13:19:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7760C28800 for ; Thu, 18 Jul 2019 13:19:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390559AbfGRNTW (ORCPT ); Thu, 18 Jul 2019 09:19:22 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:44669 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390469AbfGRNTT (ORCPT ); Thu, 18 Jul 2019 09:19:19 -0400 Received: by mail-wr1-f66.google.com with SMTP id p17so28637847wrf.11 for ; Thu, 18 Jul 2019 06:19:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=4E39/cJgnjFrWFwm9MSBe6qrPTWmtaSUqvous69vE58=; b=ni++GqyqdNNnTdbPuixwK+Argi0qD3HOMzUThLS2oiGiykyO7icRrYyJOKS7uDXAOc iKRqYlShaRZioYdDo626xk58d2ANUKjlTIxcAoAHIMpaWcQDsNrZDmgDpjS90+8ke9By CcCIrrY+A0hmy3bp7JCdaVpQ25178K9UAsTfgUvdO5v6NCAsRNnKfm945rq2GmftYHo8 tiI7BzqeaPMh+jnBpHpfDfZYLd1An5MW26o2U7DvF6oOKTucGqmJhk7XBbDgIjUuIn4M VV9nwLJxETYtaMBbWSnrCIU8roWqJOLKBXsh63y0nEUujwKK4R6u97fZaKWEwXk6XK3u jQ8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=4E39/cJgnjFrWFwm9MSBe6qrPTWmtaSUqvous69vE58=; b=Q6F1Gx6zKBmZn1X+YsyBuW1XkIa1KsfYp4w00PBAX3FFHsSz2aqNG5GYGiXZjIC5ZT gDXvPt/bY68vc36j21Q3auP+7VePgJtPXiES+CMl6oG4XGC6ylzikuhIaiAfMyaV3YJg dO4Lie3TNJB22SwErB3f+108A/hJws0Yl+w7sZ1QoXF32nzASJm8pX8cBB/7Khb2J5Tq wCELpDeAuek0irsrCDXtfkcL6DSki1WQcm62zQswMLq0IoBrE62tlUEQyDs8BprduSAe DbMdyd/SUiw8mtYMWYP41IRRWcrXhLdqAVzGIkHD9tnWRf9Yf8XrfuwZ7BdSL0ZWxeKs 46sg== X-Gm-Message-State: APjAAAU88vsyvAgOsG+7HxagA8HQCd5+O1LEC1NVFpZ3fKljIHjd7gI1 V18wDA0Y43yrpKtJ+lbPG+zhUR8k X-Google-Smtp-Source: APXvYqyroCV7deNO2RdW+eFxHI+yn/0756ZSYb+Ev2KQeZ+03I5RH6IQYerOWq5u2g2uLuvtXrXpbw== X-Received: by 2002:a5d:5012:: with SMTP id e18mr21486717wrt.166.1563455957149; Thu, 18 Jul 2019 06:19:17 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f12sm29863785wrg.5.2019.07.18.06.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:16 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:16 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:59 GMT Message-Id: <151b9921d09dd622e27caa4571d260ed24f4d69b.1563455939.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH 24/24] git: avoid calling aliased builtins via their dashed form Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Schindelin Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Johannes Schindelin This is one of the few places where Git violates its own deprecation of the dashed form. It is not necessary, either. As of 595d59e2b53 (git.c: ignore pager.* when launching builtin as dashed external, 2017-08-02), Git wants to ignore the pager.* config setting when expanding aliases. So let's strip out the check_pager_config() call from the copy-edited code. This code actually made it into upstream git.git already, but it was disabled in `#if 0 ... #endif` guards so far. Signed-off-by: Johannes Schindelin --- git.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/git.c b/git.c index f4c0478f32..3049dae85b 100644 --- a/git.c +++ b/git.c @@ -743,8 +743,6 @@ static int run_argv(int *argcp, const char ***argv) */ if (!done_alias) handle_builtin(*argcp, *argv); - -#if 0 // TODO In GFW, need to amend a7924b655e940b06cb547c235d6bed9767929673 to include trace2_ and _tr2 lines. else if (get_builtin(**argv)) { struct argv_array args = ARGV_ARRAY_INIT; int i; @@ -779,7 +777,6 @@ static int run_argv(int *argcp, const char ***argv) exit(i); die("could not execute builtin %s", **argv); } -#endif // a7924b655e940b06cb547c235d6bed9767929673 /* .. then try the external ones */ execv_dashed_external(*argv);