From patchwork Thu Jul 18 13:19:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Passaro via GitGitGadget X-Patchwork-Id: 11048961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 762E013BD for ; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6497D28767 for ; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5919128800; Thu, 18 Jul 2019 13:19:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F352F28767 for ; Thu, 18 Jul 2019 13:19:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390501AbfGRNTO (ORCPT ); Thu, 18 Jul 2019 09:19:14 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:35582 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390452AbfGRNTK (ORCPT ); Thu, 18 Jul 2019 09:19:10 -0400 Received: by mail-wr1-f66.google.com with SMTP id y4so28695067wrm.2 for ; Thu, 18 Jul 2019 06:19:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:message-id:in-reply-to:references:from:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=OUw7wM3WNOYiu6Xi2N0y7apcoGabVxzK3EzQKZinpnw=; b=EDnKNX/4nMDERo47Lhk7ciNpBLHd0X/iy0rJH1OThhqiOycIV1hqsyJtBjhmLOYzmW KtOlCcH3eoylJ+qZYUt2506Y7S58JorEbQ2wOYFTMkvveFece0aOYoozxxv4WlH83BYe oj9ZKo7m8fBrNWdcG7x2IYD7MH1diSLA0m+SZgOtm0KneP3HDlwNIG6SoOC2a0aAeoA5 I3eKcz2wM9xl8qZD/YzShn83B3QRroTe4PV6elyAWQrcGQoYcl8agxeiB5dIodmPbTbO 4tKRMyR14fXb7BlTxMPkSIZL6ftBlypDicb+ZCjwdIu+jhf2LkpVJGHecR9srVBQ+yQg km/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:in-reply-to:references:from :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=OUw7wM3WNOYiu6Xi2N0y7apcoGabVxzK3EzQKZinpnw=; b=XdVGRQjSDxjJ06XwGLVk2tqPSLW+3p64HNickdmEbf955MpBQP4mbTvUBXQpGtYIp/ ZBOSlbmreP68bdf1Eqqpz6WBsM/qf3FRgEOknMW1ZSiwEdgwp+ofrQqIx/e4nNIF7qL0 gHhzN5v/cN3ED9NvalnpJLQvrflN3wbHQVPwguJGzhTfF7+3CAuEZ6GUSnbmn5B1qNA7 VkcvS3ezrE2aXT93T3j2CNUkTiHrkv3zVOcCpy1SF7hooUNxVjQ7V4KZAzQBvi2PMl5a SQdwqtWdfOC76PYky7c0Fh9iCyc9RU6M6Cct90iU0horXoehY7FEayg9mLjYdV7/KMGV 8RxA== X-Gm-Message-State: APjAAAWDo8pZV7uidzidSSJ2fZ+0KqTsU9ba7kLk3mGe3MjVId5IUR1g sQ50Pa4lohxSu72CZ78mixEAEYUO X-Google-Smtp-Source: APXvYqxXYye+Z5Ev6NZ2VkYeJuErYzDfwaFVLUtiIajJIxtVlgeXDFMEhA0RB/8OsqFi5rsIY2RxJA== X-Received: by 2002:adf:90e7:: with SMTP id i94mr21185244wri.224.1563455948616; Thu, 18 Jul 2019 06:19:08 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id s10sm21053311wrt.49.2019.07.18.06.19.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jul 2019 06:19:08 -0700 (PDT) Date: Thu, 18 Jul 2019 06:19:08 -0700 (PDT) X-Google-Original-Date: Thu, 18 Jul 2019 13:18:46 GMT Message-Id: In-Reply-To: References: From: "Philip Oakley via GitGitGadget" Subject: [PATCH 11/24] contrib/buildsystems: optionally capture the dry-run in a file Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Junio C Hamano , Philip Oakley Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Philip Oakley Add an option for capturing the output of the make dry-run used in determining the msvc-build structure for easy debugging. You can use the output of `--make-out ` in subsequent runs via the `--in ` option. Signed-off-by: Philip Oakley Signed-off-by: Johannes Schindelin --- contrib/buildsystems/engine.pl | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index de5c0b6b25..732239d817 100755 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -32,6 +32,7 @@ sub showUsage -g --gen Specify the buildsystem generator (default: $gen) Available: $genlist -o --out Specify output directory generation (default: .) + --make-out Write the output of GNU Make into a file -i --in Specify input file, instead of running GNU Make -h,-? --help This help EOM @@ -39,6 +40,7 @@ sub showUsage } # Parse command-line options +my $make_out; while (@ARGV) { my $arg = shift @ARGV; if ("$arg" eq "-h" || "$arg" eq "--help" || "$arg" eq "-?") { @@ -46,6 +48,8 @@ sub showUsage exit(0); } elsif("$arg" eq "--out" || "$arg" eq "-o") { $out_dir = shift @ARGV; + } elsif("$arg" eq "--make-out") { + $make_out = shift @ARGV; } elsif("$arg" eq "--gen" || "$arg" eq "-g") { $gen = shift @ARGV; } elsif("$arg" eq "--in" || "$arg" eq "-i") { @@ -80,6 +84,12 @@ sub showUsage # test for an empty Errors file and remove it unlink $ErrsFile if -f -z $ErrsFile; +if (defined $make_out) { + open OUT, ">" . $make_out; + print OUT @makedry; + close OUT; +} + # Parse the make output into usable info parseMakeOutput();