From patchwork Mon Jul 29 20:08: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: 11064455 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 EC38014E5 for ; Mon, 29 Jul 2019 20:08:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D42AE28508 for ; Mon, 29 Jul 2019 20:08:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C802E286A1; Mon, 29 Jul 2019 20:08: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 49D7628508 for ; Mon, 29 Jul 2019 20:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730185AbfG2UIG (ORCPT ); Mon, 29 Jul 2019 16:08:06 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:34535 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729922AbfG2UID (ORCPT ); Mon, 29 Jul 2019 16:08:03 -0400 Received: by mail-wm1-f66.google.com with SMTP id w9so43753043wmd.1 for ; Mon, 29 Jul 2019 13:08: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=TpbLZAjJEUfgE1pjAS5PhXVSv1EllepjTP8+EgblBb41Ba/9dgHiLjRsTH+H8Mhu4V XWdCMyvx7W9/y2lJqRlMZYEQtVMRbSZMVz3jGSokhV0czWmvgJga55LyEwsoCQxnYvTd Nsss08JiYp7H4U3i3DtrpOVayUrET64xgXyt9iiiw2XHgd2cZfl3QdpujnKhM6rkHiJC FMc6NI6umY28HRUFMOHAoHcCjVPF2xvlaloBO/g4GHlBLbCc+UFMXmEDg4D373oSaY/4 /JWSYrTO0A9ABtyq7wN7oQaL/wxnXBRo+88D9DLbpGxFyLaF3IwU4fNfISIV9hrCFmxv jjVQ== 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=BTy/SsQVyliUpKEzYYqeDBS76C4YVgLjALjxRTQX6XFj9ZePDuIjYATds/wbXly+m6 ozacz6gz1O5VzY1buRdQP32hj7udVUdv8ErZ7DDtO/5m9peF6intPHV+6/eiH8Ko2XHz grqmRIjESj1ZrYdRxbiw//5CxD33f12WW4Gq98lz4XWmfGz+xSyGyq8II/o4WRwEUX54 tPSoJVbbwkRpk0DrWVnuxYY8VF/YrBsRSoaZ0n9LW+lZlq2MiIJ6dwA0TE0nc4NMEJJC HfNZAYJ23d0Q+8L1ofQ2hjmnaUQobS/xiq4UWEs8yHkui47gj0r52B30xfFDoA3+N3Gt NW1w== X-Gm-Message-State: APjAAAU+d0kGZaMQa1pqNM6T9m5/AJw8qhOw9jODxRnMggoDSo2KEj7V ynCEIm1T2kSevHkLxtSi0clHO/eL X-Google-Smtp-Source: APXvYqxnFL35mNqH9N5gZdf3ol3LGJ0gGSP9sgE2VGRLuxrTl2QkobnjQbLsaFeD6MBfjp/qDpgpjg== X-Received: by 2002:a1c:ac81:: with SMTP id v123mr103650707wme.145.1564430881488; Mon, 29 Jul 2019 13:08:01 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id i6sm54342013wrv.47.2019.07.29.13.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:01 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:01 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:37 GMT Message-Id: <240ff4251774fbede9cce21a5140af655e05d7ba.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 01/23] 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 Mon Jul 29 20:08:01 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: 11064457 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 2685E14E5 for ; Mon, 29 Jul 2019 20:08:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17B2928508 for ; Mon, 29 Jul 2019 20:08:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0BE2B286A1; Mon, 29 Jul 2019 20:08:09 +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 85EF528508 for ; Mon, 29 Jul 2019 20:08:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730187AbfG2UIH (ORCPT ); Mon, 29 Jul 2019 16:08:07 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:37177 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730175AbfG2UIE (ORCPT ); Mon, 29 Jul 2019 16:08:04 -0400 Received: by mail-wm1-f67.google.com with SMTP id f17so54557937wme.2 for ; Mon, 29 Jul 2019 13:08: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:mime-version :content-transfer-encoding:fcc:to:cc; bh=IpYxuyg0d7h+PkcMcFpH5/CrbD7XZfHhe7dTuXO7RfQ=; b=MDNZ3rqFXcqwUyKstZy5Ku5wX5kSBh8r3vIO7TYJfKrCmxSZCnjoZCWxOcftyOQmIt 5FsXnlDtFhxzBAN3N/yADV125KHjT1/o1GB0pGkYovwRj15K1ZVIzvBfTcGzZ2OWTemK Yp4St6r7rn9brzGnV+ihgmCj8BdGzsZhq4u9+wWoPT2m9jYg+KNV6xKAHEQI8om6qIqp jrFqcpl/331D7irw9BAeQXgufpABv+3fbHbz0XpeqgVUxl/EQgN2WW7GH7BMl3toiEKC 63u8y9WeqLNWb1nVtTcIVMOI1YAZp5GHWn93mvmDw4Z5eIEV17veZ3R+FhT3BFEpP4uS WdgQ== 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=ZlvJBF5hstQ5BaDF7P6MrDdI35tiVSVzhc+KMffJ2e6DpUSjG/Pfc2Ad/SZIXoNVFX nQQktbQri6sNuxaxD9592UF5aZJrVfnZL0WvS9zRJaHLQ20+xnH2dZchZ8zVXtlOiQgG F181bGUZTe/OdT1JXauZdBb666xl53ATmTbP9SHGPvJ5eX/cy7J4rwP/dyAkvEx11rSp BEgJMIQA1/gQKJSs0himTbWALBdS+jyRj1V1C1/+ykpMti0ncg8ntRv02+kuZTxFTS8R 1PBBurEYLOaCd+YKDRbn7NAGMdvjZe9Z0VXTZjHUWTNqUjkWZKK+H3exEe5Ai3cAg+Ck eAzw== X-Gm-Message-State: APjAAAXIkAFzlKVfcIFChcvNbM0veWE5VtfUVOIWXM41aCy/Tfdb88J4 7nLwfW/c2P7LmO0j69Qmq6g25r2f X-Google-Smtp-Source: APXvYqzJjYyJQwCZ/WRxW08+fyKZHHcRgwU9IIHjYPno+2++8Zgr+1RKL/hTPrrhroz1pG6TcSGPNQ== X-Received: by 2002:a1c:be05:: with SMTP id o5mr102353307wmf.52.1564430882242; Mon, 29 Jul 2019 13:08:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y2sm50793428wrl.4.2019.07.29.13.08.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:01 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:01 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:38 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 02/23] 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 Mon Jul 29 20:08: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: 11064459 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 A00D8912 for ; Mon, 29 Jul 2019 20:08:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9300A28508 for ; Mon, 29 Jul 2019 20:08:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 874FA286A1; Mon, 29 Jul 2019 20:08:10 +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 39F2828508 for ; Mon, 29 Jul 2019 20:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730205AbfG2UII (ORCPT ); Mon, 29 Jul 2019 16:08:08 -0400 Received: from mail-wr1-f41.google.com ([209.85.221.41]:46976 "EHLO mail-wr1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730176AbfG2UIF (ORCPT ); Mon, 29 Jul 2019 16:08:05 -0400 Received: by mail-wr1-f41.google.com with SMTP id z1so63182698wru.13 for ; Mon, 29 Jul 2019 13:08: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=u/L5dhwpj5JrClO4fex+132E1lExSyhwh08gQ9Vb50z/7RGI1R1prdU5LG3KVcINGS mOpnunP0uvUvJXEOZ+5mn9RWajNRsgY+MY7zRUtxRqk2zBwLs3PlhUJTKoF2oza0p43A +Oy+5PR6omw9xkgbiFaAEcT2Vwpy9uhxNDnf/vSx139IM18XnYgzhROsGZc7lZ0wmyo4 ecztkFmS+KNMUzeeZuNEaIQMlUVDsXxbel9dDMi6L/45P/hpNu1zUZ6r2uaRoSoYfbXU k5YN+LL4bA7X/aYUcLtiUPpqGEz5nOcQNIZcKQs6HCI+Wf03YjYGX2Q75GMdYGwoiRCo /dTw== 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=YzB5eq/fehelkhRr2ZDiqHTaQkdqOCQnby3OCqpGJZ2IgxjMC5w9KU5mQvQuotX14w FLdNsy2EXrM6vh5hk/VxZqn/IZ+23fSIdzaZEubMyWHbFIRAmfE0zLpa9vE1AERpPXVU cc3ASYpi774Pc5pvJuI3PnU4msm0vtwsd3/i2QFH/sgnvqPy1o3S3ZM+Zn38Uu4V3vRw g/PzYL6eOVi7BjxN6XgHi/YJ6HfiwPJjPvvnBXLh6REjR/6d7phztJ48OzYJ2btxpnnk uL3R3N6vsig96FkpYS1B0IazArR2rjg8Fjovs37scL75RYRzb6qqjfX/IfNmq6cRx/uU WxWw== X-Gm-Message-State: APjAAAVo3Y9WuBqTu9PL9cTArNx/0npPwsagIpmOjrzNU4QLM1HIOKbt jgKyUom+7b3Plz55XU5vj8VTfeOf X-Google-Smtp-Source: APXvYqwUFq5F89IZtjBAW0QmbFL7AOBBgJ+/L+a2f75jZ+qsolj5sMYAU5WbX6Zv3NtBS6wiF8s6Cw== X-Received: by 2002:a5d:518d:: with SMTP id k13mr27286904wrv.40.1564430882929; Mon, 29 Jul 2019 13:08:02 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o7sm33164274wru.58.2019.07.29.13.08.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:02 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:02 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:39 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 03/23] 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 Mon Jul 29 20:08: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: 11064461 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 43A031823 for ; Mon, 29 Jul 2019 20:08:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B4328508 for ; Mon, 29 Jul 2019 20:08:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B062286A1; Mon, 29 Jul 2019 20:08: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 CE2C728508 for ; Mon, 29 Jul 2019 20:08:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730216AbfG2UIJ (ORCPT ); Mon, 29 Jul 2019 16:08:09 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:56194 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730177AbfG2UIF (ORCPT ); Mon, 29 Jul 2019 16:08:05 -0400 Received: by mail-wm1-f67.google.com with SMTP id a15so54980219wmj.5 for ; Mon, 29 Jul 2019 13:08: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=mkdRdxko7qrX6+LhbqxkbEACtRpOaqk4eqgzOsrxHYmoexE2tDOKgGS3HuqT70TKtz EKapp3WrPte6QcsKNX8xqRKcQUA/f+x3nSz7eGhDCGWcu4qY4+pbJ90b9kpWciEjwce5 oujYKowOzJD/4ea8anWHt7QKZz/g/h+ED1qhxIpdPQtAP7MZVqczQB0jQF4pHAICK989 QyBwMxQRmKvVrD1sMb7JHksXdxSp90J71tXa4RL246N1kdd1ATvmun5H1xK98MIxzZIm ppjKgRKgDJkTGctyW1xpzPzjnQtxIGz6pP+pejytSmCVThTZEN5Lga0f1B9owCYX/qor se7A== 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=E3Ar6NGcrUeanqIvkdLvHpOMR+TMm6wRmx8eFA3OpyjPf4ptDUcFzJ5hg8+0XhHX4N rDFs2JZMuXW0NOsjq/q2zEbfavsh6LZ0DSXtToIEPVxvZZrxmw8HAwGjZ8+Os5uxGZjP /0MDxc2FPmyyOEPCcsnrszFud5/TipgyOS1Oqvx1jv/DdlBGMG7JWM0drjP1kgHumAtf 4sXiVuQW3f49BDQ2T9WgA82QfEA5vCg+GfdXvsf/m00BnHOf68J6I7S1SwhWXkrKC9WA OGfu41f3Dim1ChvwLm7yoktUXy/awlxG2eMm/ihApFXAK9Yt4xKc6791aUKCrbBxFX16 SCiA== X-Gm-Message-State: APjAAAUnAOn4I1HjQ/stcDAArboGwpeqnJjKziG0b1/QfRHxA8Q7R0af f4T6QkGlSqVIy581/TrLoq0xyLtZ X-Google-Smtp-Source: APXvYqzvuT3+IACm13j4Xvnkf+UqzdNqh69/C51iuxLftf4JuayedaybS55ai8BcVNCHbU/ANoLJ1g== X-Received: by 2002:a1c:b146:: with SMTP id a67mr98532482wmf.124.1564430883674; Mon, 29 Jul 2019 13:08:03 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u1sm57570787wml.14.2019.07.29.13.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:03 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:03 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:40 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 04/23] 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 Mon Jul 29 20:08: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: 11064463 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 3B5D11823 for ; Mon, 29 Jul 2019 20:08:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DB3828508 for ; Mon, 29 Jul 2019 20:08:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21C3E285A5; Mon, 29 Jul 2019 20:08:15 +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 B7203286B1 for ; Mon, 29 Jul 2019 20:08:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730268AbfG2UIN (ORCPT ); Mon, 29 Jul 2019 16:08:13 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:34537 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730178AbfG2UIF (ORCPT ); Mon, 29 Jul 2019 16:08:05 -0400 Received: by mail-wm1-f65.google.com with SMTP id w9so43753120wmd.1 for ; Mon, 29 Jul 2019 13:08: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=sjfaeQQw5fKzwV98hkdiDakmOYw40m+7r8TpfP3lfPKqmhgjFGv5kTydZ/clgigiec W0mpt/hAE8nU1CcZybViJ2wH2o7MP72FtkISa9x5ynSDSrqk9EY/PSvoxBuy04RslsM3 WX74dv3oQc3EU3pC0xoQnU5V6juVilBCq8RioC8CHxRVUKbZd0DIWN/oC/Dy7tpU64zp Udwa5wVHE/JjKWphHPJIKZxz/uXfozgvxssF8w7TKVD2Cu6MB/hvUTI33UFNYikN8IT8 q5QdVyR1UveTZOISJ4kIbIxp01dmxwHDfY5O3wVRZwOdKQu8Ot56VS17NCR7ymeV+teF vxjA== 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=bbbHv6+A8Zv7JffMTeNRwwkB4urOTxMY3mmVuQrjusTvL5g1RGTgzH61I1hVQdjMJx xWHaOulnbvJA+MwbiRwdUZeXymny0Pu1OPBiJl4QK2y6EXhHUcjjnK+jxqDtY4cYyTEX BwJW/33jAdBx9aT/vSj0BZetQSrnmp8x5XWozxtxpM68dlPhuoueB38rP82DOmosLgjP gQ2xkGtl7PspoULnLYKG7a8TkoOmPpOqx/uOwwJzNTjzYEasxxlcyOZQFpgawRzk6QI4 IvmBc+lf5OcQByeu+WrkYdC6FDS1/H1vK8f4gkzzVjxbAeHrimPFMIC6D+R42BejDdqz zWmg== X-Gm-Message-State: APjAAAXe3PDU/NUaoA8hhL9eXVXVqeuOeIAo3Hey4YjcaRiaRrG79r5u JKH3kvItY01DJxnmPBZhZN3B8DSe X-Google-Smtp-Source: APXvYqyt5z0HVrz/l9WPSOcWqfiSW59QhGg+AuxUzSFpqc6XQswL8Sd0yjC/b5RqjbFKNe/wbN7hRg== X-Received: by 2002:a1c:f20f:: with SMTP id s15mr25323319wmc.33.1564430884372; Mon, 29 Jul 2019 13:08:04 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w67sm80298598wma.24.2019.07.29.13.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:03 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:03 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:41 GMT Message-Id: <82e820017b6ab7ce8612742a85679ea837d3596b.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 05/23] 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 Mon Jul 29 20:08: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: 11064493 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 A70D914E5 for ; Mon, 29 Jul 2019 20:08:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A8F228508 for ; Mon, 29 Jul 2019 20:08:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F1DB286A1; Mon, 29 Jul 2019 20:08:34 +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 379CB28508 for ; Mon, 29 Jul 2019 20:08:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730259AbfG2UIL (ORCPT ); Mon, 29 Jul 2019 16:08:11 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:39310 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730181AbfG2UIG (ORCPT ); Mon, 29 Jul 2019 16:08:06 -0400 Received: by mail-wm1-f68.google.com with SMTP id u25so44215609wmc.4 for ; Mon, 29 Jul 2019 13:08: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=d9kjRB2z0lacLrPurqVL56LvL/rS7gkUsvRPBk3xeV3usNEHFVb6Frdlbv9ph2DNt4 a+ZADv4GNuF9MHqtnGzFm+LDCW1rVrqbyuqB6rhiL44ssfekb75a9hv+z2tc9RDYQNv6 ErulMqmPBh/2RnScWi5nRX+gJEdPsrzus2FQ4diNbSM4B2/4lrfJ6lx7XEkwIWa9wZYD cq0Lzlvzq6MQOxeZoHQY8f820WHMX7x7TC/a2psgzfYgsMcjyU9DhppqW/5kPicKFf3U LWO2VKdU+5cjN+NljYTKeiN4NKwTZBkJi50R0NOvnNXtbvV4i3WHabzkjU/Sk0k4eyfC ntZw== 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=SgHtbiYlRwiHuYPPbg8nIzF3iM0Fq67WjzjGSTMQfuMf39zGvDQorGcZdqhqLM0y9I 2+soNJIZh7G40/uexmY1ZNTrATVbYjUnbhHxFZ980xazroLXMY+80h8C+tu7Lgev07M2 5Zdi6mrdsGPAh03fwMcYryteAysrR0BQWPOMugjRi+N9ti8TBdExg89IfoSiUpIKKz+Y 4FCjUJIqOf1BXbiflEHohw18MncN7/Gr/CxRDWDfXUn0IOQi/5OA/Yf+7V8mFJeRhLIr kaYpaD4lxUVa2kqQSwYJE6nI3B0ppy5xXQ+f/MtCD3tZQGIuiAyDDQnm2xwvNIAVXy+c ZuCg== X-Gm-Message-State: APjAAAUYl/YVTsrsHOsdbZbkxLw/gLM77wCOXi60zB4qyk23DVKmnvzX +Ww/rqysw9Kay+j+ecLr8F+Ow1ZX X-Google-Smtp-Source: APXvYqydEIpJHxDCAON9TbZoowcxkHAFvVn3JVZG3Ap9ZRPrW9Pv53awM5VGbOl6F7EipWAvX+nklw== X-Received: by 2002:a1c:cf0b:: with SMTP id f11mr104040407wmg.138.1564430885040; Mon, 29 Jul 2019 13:08:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id k17sm80614454wrq.83.2019.07.29.13.08.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:04 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:04 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:42 GMT Message-Id: <60a45f26948989f928ca439a2860433c0f08f412.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 06/23] 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 Mon Jul 29 20:08: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: 11064499 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 B1B4F912 for ; Mon, 29 Jul 2019 20:08:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A593628508 for ; Mon, 29 Jul 2019 20:08:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 99F12286D4; Mon, 29 Jul 2019 20:08:40 +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 30BBE28508 for ; Mon, 29 Jul 2019 20:08:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730344AbfG2UIi (ORCPT ); Mon, 29 Jul 2019 16:08:38 -0400 Received: from mail-wm1-f68.google.com ([209.85.128.68]:38390 "EHLO mail-wm1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730188AbfG2UIH (ORCPT ); Mon, 29 Jul 2019 16:08:07 -0400 Received: by mail-wm1-f68.google.com with SMTP id s15so33220733wmj.3 for ; Mon, 29 Jul 2019 13:08: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=l5Lc+K10Q5KGFTUC21cAVre6otBPd1JAXLfJ7ON6Xp7vQf9IVFbIa3QrS7rL0rYd5l hU/dYzLNnTAT0CcC8Oji0G9C8KxErv38N7ktFEafH1NYkJz5QW5A8RrzdoRh0xq2mmFJ IhU4ELit+ME4efWYB9/5c8WKKnYr5XUyNKk+2KZ012sSthfqjdRxJWmopvG8Jvvprcd0 KuhHhK/taokb7q+9VPvo4eS+O/3UYJSk1PeX/Z5Zjee0nUblvK+elelughOTZ+B1kldQ VpMy+KXn6yhi3ZUbQymqRj+NmvBNa7uZZduhGr91Oznmc+sJumM1dIFhBnaNCdsoFIqc TWPg== 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=T736ewdRqQW89y5uTn2U1JeWmTiNoUv8QMvu6q32uPvjTs3JWRasby1+ylcbpopphh VQDv2H+gjw7Xb3bZVH7ml+vVQK6ebymhk1H/LYlW2oHP7LqfkXxG8RQSSJy2CQpsmKvs LZ4vw0qJ7WdlbhpF3uKRmEBhp8WLGtHW2b5rlv8EsCTuPea2/71pcVTuepTdFp8jtu22 VZi/2Kjr2tcvqpyiycbkIFp31oCrIhqRm2hG5E9KtPe6Dl3UvJ+8hcmgMUnMvurGUscU jwFDCtBdQj8JXCQZEiYbx2fSmfrt+DBNnYRKigRZzMRII8v4hYACoPh+ZrQjpSfhxnRP xOHg== X-Gm-Message-State: APjAAAWpFsEfM5XXQwWHn0E8f+JexNy68eVDL7eBD88lrJI/g9qEeFvb ptIr+/JJjaqiHUF+eGB7sKjWCgoq X-Google-Smtp-Source: APXvYqx5EnUcKmgl1v5/TnD0LmuX5HRxop8ikt0usSc/lHg6bXUu4BHneob65dmGWMG20bcQZmD4bQ== X-Received: by 2002:a05:600c:2111:: with SMTP id u17mr81753251wml.64.1564430885679; Mon, 29 Jul 2019 13:08:05 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n14sm119996385wra.75.2019.07.29.13.08.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:05 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:05 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:43 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 07/23] 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 Mon Jul 29 20:08: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: 11064501 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 DF57D1823 for ; Mon, 29 Jul 2019 20:08:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D20C0286A1 for ; Mon, 29 Jul 2019 20:08:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C643D286DB; Mon, 29 Jul 2019 20:08:41 +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 64228286A1 for ; Mon, 29 Jul 2019 20:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730358AbfG2UIk (ORCPT ); Mon, 29 Jul 2019 16:08:40 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:36834 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730189AbfG2UIH (ORCPT ); Mon, 29 Jul 2019 16:08:07 -0400 Received: by mail-wr1-f66.google.com with SMTP id n4so63284486wrs.3 for ; Mon, 29 Jul 2019 13:08: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=aRlLjso/mXtBqi1yHiqjkMit0qGMDphvaem5R6H+F1QAce8lXoDHEFOGXihW+5SOq+ UbXGuABdUFeZZN47VfpGpVIVvXNBczOccaUnO4lb+TgopTHu6uaxtoiF5dFXl8p/LWQd boFjASYXpwSOsYUAkI5I9de/DlI/NGHfekKflQvnlbOFwlcBKExPBWct/zR/d5p6f8G3 921O8v0msgwyMslP/g53vL6QT3wL/8xznzBsmGvacI8beIDUxesZKr4glHkBClQWOwQm yG/UWDLeUjuw2LTeHsBhKWGOBF2hNzsu8Ir+UY40kAZg3ObIzKcxREXDGctFVHkeYkus gIvg== 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=Jv0mcgByc45w3fn4Z39ZkFwae0WSrbzpxDOLZ7bmVuVvcpSQCiVtMt3KzfsuYABlop bMckTkpEEKyLNZaW2QKpQnKjfj6s0SMLFeuAeX1Zxo2SKFW/itJISPxiNNWQB1xwzOnJ aJ13ltXLdOoVue53SdIvvfrL/JE4b3GXj6LTBUKYK685qKkrQFgse28G+d6YtPU/smt7 B0YeseuMfL7uaCRSf2XtoUnWXB1i1/5ctY9sd8jjZMLr4Rn5bpiIeSDGjRKG6aXCclOk AxF4RYLZQE1uOmFbdDbeQzweBrBDyrl7c1P/MhTPjwEdQKvjFOV42UOa9SdQm2C/LKS9 3kCQ== X-Gm-Message-State: APjAAAUvm7/is7uHFdctaC1jiuZrrG/3O+5bGcpD8FiFH4tgB37tpLgr siqIVKtJ1FGErVbJVJLEZavfnKT9 X-Google-Smtp-Source: APXvYqzwR5rmzZMzCMrcVMTiPZbcQ3Hkex3sVlrYVlGfYwk5/FnD7iRPDyPlZGmoVi9MCERhm4W5fQ== X-Received: by 2002:a5d:6182:: with SMTP id j2mr74725344wru.275.1564430886353; Mon, 29 Jul 2019 13:08:06 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f70sm80788963wme.22.2019.07.29.13.08.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:05 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:05 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:44 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 08/23] 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 Mon Jul 29 20:08: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: 11064497 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 90012912 for ; Mon, 29 Jul 2019 20:08:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8362528508 for ; Mon, 29 Jul 2019 20:08:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 77BA6286A1; Mon, 29 Jul 2019 20:08:39 +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 6C28C285A5 for ; Mon, 29 Jul 2019 20:08:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730342AbfG2UIh (ORCPT ); Mon, 29 Jul 2019 16:08:37 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54795 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730190AbfG2UII (ORCPT ); Mon, 29 Jul 2019 16:08:08 -0400 Received: by mail-wm1-f65.google.com with SMTP id p74so54948081wme.4 for ; Mon, 29 Jul 2019 13:08: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=KCf02VTUiRQdKJs4pgusfmmqc+GNILxHGgE0KjU1C3E/v1uwyZjz5uWeKzOwLt4iIm vuVlcGZWKcveKufcE7qUo7eY9RlnuvOnamSS3i45kNzLaPwp8TeAZWPVILozR9oDQPfP yWyaXY+tyUVEXQcCRaSAL0skOyRXPF4uZc1FI/jCmC3rH5UdqosxPUzNGr8CgNS02Oz4 HCTkM70KK7z9H8XyCb5PnP900jjfXnjP0LKExDNRNOIYvAUS5yDXCTRkcocB16cgG/Wv XN3UMMLL0UI2KoZkXFzeoC4BjFySno6JImqufBXLQrlzpOCiLQpz+wTnXDKeVbnfVlUh UpUw== 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=KETuo7KLboWtaNz2jRQzVM5ub++Trj4nHgmbMfUO0vbGcSmIYjfV/2U10oaimsXgv+ HkZlAPx62W6f2TsMwU4NwqPpYdpIn6eEwl0sZUxOt0qrioBWGlXSRAhpi08YLUigZOlW udUy3FzcQF68V9lx9Y0A3P/xXn14z2IPlO91Uk40om1T3lsrYIjcoCLnC9mG1ZEncX5G oir4elUPhPb35fpBNGt0FlNH4B7ZTSZRXPyE6WDG+PfiFSzl4WhyQ1+3ox1WPN3VyjVr 0y1jCbO+PSzhm+VKoOi34nYVeW95aiEQXeFZEcRQhNNhVjDS0K1H8IhyOcVhnVftd5MF Bgxg== X-Gm-Message-State: APjAAAV6zz5/YLx7p5Ax7vezYKnIEImstoBUXIpz9ugpkHo7p1q/BYEI Mo3J84GpVLG8UIz+pCzrQKUtxzaL X-Google-Smtp-Source: APXvYqwjxGK6giYDAF80V7vrsvgQMBtLgInaI4bwQshMKT0WGT1M48zeM26cr82Ck128DzqstBf//Q== X-Received: by 2002:a1c:a00f:: with SMTP id j15mr19831699wme.167.1564430887039; Mon, 29 Jul 2019 13:08:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f70sm80789013wme.22.2019.07.29.13.08.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:06 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:06 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:45 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 09/23] 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 Mon Jul 29 20:08: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: 11064491 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 16D711823 for ; Mon, 29 Jul 2019 20:08:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0982628508 for ; Mon, 29 Jul 2019 20:08:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F218A285A5; Mon, 29 Jul 2019 20:08: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 9C2B6286B1 for ; Mon, 29 Jul 2019 20:08:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730270AbfG2UIN (ORCPT ); Mon, 29 Jul 2019 16:08:13 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:43682 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730175AbfG2UIJ (ORCPT ); Mon, 29 Jul 2019 16:08:09 -0400 Received: by mail-wr1-f65.google.com with SMTP id p13so63172426wru.10 for ; Mon, 29 Jul 2019 13:08: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=uVo6Ei6FyHS1xxlwdzkAJqMZFCmhubA9L8T4IbZ1xEtc2qVcotc5P+A+1IGVKuwgZg yhElbRe1wpXGhe/yaUxxb+ljZFEaC3FMU23MAZLTTbz6VIGGRKr0VjEBpS2pq4I+ajpd YkzmPXs4px7DNoP+1r/wuPiqD3XzPRkevWH+tyDY/ZEGnzhJl3JYBXNu8OuF9PEepa3I F2iJyWcVr7evOvjevbyjM6yW36fSmyIOlnhUGx+/hanKgQr+Cm6wbc5C/ljyVVADHqpd 1xafksScuUMR1K5za8C4CZ03FzHESN/vnGAjXMaKBu2t8MP3KHOkzk5wtdfgBsYQ/wl8 OlpA== 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=eKB9SI9ws5dkM3r3BhhWmvb/kKX4/D4etvNpcWi3OdUEYY9i+b9RvolDHkmeMlrlVD ivbZ4cVLONx9ApMJf8RVrvuac+CWb2lgD6OCuZThg22M3g+RtlXfOw8S1P9F+A/6aRuh oYR+km8ZpLKBbDaSmGqOyAfGfukB9xwgomb6ruPTadGYrwVqyVBf927POsfFoRshEd/D KZHA7F6xSCrWK16i3KwFVWPNH4TxzM0whO5zgSBQxlcdlgVpDfDOT+ba9u9NFC1+KFhL ANdxbxhddoEGIS5Pg99sBtsbiOn9NDPcvnPlx+E1+KRAsnWwnzP+4MGSMnyiGrTvcOx5 o03A== X-Gm-Message-State: APjAAAU+NY60mbFK7SwtPRxS8em+eQHlXRVCZzaYh2ot+x0u6SFK5Lzn Pgopk7EXL1QK5ozvG1wfhj42EgX2 X-Google-Smtp-Source: APXvYqwo92nY7VBcaaWW3xfhl/TQA1aTDjqmDkAluOO48KMPg1Bm9tYNCb4w972+J3UBluigLsmbEg== X-Received: by 2002:adf:ab51:: with SMTP id r17mr95917503wrc.95.1564430887682; Mon, 29 Jul 2019 13:08:07 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t3sm49576248wmi.6.2019.07.29.13.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:07 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:07 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:46 GMT Message-Id: <3cfbb7843ac3a27c79da4554cc550608b19f2d55.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 10/23] 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 Mon Jul 29 20:08: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: 11064465 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 7BB3C912 for ; Mon, 29 Jul 2019 20:08:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D44D28508 for ; Mon, 29 Jul 2019 20:08:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F4E6286A1; Mon, 29 Jul 2019 20:08: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 0597C28508 for ; Mon, 29 Jul 2019 20:08:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730285AbfG2UIO (ORCPT ); Mon, 29 Jul 2019 16:08:14 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:44282 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730176AbfG2UIK (ORCPT ); Mon, 29 Jul 2019 16:08:10 -0400 Received: by mail-wr1-f68.google.com with SMTP id p17so63184871wrf.11 for ; Mon, 29 Jul 2019 13:08: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=pTj2tRGipYvQsiftkJhGnvvMdNvTP4ND5BhtEXC/dgWnOmiQw8J3dUNxmTH3Aqhxo4 9YpQG+HKc5J/lmtiHb/OV7blRUw3xLOfTO6RxtvO0TfZFj0Q7q6I64y+Mdy4LbnqjcTE n83WGgZNOg12O3UOW/r7GrBnGXXVeemMdNAxBxZFA4Gi/LG6abBSAsA0BufoZ4qvT9nl GgVS7SfN53Wfhi8YSoDoMC2WPqnt2e6Hh4rAmQ3xsCkQZuOJdMFkffnyJWwenXKzeHDW Wd3QG4MG9VyFWZqUSNjwtkGynIAp9RdFGrQTdx/XG7NB0qNPFH0rcAblEIYGMfI8kLvZ emXg== 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=C5LDNGtg1v36hqeTFsvrh8/R1/HCZXrlYiiBH644D9VZrpS/oAG62GE5l1fVcyYN+3 RHeGStrtZ5hXPZg8uQZVMC1QJwYGS7L57AESJymbeW7Ljc1x+kXM1E8QHOP+0a9Nuld3 7COogo87/MhNwuQJdKXWDrqiEp+69h2bNyLjnAEEGhLxgFYALAT1xPpHM9jqJRP14Vub 0QxIfEqPMbc6EeAZmJ1AG5gQni7W+EwUItI6PUl8Tb8r1uE4hzzTzBgbXfK8TAGlZERh vFg+qax9GxIVlf9QKLaHL7SLvtiBr+kg27HA8bwb4/JN2IU53WXBQG56GFm2poO5Ts3O KjRQ== X-Gm-Message-State: APjAAAU2dXJjGlxV+VR9R/sUFCTEUcMqHND/0dBPda4czPceeT2HxjLX k9rvFrJ4kQnc1s1Hz+HnY3+Udp0G X-Google-Smtp-Source: APXvYqwHZSs8LrgYYBaarO9hFKCsuJIqAnhr9cqrOMXmGQAHXFvoS72Vip0YoxAifUCObBA1DAH0Fw== X-Received: by 2002:a5d:4f01:: with SMTP id c1mr41251047wru.43.1564430888400; Mon, 29 Jul 2019 13:08:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t15sm54422824wrx.84.2019.07.29.13.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:07 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:07 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:47 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 11/23] 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 Mon Jul 29 20:08: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: 11064469 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 B3B8C912 for ; Mon, 29 Jul 2019 20:08:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A73A428508 for ; Mon, 29 Jul 2019 20:08:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9BBAA286A1; Mon, 29 Jul 2019 20:08: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 4FDEB28508 for ; Mon, 29 Jul 2019 20:08:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730289AbfG2UIP (ORCPT ); Mon, 29 Jul 2019 16:08:15 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:42021 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730221AbfG2UIL (ORCPT ); Mon, 29 Jul 2019 16:08:11 -0400 Received: by mail-wr1-f68.google.com with SMTP id x1so13297366wrr.9 for ; Mon, 29 Jul 2019 13:08: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=IrxWEx8GtkHx4fIAP4Or72H4HaPYjZzV1xwU+EApZWE=; b=YAyIVWJuGDG3O0TOZQpGxwH+C9MCUHIOQKt8K+8XE+SRwcG9RqwF2WB+cqlBrBxfKW JlVfZBd2wuXSeSOmyDP74Yxy8js8t6UJmFl2oxT3FCIrQu2f/+CYCwHrlkH8jCam0CeT 0P4I0B+ESa/83saf0vi67O5gVzJU1ff71xh5SHKlS71hpXLSuAWryS+aqAul991UHxgS UQcnzuoDfQkDHC2ji0///Cnh/VWIi6cr/gImmsSgGenJfvjpUJsk5B5NdBDuKJBUqaCF vAQCX/e23Tjt5yCpd+GUfuYKK2BEf1StWRsHP2KyyTEfHz4W60GcI+joOn3p9RGXYS4c Yyhw== 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=ZuVyRoGhps2IWAyrmBuPRzBZy+jHrnGqzyUGEfRD8gSWflz9m4d12QeG5MKPNV6sCV 4BrZxckwaDVyUJfBGIKc6OvtcmOqJ151K3KXcX+GPFM56o92130gthfOIciijfR4AqWA glEo8zG4UTsz+6t/X0Tnn4S7KIl+lkm2LMYIF9KuQkrLZuXrRXSbl4sYe3X3h91OTEJd GGEOIeWPI9XUpB29Yw30VHDjctBb2HNB0pPN7XTQCUwYTaUo8jKRnjpmLw6Ywa7gkDvn 7IRDjIkfYdu0Ec+BCOVATZmlp8pvL+aG7whwwAISN5/lna/FcOvKOlVUULeibb8DuAGz G9Zw== X-Gm-Message-State: APjAAAWeKgz2r3EOjTlkMqYWnAHGqEzpHbdbk/Hmf9tlhiTxU05IsOw2 9yhUvIzB0ctz8Xc84C0OR0/BO3RY X-Google-Smtp-Source: APXvYqxvguPW4xmP5/pn0ZWDjjKX5cE9W+QV6CHwuNZmQcgmyS/HVqBZCnRscx37BXLdzbV8waKJ2g== X-Received: by 2002:a5d:428b:: with SMTP id k11mr88511814wrq.174.1564430889050; Mon, 29 Jul 2019 13:08:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id a6sm48622511wmj.15.2019.07.29.13.08.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:08 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:08 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:48 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 12/23] 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 Mon Jul 29 20:08: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: 11064495 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 E1BBD14E5 for ; Mon, 29 Jul 2019 20:08:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D55FA28508 for ; Mon, 29 Jul 2019 20:08:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9F9C286B1; Mon, 29 Jul 2019 20:08: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 EE25B28508 for ; Mon, 29 Jul 2019 20:08:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730211AbfG2UIf (ORCPT ); Mon, 29 Jul 2019 16:08:35 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39865 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730235AbfG2UIK (ORCPT ); Mon, 29 Jul 2019 16:08:10 -0400 Received: by mail-wr1-f65.google.com with SMTP id x4so10040951wrt.6 for ; Mon, 29 Jul 2019 13:08: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=RjrRxD1oN4LEipLClt9dDAoJRBZ3w6svMvCkO2eF9omvNUnjHTvxhDE/s41+jUjhKA 7T/Db+PjRzuJbupogc7QfRQiDflf1vXAmpIgjNcqxB77T74mNRSw2pt8nXek621rtAPq iO0F/KYLY2SsVoK2XC14fxaMlcvTgmseeekRihG8Runb0uRrPHLRP7NPjfJALZ65Y6Vb +E/bJTDGnvCWb50Qt7oILMwUvKnc8eyAW42tsDI0qkac2uJVLpT6HQYixF2eIdQFmv3q QCq//2wq+MJt/21PF0lAJvHSR+FdDtMB4BkjOGhvKqIt6A//SzHsmFehrg+xQjlRxctO PeRA== 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=p/SXgRwNNZdWt7MTCYvxUuyv4i1doiKRns9RuI90VazteX/ulP2WBEBoQUSW7uaGLh G0Rdh64Uafihi/gJkl8LYaRyYdCz5WTuNeYDQkm0e6MRs5Q0AsIR50Y8lZkTnDBkXj6o 4CMHbJdhkCS9I2bfuzveqKffdo+WZax66RFXEK2waJ7250CVTjZMXdC9qvOPWdXQP6bS pDpfTWkhLZ9lRK+6fT2RN5S4K5zi5o5GEQt0yPkh44+OeeVSodWcOJEl3qZMZUTGAua2 M/5FoToL3mZaZNENAMY1mjJBuabn2j6hwsBp0XOScgJVAPu+OsHFuqK9QassCOuN5+hZ kP7Q== X-Gm-Message-State: APjAAAUmW14DLD8B8erlVErgQGGgyMvHBaoN0MZ0DBmLimIYBCeyCGb1 GwUrmHbnYQBSMwONBWF5ha/hBa0P X-Google-Smtp-Source: APXvYqzIarLZWhm6tuZmUF3AdT1f9vI+nbP7zHXnIidQryAhLxC0Q5mVcMxREa5YneRWmwIa056D5g== X-Received: by 2002:a5d:630c:: with SMTP id i12mr34285381wru.312.1564430889717; Mon, 29 Jul 2019 13:08:09 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r4sm36189911wrq.82.2019.07.29.13.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:09 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:09 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:49 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 13/23] 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 Mon Jul 29 20:08: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: 11064483 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 D123A14E5 for ; Mon, 29 Jul 2019 20:08:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3BE128508 for ; Mon, 29 Jul 2019 20:08:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B7157286B1; Mon, 29 Jul 2019 20:08:29 +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 599F328508 for ; Mon, 29 Jul 2019 20:08:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730299AbfG2UIQ (ORCPT ); Mon, 29 Jul 2019 16:08:16 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:37821 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730243AbfG2UIM (ORCPT ); Mon, 29 Jul 2019 16:08:12 -0400 Received: by mail-wr1-f65.google.com with SMTP id n9so38119372wrr.4 for ; Mon, 29 Jul 2019 13:08: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=Ce3fTtUIO6bdnshZ2rWsAAi5NNs8x9hNY1VHzKgK40/8liWBQySBlcAyG3bULJf75X WLQRA/DgQPnMdj77mit2GGu55Gs1jbzcGXxwW/wt+Dgalm6hQQ8ih3Mo1V7v9PNwZVQW baJTnYwdO+smUb58HhUixVAbz4VuLsblpB4ySQZVRIo0BGMQ2JjxM7J7yOvVejBF3VCX 3xN6aAl8v4D2PfkAjqIvCjYWu5Jv6u1Vl4sjZrzztKUVAk/bsByPVfvcGCvynjVNX+yO 0s9SBH/ZeQhCPCsPHQ15B8yZZLdbCOZxid3jEBPFYvaanViqA8JTE4xaYbs6erlaSl2W gJHw== 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=ekI1gBssrCMZ4MyRZR4GLRyBIgFonMg+e4NEUzz6OzBsKKO0OPPhEYTe+A7jEWjY50 QWAFXIhyHNRn7WxY0Y2i1bUfNQ6UPJDXcnZCPADxULJuOC/IGcKQLfpGV7OPL+4A7o6R w3TbYj+hUR7t8K6pCo8TCuhMuTg9MTa42sbzXhVGJ1DuDZxvYiyS6xZpLeZxtu3rz34a +9hMprajF4hO+UJVuM29Yp7GDZ+wa16XH9N3qEoNV2IH2hl/MqkSP/E9W5mMoBdpcYyd J92+pJY+jy12cOIE/CYgs6MYIVxSzCNqqD0qjZVErZvkE+4tX6LPWSBDP5WCGQxyFzrT dejA== X-Gm-Message-State: APjAAAULzgMVO05ZiV5wsY/md0kqAjeE90UCt3aDIWzHQWSPBBE9Y8Gr FeiERxcG1oTM9ah1khXab5XFPBRl X-Google-Smtp-Source: APXvYqwJ4rgAXTK+TY7EcUum+YFb4Xo3hRqKgkUdyM2woyl7Gof6xfmpEOipuh45UeXqOizry5uSVw== X-Received: by 2002:a5d:46d1:: with SMTP id g17mr69392542wrs.160.1564430890496; Mon, 29 Jul 2019 13:08:10 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s12sm57401776wmh.34.2019.07.29.13.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:10 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:10 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:50 GMT Message-Id: <052a98b8bb8aef572cba41dbdaf15a7b987b8270.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 14/23] 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 Mon Jul 29 20:08: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: 11064473 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 765C9912 for ; Mon, 29 Jul 2019 20:08:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 693D328508 for ; Mon, 29 Jul 2019 20:08:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5D544286A1; Mon, 29 Jul 2019 20:08:21 +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 1353128508 for ; Mon, 29 Jul 2019 20:08:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730325AbfG2UIT (ORCPT ); Mon, 29 Jul 2019 16:08:19 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:37824 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730256AbfG2UIN (ORCPT ); Mon, 29 Jul 2019 16:08:13 -0400 Received: by mail-wr1-f67.google.com with SMTP id n9so38119407wrr.4 for ; Mon, 29 Jul 2019 13:08: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=DRVS0xsHszxthR0lnQJKHG7q36Q/q45IVfDWrw4MlLbKcQM8nYIRs1SujYUonvFiUn /Chyx/gQeLd7dEpYzXXPThRTf2H75xZuuUnYBLRNVcLShCoCS6rMlADxqmbbx8HW/FJo nO3XFk+bP52dOZD+8IwG8QNe/A/qrpCJ3h5fmq2wOT5DapVvro518IHi6AHkTOyW+vf4 DChO/KZci1kRFMhD3QlYaO7kELxjhtv8Zj8JYa2amXe9yiz0i1xJjCbJ6wiiiPJ6bq7g 7whU368aGZGaz3nb7W04OyOaVfPro2HwhM7IyANSR8ihUgUSUIWFiJxMb1OI9s8lzKNF rqxQ== 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=ZMNxaIrRuZYAoDhdiOhxAm7Q6+6uc2HHU/Oytagxs6UqRazXs2YGosqtLq3T4a1DXi pa527UOzgajZixSgPCJtl86hI0umim010XmJi2i8UDoGLaYLpgwBjFKd1mFV1vM6pWLp L35rfbWxKfX/JZwbDFyXhYDIorfZ/aNl7IS1ypBbaPPbQu5uXBJBEx+3GpIDBpdBBFah VX9dR+KZdy+xSAYNIZeBwGnCLr4EgacpsrORYMpjEqIg/RmvH6DdH+n3NuR2sIYgeBI+ LM+Nw/znw2SgWkJGY7xlS0GzTHUnnvuxFE+5j3LQBA1rsSJT+aitEdX1FnFOIYepwDnD jviw== X-Gm-Message-State: APjAAAV7qUeP4tuu900HFwMotgxFaJjdQt7/S0g8u+VcXYSQ+OTN1BmM heirjNAALDg0t92Bh934lGko+jdH X-Google-Smtp-Source: APXvYqz81jkiq/7Hr4YonGkDC4cf9+tj1fdZJDRLsLUZ0F9Bwdu42LkxlA4lbAzkv8vgi6zhjkOYOQ== X-Received: by 2002:a5d:62cc:: with SMTP id o12mr68568605wrv.63.1564430891261; Mon, 29 Jul 2019 13:08:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p3sm50981585wmg.15.2019.07.29.13.08.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:10 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:10 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:51 GMT Message-Id: <5c9702ea50fa2eac880e5a3d02b4e6734593d445.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 15/23] 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 Mon Jul 29 20:08: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: 11064471 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 3036E912 for ; Mon, 29 Jul 2019 20:08:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2141B285A5 for ; Mon, 29 Jul 2019 20:08:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 12D9528508; Mon, 29 Jul 2019 20:08: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 9A9DA28508 for ; Mon, 29 Jul 2019 20:08:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730307AbfG2UIR (ORCPT ); Mon, 29 Jul 2019 16:08:17 -0400 Received: from mail-wm1-f42.google.com ([209.85.128.42]:53295 "EHLO mail-wm1-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730266AbfG2UIO (ORCPT ); Mon, 29 Jul 2019 16:08:14 -0400 Received: by mail-wm1-f42.google.com with SMTP id x15so54990563wmj.3 for ; Mon, 29 Jul 2019 13:08: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=fOb4rPOQZUm/MFvj8zm6F9Fzw5sc9zdv3/a13mCs5PTJHxQIL8/MrUsGMTvkOXR2Jc fhqGwDbe7XSclyNcBj+ELerrGuhscXEkHds4ViysOetnk2q6QTyymUL0Ms4OAvXNdojM abKFnWL+lBp8vMudHaZpihpxoZYkSWK1iFRHERk4oVmdNTQgUYh5h87s97ufU8w2le9L RLSOlFZ97wRnJSof79kNEnkipM2KspEUMbruC76FDMrbma/88S/tmVoWKMExhhDIX2Ii VRiKBg+AHWbCZbBLutW8koUKUYCL8dMWCw93Bfi2pglWpXYOmJTlr2NK8oENddUf0NKm KUbQ== 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=U0F7Zcic8L881bnC4gCdKYQDe23aGloaKPKR0fTioSyl5qX/TSO/42xOVtLXTVeMFW cnadw7/n7TAEJsvOwbXgxlDfV281HQVbqPUL3kLwNfDD84ekLtwg43e1TjlEsFN32PKR ICR0CZC9pZraZp49G+DXQlzOg3EZANVUqs0krUqDYI4SKtf+x0XXElsz9pC3biP/qM4P qOmpaO9DlvnaOEYGDAeTXEIm0s5rubJMH2lqqLvQtQ32lnfO2Hol0EMex8U/2ba2KaXv 89Wv9/yxf+J0MoXydCM4Hv+huEuwiNJiz9pStBcQUAB3ZYNQHgjehA3raPXT0dzsBaXS bgtg== X-Gm-Message-State: APjAAAXXo0SZTV5mUxTh72nvl+TaHENHfmn6oU8wW7H5BZLw016VJ4xA vAWCVFofRHlqsHZT65uWLSTYpw+K X-Google-Smtp-Source: APXvYqyaLTTqbTXKwiqUy13sLpNxbzMy1i2odEYZC3qNfBleHKTo58N7VTECYxavymIvpLKl6Rd80g== X-Received: by 2002:a7b:c0d0:: with SMTP id s16mr71157813wmh.141.1564430891934; Mon, 29 Jul 2019 13:08:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id u2sm54362929wmc.3.2019.07.29.13.08.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:11 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:11 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:52 GMT Message-Id: <1d4c5539ef5e9c1e83e0ce6d641c535dabf5d242.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 16/23] 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 Mon Jul 29 20:08: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: 11064475 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 EDD6414E5 for ; Mon, 29 Jul 2019 20:08:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DDB5B28508 for ; Mon, 29 Jul 2019 20:08:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D1C38286A1; Mon, 29 Jul 2019 20:08: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 C09FA28508 for ; Mon, 29 Jul 2019 20:08:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730329AbfG2UIV (ORCPT ); Mon, 29 Jul 2019 16:08:21 -0400 Received: from mail-wm1-f53.google.com ([209.85.128.53]:37633 "EHLO mail-wm1-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730178AbfG2UIP (ORCPT ); Mon, 29 Jul 2019 16:08:15 -0400 Received: by mail-wm1-f53.google.com with SMTP id f17so54558386wme.2 for ; Mon, 29 Jul 2019 13:08: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=VUEfmsBgPCNJ7yQ+GSXcoxV5ux3vtIFPNiAvdBsJMUc=; b=OuzHLvEmyuVqpcng4Tam8BjA2i/FYH3TQOAlm8MXzbjVBDj2YsxkEleqtRcy54JE/u afTf0SmMi5Y6Qq2E3LiFOxRUTvhotc4OtT7/x+Utio0tHu6rawEVHKqF9T+x1S1qoVhr r5IDNiwdtmiyYrBZMK8NCbH3okYgNOVeYvTaDgwZCnW+6Qi5wJSawy7Im+g5tZ5wUfwJ SEaXyEBzQj3Agn1wL0k7nLtD7FGYhNDKzoOWZPjPSHW5Rq6vZTmGgY1UOzXQHaxMiMbf YeqQ21ewAT4XdC2aHa1Y/nUd5ngNp6MP1LRganf4TPhecnw8KMXPNKvxWPGuZGVBWUeH aiMQ== 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=VUEfmsBgPCNJ7yQ+GSXcoxV5ux3vtIFPNiAvdBsJMUc=; b=tW6kXF5avKSoW+81SgegH310oMBxFKto1MGxkOeZbJINBPFpvy1OOc7hgxZQyH+VtR YNXyCYXIkacFkGpmpYpb/3FK39/iEG9gzpYVOOt2aw8EZnBHnDsbp5jsNtnl+nx7giUT XP7+c040UMw5MM7SkmP0ujf15bDNu79Bb1eX7x4MC4qtGTeLxydm6XOiJEtKnHFJVjwq Id4ZvRDwkh5rqbRM87c26uP4aqb9UfrxgIRu/Z92vINZftUC9J1IiJjv7cudei7WUeCD 5jdWjQE4XInJYB8Et6nAwdq0849gXxPRzZDkv4OTpuYQbI/dGVBwVmLQxozRhZeXBx57 BiwQ== X-Gm-Message-State: APjAAAVeGg3zvMCz+6jyqRSL2EkJuVB1yXLWIVlwSfGwwad2p8439QcY G+/x7Vj3ScDbMWqJqA7eGF3k7+zg X-Google-Smtp-Source: APXvYqwSB6jrHBMORlIGjXAVb+aAhUanLFUmMFrt7L7HYPHWzKS/hoTx1Crzb6cjaIe4EqEzu7rrtA== X-Received: by 2002:a1c:238d:: with SMTP id j135mr51077155wmj.39.1564430892674; Mon, 29 Jul 2019 13:08:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id z7sm59924958wrh.67.2019.07.29.13.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:12 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:12 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:53 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 17/23] 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 | 385 +++++++++++++++++++++ 1 file changed, 385 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..e65d78e16d --- /dev/null +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -0,0 +1,385 @@ +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 Mon Jul 29 20:08: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: 11064489 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 A3ED0912 for ; Mon, 29 Jul 2019 20:08:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 958CC28508 for ; Mon, 29 Jul 2019 20:08:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 816C8286A1; Mon, 29 Jul 2019 20:08: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 D518128508 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730349AbfG2UI2 (ORCPT ); Mon, 29 Jul 2019 16:08:28 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:39317 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730274AbfG2UIQ (ORCPT ); Mon, 29 Jul 2019 16:08:16 -0400 Received: by mail-wm1-f65.google.com with SMTP id u25so44215889wmc.4 for ; Mon, 29 Jul 2019 13:08: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=GM/y04ajKEys86gTJ1hKFc0hqj5SVtYCPH4UF6OpRqg=; b=JLglH7BPiDt5q01PVuDEVNe4+3GNkqpIY01xivI6Zw4z0Xe4TRFPy5oJMIJFhmYisz tj5aoyoGl/q5R/HFLc9suM2JH0lyTpGq8qrGB5z4wXnea5CwWW+erA8cKDISHpdxi/m+ bv6XEQMdFtp2W3dRvA2C1DrREMgb2xaRez6MBUEjIpDuqfu4nld1/5puo5iwv8JkrP2k J5whsEp4X9eI/xYm92eYYMnIKz3fMsjqLmdp3spNfUcwtuGjJlolGkkmKcDELhAe/zMy ttGJh0st2C59EW/KGXSQszmmY6XWqxbPrbIbCuGcpI0KdIsQmbF2Q4LKBj6W+CaIfHBY S7wA== 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=Fxec+M0kByKsUsxbSB3gTvjqylfHfsqIOM0DxAUUa5xycPZbLRjNNTKlAuJpt2j1tX ZyeLXtEY+TUUYoxiYoRxvHN3wsfCa0A9ed1D9usZwXTVHMJmRr2KuSJMYbzXITQlUQe4 PIq2Oa6kZ+qfVURyXHZwZcly3Sn9vzcdNTnGsVMgpMYCyTV4nWz75YG1QZ+Kg5DL3Vf6 tUaup0eh1AXQ2ArHwdstATlJtgstt6UZofj1VkfF9p8hHKmN/WKtz57yTqnXQfp/O4Cj mF1Bfa0jMRWe8VF8W/VO/dG/ZmiwyTHCRsjlHN6TcrRwtBY1Kw+Qm0i4eS0HL/bfELIP GsFQ== X-Gm-Message-State: APjAAAVjzbslSh1xb6hgqq5G6PERsvn31LhexZiaeeSw5qlJMLAWCB6d 51Sz5KuwunycXI+1Z9h4ENoegseP X-Google-Smtp-Source: APXvYqy3M1u0+AqExKKS7XT1zmB4XrXwjMv7Iu4pfgkNOYHD1adgyA8Ulmuf9CyecdPGgzzZVhmuJw== X-Received: by 2002:a05:600c:23d2:: with SMTP id p18mr95055139wmb.160.1564430893280; Mon, 29 Jul 2019 13:08:13 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o26sm129075601wro.53.2019.07.29.13.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:12 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:12 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:54 GMT Message-Id: <2a3379d72185680d44b2444844d9fc87e733c30c.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 18/23] 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 Mon Jul 29 20:08: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: 11064485 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 A1D6D912 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92D3328508 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87191286D4; Mon, 29 Jul 2019 20:08: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 29DE428508 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730286AbfG2UI3 (ORCPT ); Mon, 29 Jul 2019 16:08:29 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:39878 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730278AbfG2UIQ (ORCPT ); Mon, 29 Jul 2019 16:08:16 -0400 Received: by mail-wr1-f68.google.com with SMTP id x4so10041202wrt.6 for ; Mon, 29 Jul 2019 13:08: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=um4OkzmWG0Id/TA2oihc6iR1UWKLZFKWAWBZpj5ZC58=; b=pqZxPiAAPATURC9QbVkEILhfq35Oj0q1Hr0IVYLCT7Re4OP/6WdWAjZpl7WIrNuInG /vHj4mSn1nQsbyzMxZxg8JPKdtREZNKaA17krfERxQFD+8mNeSv70InIvrnYZ6/T1CQK u/W1bxIvAtSnPafLe9MEhcFPRmFb7vqwyfOaGCCBYKpqrADvxGDDUj89vILHvxKw4aVP Gt3RaYLkOgRAf0QFQLTGHVO3IHySM3EvaDa7CfpJcdD51eplR7Di+3K+NI+MBx5pQj+l mLBMi93QtvgHeAOT7Y1u++u5VpQig35om0VXRTm4kvjEEea2kOPakIKvhnIgCj2dXh1z JhEw== 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=um4OkzmWG0Id/TA2oihc6iR1UWKLZFKWAWBZpj5ZC58=; b=C37qdcPvvgJJmtWRjwSv6jdEILFFJzbGAxZiGIs97Nl+8vLEzKZVitUpyMnLfXcti1 OJ6GQ7r08YQaLcDmDeZuUmQDwnPP/7WlpcfmuAP1v0CCyjYAE3r0P8Iknh8HAkKmRZGB KrCZP6APvZ3xNSUw8Gn9TZo+RvmmKTSri8L7uAECJGjxFZUAtPNbvjO3l3xjKsWirEtu P4n8eiIJMOsyjAQsKJrgT9u2xPyONF5zDh2vf17dvOABiVHvWSCJ+79bBE1nFRsug9EY t7Posh0roQG4Qxsg9tQdx5w5E9ffsop2+z4VVaAl7SzEfX6sSZmluXeStjbKC/+oKbw/ SU0w== X-Gm-Message-State: APjAAAWTvEbQs2VA1I/+L69ADbN1oGYJPj6QSJ29iVYIp7xnpIAhAIEO l4lIARRFp2HfGN3+QYinB9+n9+tI X-Google-Smtp-Source: APXvYqyo8DSfZyFCd6/SIVGC5NZhZbDLUg1us9+v20xb7KCeGrZWo/Q/Dv9GFyQbbVatfALB2N3MHg== X-Received: by 2002:adf:cd84:: with SMTP id q4mr45299394wrj.232.1564430894290; Mon, 29 Jul 2019 13:08:14 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c3sm67314256wrx.19.2019.07.29.13.08.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:13 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:13 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:55 GMT Message-Id: <4dbbe3f4a20be45902d2a37238524a52ce7d98c3.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 19/23] 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 e65d78e16d..576ccabe1d 100644 --- a/contrib/buildsystems/Generators/Vcxproj.pm +++ b/contrib/buildsystems/Generators/Vcxproj.pm @@ -274,6 +274,9 @@ sub createProject { EOM } + if ($target eq 'git') { + print F " \n"; + } print F << "EOM"; EOM From patchwork Mon Jul 29 20:08: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: 11064477 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 DC6EB14E5 for ; Mon, 29 Jul 2019 20:08:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE4528508 for ; Mon, 29 Jul 2019 20:08:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3730286A1; Mon, 29 Jul 2019 20:08: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 695F728508 for ; Mon, 29 Jul 2019 20:08:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730335AbfG2UIX (ORCPT ); Mon, 29 Jul 2019 16:08:23 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36851 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730221AbfG2UIR (ORCPT ); Mon, 29 Jul 2019 16:08:17 -0400 Received: by mail-wr1-f67.google.com with SMTP id n4so63284915wrs.3 for ; Mon, 29 Jul 2019 13:08: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=m+PGQ7pS6gBX31+xSm6c2iHH5LZuoTCW8nnedPxak25qGW9XoaETcC/Tk8MtGde7KK zfI4VtCYuGRyW0hDn5YeF+vgpBHcJPCwE9cO05F+t2hmyPYfd5AP89BcYhc/BTTfJCrx JpNi0Hn49HkrXQzS2mwGpy4xQqGUK+T4b3cf3meR1H0b8A9q0a1KyrLEMuKs85b2mlvR Z8dE+XCvTD9Jnnpa0zR2I9NxrtBo8vi3b2GZk50t+fdji24wLYlPW63Iu2Q5ki1FXmHD JASweWNOR4TUQqlmh99jX/lEsf9GNloiaiV510eoFwy6Xt21Qou1lz7P3A4pY1e88/yM Zi8Q== 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=EXtrsWbnjMGtdEzt8S+QrY3xSYuuc5amD4FlUspCNtyaAGRZR4NPJZ//PMqm7QN6Mx ut66xAduUgXTHA8YDaaaxne4F2ZPcRmkZFalz/IwfX8p0UGo9HPsD0UvEm+O8IuVsAEu I/z+WczUvUQFE99ndbmgy5EzfvByeZadTNBXpRqvSRtFX3NVnOPNiCI3dux9ifQzxmn2 Erd4ENKzlTMEaFaSewmbzKHL+anXjG8/tZQ2wdxMRlwtgEM9LXd3jEt9xPb29Hs5n4mA HYZJitv5nFwqiOu0fTtbDph7LPM0/Kcb5sZYh1+91IJw4LTg7AFTPAEp1x2NUMc/7Ov/ LIpg== X-Gm-Message-State: APjAAAWqXctojGp6+lbOXvdN8+y1Agj2yDvO952yNVfJbpUVePs0XyBz TG/v8WNQ2sOmjrWbwU+HoRLyu0C8 X-Google-Smtp-Source: APXvYqy9cFnOTbCpVCzo5hdXhPfbCr1iVMK2ecsC81Xhz2rEpFj7Lkt4pTXc/GpbkKzl3mgSQ3ATPQ== X-Received: by 2002:a05:6000:100f:: with SMTP id a15mr709001wrx.325.1564430895066; Mon, 29 Jul 2019 13:08:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id g11sm62270413wru.24.2019.07.29.13.08.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:14 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:14 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:56 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH v2 20/23] .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 Mon Jul 29 20:08: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: 11064479 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 3273C912 for ; Mon, 29 Jul 2019 20:08:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2554628508 for ; Mon, 29 Jul 2019 20:08:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19B95286A1; Mon, 29 Jul 2019 20:08:26 +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 BB9E428508 for ; Mon, 29 Jul 2019 20:08:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730178AbfG2UIW (ORCPT ); Mon, 29 Jul 2019 16:08:22 -0400 Received: from mail-wm1-f43.google.com ([209.85.128.43]:51571 "EHLO mail-wm1-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730296AbfG2UIR (ORCPT ); Mon, 29 Jul 2019 16:08:17 -0400 Received: by mail-wm1-f43.google.com with SMTP id 207so54990971wma.1 for ; Mon, 29 Jul 2019 13:08: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=rJs8zLNJc5W3EABytVF5MZ2gJQf9eTWKZGXO/abrFIY=; b=NrD8bLPTFh/+sg/IfPu6XHu8ObUKuq9Diu/xNRke9xQIUrhdXpQ6EvnJvlEKPhRsBI yD162FJejegDjbNLe5i6IHpH+I2TmBRXKbJtlQn/H5LDXcaX7YifChlYBHqLVzZEEq2M Cabtm4n132aW3wKIWH3cKo/+iMbTJB8JrDlUfOv3c6FJUhZLWrjzSsTmjJkMip5silRt boq/s6KOqtIlj0KGlomA8r9SjMQ8HfPCcl9MIRl+MRBdGoSo4V5s83Di8OhOa2S3fYsk RY2rbk6Tbm1sb0ylaHX7pqAV5T1brjoKQg/J/UXkblyJij0mjgoXJW/soHLqP1mEV3S4 h5Ig== 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=In2KGwnmm5XVulMxG14PZv6BX7pSG64meEL7dnYKVUMr2tGD1Tb2K+qU0NAUUKP8cI GpMj+PO6//AoqAruQ7a/sOujJwFKZm8LmfFqT+pojYpSk2ffJrIf3mmAkuWKUwextVNx oOIKkw4uCAv8DjLkUcyu9Hqyu/4IGuz42UHFZuPi+rI78xnb8x54IyND4KlHkVZyczz4 1UkUKDQdKo+w3UyEAdBTU0HtsRt/oFpFRqlBE7rY8bTExvUzhdAyo0EHoqbBQxv2Ubx/ Jlca9JeLarg0Vq6i12k6R6W7aJq6uJUCml5OQHdsWuHIReCT1xSdwTsLNhb9I+5oMvRC +L3A== X-Gm-Message-State: APjAAAU9CkYlNBdfoOy/QYjFfNax1BwIdpAft+lbhzAVcSfUhVCWIJQJ JzYD8VaDX+RQk1By8FsvvbdnDT0U X-Google-Smtp-Source: APXvYqzwoqP4WV5gHseChB7yCeXY9iKv8h5OJgu8TAApxWqLsyyUJL80+5WCKVJRJzVfnWBB3kzKFw== X-Received: by 2002:a05:600c:2297:: with SMTP id 23mr48021521wmf.47.1564430895662; Mon, 29 Jul 2019 13:08:15 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id b15sm78135700wrt.77.2019.07.29.13.08.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:15 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:15 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:57 GMT Message-Id: <3f862bf87845899852504158113cdd9143820a09.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 21/23] .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 Mon Jul 29 20:08: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: 11064487 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 C0C771823 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B27F628508 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C2F6285A5; Mon, 29 Jul 2019 20:08: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 497AC285A5 for ; Mon, 29 Jul 2019 20:08:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730217AbfG2UI3 (ORCPT ); Mon, 29 Jul 2019 16:08:29 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:54078 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730306AbfG2UIS (ORCPT ); Mon, 29 Jul 2019 16:08:18 -0400 Received: by mail-wm1-f65.google.com with SMTP id x15so54990721wmj.3 for ; Mon, 29 Jul 2019 13:08: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=T5sC/K2nocoacN82eqyh9pXAZYpl+oGpqVWb7MKvpJg=; b=mEOX/H938fS9zpuoIRCo1vf2NEO7XkoJ96a6ZIyux5IH0pKsBN18/Jqx9SJxaWD2By Ggu20DYPHUExnrRUG/1PFahUB0KBT8sLIdtdZxatiW+TaM1vOZFzkQZEeD3ZW6by4Iwy RIPu8G9MqM+tsO3pXtTKM0BXXn8OcPzyQkdSPPZosS2hd+hnOEAZFGtph1FzXGKwQauj YAyCvVpGEXOuATMIyj8bPejDzcNtrIj0Qm79cHgCmiLgojZ762ovBcfReaBa0FNilQda wD720PbfMCmOLDZFtPsX8mpbPlMOZWR6Y6cxfYDC6+0dr1A0Egnk1HqKg7yUDB9yu46s u4RA== 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=aVZ1ACmPYXNFolcXVRA1OBDlOEi5m3zHjv02+ivUyNDZt3wN3i0F3hbkZ77kgoclLj NWPX4NOQLNK7FUWlTpWUS0SsoAadeLIq1D5PKlFmd58Ya+q1OotReyUPwBCQ0Qh8dOSE h/ENUOjgAIN0Um6hFJRrvKC31y/Bn9dzmkqsJ9pLXIN2A+glLMZSGroksHufbpQxeHfI drKMOmPPc+EBGQsNaiBQI6QX9eFTxQid89LIyNmkU4Sq/Lf2a5f5NhSDSdPwiAUMsQQU tI9LigWRkG38lBJeG605aVzsuGrIPDxm/1hzvtUN9mTN8FtvXhxoytFVaDdMX5STPdiA 0dPA== X-Gm-Message-State: APjAAAU7o68VVwzKTDta8dxRLmOJrXJeBDOfO5jhuBK989U8SeZxNdYq 6QFnCYMF06FNRov2gsYhPVUe7+Wn X-Google-Smtp-Source: APXvYqxExHdYc7hEznxAl227aykFa+HPBUbn69uxmp/y/MFfxRsNV+geduG9XhJEo1c7r4z1rM6Rxg== X-Received: by 2002:a1c:e109:: with SMTP id y9mr65068008wmg.35.1564430896369; Mon, 29 Jul 2019 13:08:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n2sm42556958wmi.38.2019.07.29.13.08.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:16 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:16 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:58 GMT Message-Id: In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 22/23] 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 Mon Jul 29 20:08: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: 11064481 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 63E88912 for ; Mon, 29 Jul 2019 20:08:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 55B1928508 for ; Mon, 29 Jul 2019 20:08:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DD7D286A1; Mon, 29 Jul 2019 20:08: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 E0CB028508 for ; Mon, 29 Jul 2019 20:08:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730346AbfG2UI1 (ORCPT ); Mon, 29 Jul 2019 16:08:27 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:50195 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730326AbfG2UIS (ORCPT ); Mon, 29 Jul 2019 16:08:18 -0400 Received: by mail-wm1-f65.google.com with SMTP id v15so54998512wml.0 for ; Mon, 29 Jul 2019 13:08: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=dwc/zGSxRcPU3dljP2foMBuAxgqtwfSmQIQtrirkuLKY/ppkE+d1eJuYQSEUpSBLC6 RGJy2j7TyvLcryWVOvYrlAnz4Sa+FPt3QpWgaQD9BfGx1X9eyhUrWKnQcre5d8J42qaK rzw8bO3b7KfYYHTNAPjriu/VghHGHu3ILjz+in8Gb/NejJ1FrApXW5iU1SFPKnI28xLa 1MNBlJSxQ22E5da+qozCOgTB6/CZV9rtuVFkUyZEmCNZwXo0qhSjci1uJczqyfeKSXtG I2lWLttUszi3rhvlq+l6kzVRNGqTt0GoK2Zk/4almfWl1ABcSGz2/k7E5VKGucn0m0Ho 1K6g== 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=Phqc6ZSs+nbgj8BDC80xWeQmmL/G9a41rMsXuFVPc7MSfg3t05/I3JpP/4tpoR50iS Podyebk4wnIK6GjOAa4Qt9eoytkGBdaacueHjeAjasYatU3oEU4VvKodypQg193AW409 3UN+7IFUEpwlJtbv8fpmMpSwi0N2MvL/tLZREeE8kRmdoySBTXudRRi7G20/6x/cYA2B ZMUfMw8mIog2jrWU8TOHW73od3FtXeZiwx3cn2u5yXx4qBAv1Wq0pDZMEXp3kYVj85k/ UYJbRZV4cYS+I/5CScTFqU6FtnxJJ8s9n16zO82HoTPvNB8irHL+ju3JQOdrH+rVOKQQ qVxg== X-Gm-Message-State: APjAAAVNPKEMgnHvYvH8Xs77OZFajSEaQB0OuGezxPby24VZgCO8gjbD Ug/AhC4tH4Yp24xQliqklywcN0VA X-Google-Smtp-Source: APXvYqyHtLJpHhs6P3xtWGt5sVKXjWxSxuLJkDB4bQc4GCRVLlG++XypmAdoQt7IAWJnKjr5TGuKbw== X-Received: by 2002:a7b:c7c2:: with SMTP id z2mr93278676wmk.147.1564430897134; Mon, 29 Jul 2019 13:08:17 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id 18sm52685426wmg.43.2019.07.29.13.08.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jul 2019 13:08:16 -0700 (PDT) Date: Mon, 29 Jul 2019 13:08:16 -0700 (PDT) X-Google-Original-Date: Mon, 29 Jul 2019 20:07:59 GMT Message-Id: <6452dc11bc5f715455318917525e2217ecc99232.1564430879.git.gitgitgadget@gmail.com> In-Reply-To: References: From: "Johannes Schindelin via GitGitGadget" Subject: [PATCH v2 23/23] 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);