[PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0

[PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0

[Hao Wu]

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

Re: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0

[Zhu, Yonghong]

Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

Best Regards,
Zhu Yonghong


-----Original Message-----
From: Wu, Hao A 
Sent: Wednesday, March 01, 2017 9:19 PM
To: edk2-devel@lists.01.org
Cc: Wu, Hao A <hao.a.wu@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
Subject: [PATCH] BaseTools/Source/C/Makefiles: Fix NmakeSubdirs.bat always return 0

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