From mboxrd@z Thu Jan 1 00:00:00 1970 From: Philip Oakley Subject: [PATCH 11/17] engine.pl: delete the captured stderr file if empty Date: Thu, 25 Jun 2015 01:03:47 +0100 Message-ID: <1435190633-2208-12-git-send-email-philipoakley@iee.org> References: <1435190633-2208-1-git-send-email-philipoakley@iee.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: MsysGitList , Philip Oakley To: GitList X-From: msysgit+bncBDSOTWHYX4PBBAUKVWWAKGQEAT7SHKI@googlegroups.com Thu Jun 25 02:02:21 2015 Return-path: Envelope-to: gcvm-msysgit@m.gmane.org Received: from mail-wi0-f185.google.com ([209.85.212.185]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Z7ucN-0001Kd-SB for gcvm-msysgit@m.gmane.org; Thu, 25 Jun 2015 02:02:11 +0200 Received: by wibbw19 with SMTP id bw19sf18076810wib.0 for ; Wed, 24 Jun 2015 17:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20120806; h=mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :content-type:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive:sender :list-subscribe:list-unsubscribe; bh=HBnVpo3eQlivI1MVX77U6iCfCHVUY2PVt4cqrf23znk=; b=pF5mAQ/Y5RN2zKoojX5qdvncPDTukqDMUv4AMXTUdQ7D2gr2Hi+0j2rhWopG3oiBeR Y+mutRMwE6tX3L3wb1vIkM9UPJQDgCNWSIbyhlU4ire7gP4PbdEoTpt237LSGqi+1vxG 2bovjHfBUsR7+FP/38KaA/fNnYuvGwA3CSDu8vKjNxQPujOSxCLJYDSQF50nCfz3fVU7 nVBTSihw5gocCaCPbHIweTFwh8ihkv10CPfSbjitK0QDfLqHkrNIDfwNYWNEPvYIJDk4 t/der0ngj/2B3nZD1rPk/8jRMmXrHre6tvcLac5LoZfg22gp7vi1znnVYTa6WmOIOL1D BznQ== X-Received: by 10.152.179.161 with SMTP id dh1mr561397lac.38.1435190531588; Wed, 24 Jun 2015 17:02:11 -0700 (PDT) X-BeenThere: msysgit@googlegroups.com Received: by 10.152.9.200 with SMTP id c8ls285496lab.81.gmail; Wed, 24 Jun 2015 17:02:10 -0700 (PDT) X-Received: by 10.152.22.71 with SMTP id b7mr37730782laf.3.1435190530336; Wed, 24 Jun 2015 17:02:10 -0700 (PDT) Received: from out1.ip01ir2.opaltelecom.net (out1.ip01ir2.opaltelecom.net. [62.24.128.237]) by gmr-mx.google.com with ESMTP id da3si4921wib.1.2015.06.24.17.02.10 for ; Wed, 24 Jun 2015 17:02:10 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning philipoakley@iee.org does not designate 62.24.128.237 as permitted sender) client-ip=62.24.128.237; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C1DwCSRItVPCWpEVxbgxFUX4ZMgViwQIYShXoEAgKBTE0BAQEBAQEHAQEBAUE/QQWDXQEBBFYjEAhJOQoUBhOIM81qASuQUAeEKwWUBYRYiHWWPIEJgxg9MYJIAQEB X-IPAS-Result: A2C1DwCSRItVPCWpEVxbgxFUX4ZMgViwQIYShXoEAgKBTE0BAQEBAQEHAQEBAUE/QQWDXQEBBFYjEAhJOQoUBhOIM81qASuQUAeEKwWUBYRYiHWWPIEJgxg9MYJIAQEB X-IronPort-AV: E=Sophos;i="5.13,673,1427756400"; d="scan'208";a="784366778" Received: from host-92-17-169-37.as13285.net (HELO localhost) ([92.17.169.37]) by out1.ip01ir2.opaltelecom.net with ESMTP; 25 Jun 2015 01:01:58 +0100 X-Mailer: git-send-email 2.3.1 In-Reply-To: <1435190633-2208-1-git-send-email-philipoakley@iee.org> X-Original-Sender: philipoakley@iee.org X-Original-Authentication-Results: gmr-mx.google.com; spf=softfail (google.com: domain of transitioning philipoakley@iee.org does not designate 62.24.128.237 as permitted sender) smtp.mail=philipoakley@iee.org Precedence: list Mailing-list: list msysgit@googlegroups.com; contact msysgit+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: msysgit@googlegroups.com X-Google-Group-Id: 152234828034 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Archived-At: Keep the build clean of extraneous files if it is indeed clean. Otherwise leave the msvc-build-makedryerrors.txt file both as a flag for any CI system or for manual debugging. 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 --- contrib/buildsystems/engine.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl index 7eba870..27884f7 100644 --- a/contrib/buildsystems/engine.pl +++ b/contrib/buildsystems/engine.pl @@ -77,6 +77,8 @@ EOM my $ErrsFile = "msvc-build-makedryerrors.txt"; @makedry = `cd $git_dir && make -n MSVC=1 NO_PERL=1 V=1 2>$ErrsFile` if !@makedry; +# test for an empty Errors file and remove it +for ($ErrsFile) {unlink $_ if (-f $_) && (!-s $_);} # Parse the make output into usable info parseMakeOutput(); -- 2.3.1 -- -- *** Please reply-to-all at all times *** *** (do not pretend to know who is subscribed and who is not) *** *** Please avoid top-posting. *** The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free. You received this message because you are subscribed to the Google Groups "msysGit" group. To post to this group, send email to msysgit@googlegroups.com To unsubscribe from this group, send email to msysgit+unsubscribe@googlegroups.com For more options, and view previous threads, visit this group at http://groups.google.com/group/msysgit?hl=en_US?hl=en --- You received this message because you are subscribed to the Google Groups "Git for Windows" group. To unsubscribe from this group and stop receiving emails from it, send an email to msysgit+unsubscribe@googlegroups.com. For more options, visit https://groups.google.com/d/optout.