public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Hao Wu <hao.a.wu@intel.com>
To: edk2-devel@lists.01.org
Cc: Hao Wu <hao.a.wu@intel.com>, Liming Gao <liming.gao@intel.com>,
	Yonghong Zhu <yonghong.zhu@intel.com>
Subject: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0
Date: Wed,  1 Mar 2017 21:19:12 +0800	[thread overview]
Message-ID: <1488374352-12508-1-git-send-email-hao.a.wu@intel.com> (raw)

In batch script file NmakeSubdirs.bat, the value changes made to the
variable 'TOOL_ERROR' within the 'setlocal...endlocal' block will not be
reflected 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 <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
---
 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/Source/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 reserved.<BR>
 @REM # This program and the accompanying materials
 @REM # are licensed and made available under the terms and conditions of the BSD License
 @REM # which accompanies this distribution.    The full text of the license may be found at
@@ -12,8 +12,8 @@
 @REM # 
 
 @echo off
-@set TOOL_ERROR=0
 setlocal
+set TOOL_ERROR=0
 SET NMAKE_COMMAND=%1
 SHIFT
 
@@ -39,7 +39,6 @@ goto exit
 :error
 popd
 set /A TOOL_ERROR=%TOOL_ERROR%+%ERRORLEVEL%
-ENDLOCAL
 ECHO Error while making %1!
 VERIFY OTHER 2>NUL
 
-- 
1.9.5.msysgit.0



             reply	other threads:[~2017-03-01 13:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-01 13:19 Hao Wu [this message]
2017-03-02  1:27 ` [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0 Zhu, Yonghong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1488374352-12508-1-git-send-email-hao.a.wu@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox