From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 088AB821EC for ; Wed, 1 Mar 2017 17:27:31 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Mar 2017 17:27:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,228,1484035200"; d="scan'208";a="939618859" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 01 Mar 2017 17:27:28 -0800 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 1 Mar 2017 17:27:28 -0800 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 1 Mar 2017 17:27:28 -0800 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.20]) by SHSMSX104.ccr.corp.intel.com ([10.239.4.70]) with mapi id 14.03.0248.002; Thu, 2 Mar 2017 09:27:27 +0800 From: "Zhu, Yonghong" To: "Wu, Hao A" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0 Thread-Index: AQHSko58QSa/5INbKU6ZxXgoV9/CrKGAwshQ Date: Thu, 2 Mar 2017 01:27:26 +0000 Message-ID: References: <1488374352-12508-1-git-send-email-hao.a.wu@intel.com> In-Reply-To: <1488374352-12508-1-git-send-email-hao.a.wu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Mar 2017 01:27:31 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Yonghong Zhu Best Regards, Zhu Yonghong -----Original Message----- From: Wu, Hao A=20 Sent: Wednesday, March 01, 2017 9:19 PM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Gao, Liming ; Zhu= , Yonghong Subject: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always = return 0 In batch script file NmakeSubdirs.bat, the value changes made to the variab= le 'TOOL_ERROR' within the 'setlocal...endlocal' block will not be reflecte= d in the return value of the script. A value of 0 will always be returned. = Thus, the script will not reflect the result of the 'nmake' command correctly when building BaseTool source codes. Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu --- BaseTools/Source/C/Makefiles/NmakeSubdirs.bat | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat b/BaseTools/Sour= ce/C/Makefiles/NmakeSubdirs.bat index 4b3edfe..816d4fa 100644 --- a/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat +++ b/BaseTools/Source/C/Makefiles/NmakeSubdirs.bat @@ -1,7 +1,7 @@ @REM ## @file @REM # Makefile @REM # -@REM # Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<= BR> +@REM # Copyright (c) 2007 - 2017, Intel Corporation. All rights=20 +reserved.
@REM # This program and the accompanying materials @REM # are licensed an= d made available under the terms and conditions of the BSD License @REM # which accompanies this distribution. The full text of the licens= e may be found at @@ -12,8 +12,8 @@ @REM #=20 =20 @echo off -@set TOOL_ERROR=3D0 setlocal +set TOOL_ERROR=3D0 SET NMAKE_COMMAND=3D%1 SHIFT =20 @@ -39,7 +39,6 @@ goto exit :error popd set /A TOOL_ERROR=3D%TOOL_ERROR%+%ERRORLEVEL% -ENDLOCAL ECHO Error while making %1! VERIFY OTHER 2>NUL =20 -- 1.9.5.msysgit.0