Note that Edk2Setup.bat in the change calls 
"%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat" which inspects NT32_X64 
instead of NT32_64 to execute the desired subset of functionality.
      From: Liming Gao <liming....@intel.com>
 To: edk2-devel@lists.sourceforge.net 
 Sent: Tuesday, May 19, 2015 1:31 AM
 Subject: [edk2] [Patch] Edk2: Update Edk2Setup.bat
   
Fix the issue when configure X64 NT32, replace NT32_X64 by NT32_64 env.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
 Edk2Setup.bat | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index cadc271..759246a 100755
--- a/Edk2Setup.bat
+++ b/Edk2Setup.bat
@@ -49,11 +49,11 @@
 @set SCRIPT_NAME=%0
 @set SCRIPT_VERSION=0.9.2.
 @set SVN_REVISION=$Revision$
 @set RESET_ENVIRONMENT=FALSE
 @set NT32PKG=FALSE
-@set NT32_64=FALSE
+@set NT32_64=
 @set BUILD_TOOLS_WITH=
 @set LOCATION=
 @set REBUILD_TOOLS=
 @set SVN_PULL=
 @set SRC_CONF=
@@ -373,13 +373,12 @@
 @set SRC_CONF=
 
 @REM Set up Visual Studio if required to build the Nt32Pkg/Nt32Pkg.dsc emulator
 @if "%NT32PKG%"=="TRUE" (
    @if not defined VSINSTALLDIR @set "PATH=%ORIGINAL_PATH%"
-    @if not defined NT32_X64 @call "%WORKSPACE%\BaseTools\get_vsvars.bat"
-    @if defined NT32_X64 call 
"%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat"
-    @set NT32_X64=
+    @if not defined NT32_64 @call "%WORKSPACE%\BaseTools\get_vsvars.bat"
+    @if defined NT32_64 call 
"%WORKSPACE%\BaseTools\Scripts\SetVisualStudio.bat"
 )
 @if "%NT32PKG%"=="TRUE" (
    @if not defined VS_PATH set "VS_PATH=%PATH%"
 )
 @if defined VS_PATH @set "PATH=%VS_PATH%"
@@ -445,11 +444,10 @@
 @set SCRIPT_VERSION=
 @set SVN_REVISION=
 @set RESET_ENVIRONMENT=
 @set RECONFIG=
 @set NT32PKG=
-@set NT32_64=
 @set BUILD_TOOLS_WITH=
 @set LOCATION=
 @set REBUILD_TOOLS=
 @set SVN_PULL=
 @set SRC_CONF=
@@ -465,11 +463,10 @@
 @set SCRIPT_VERSION=
 @set SVN_REVISION=
 @set RESET_ENVIRONMENT=
 @set RECONFIG=
 @set NT32PKG=
-@set NT32_64=
 @set BUILD_TOOLS_WITH=
 @set LOCATION=
 @set REBUILD_TOOLS=
 @set SVN_PULL=
 @set SRC_CONF=
-- 
1.9.5.msysgit.0


------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel


  
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud 
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to