[edk2] [Patch] Edk2: Update Edk2Setup.bat

[Liming Gao]

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 <***@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=

[Richard Mahn]

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 <***@intel.com>
To: edk2-***@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 <***@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=

[Liming Gao]

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 <***@intel.com>
---
Edk2Setup.bat | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index cadc271..0aa786d 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_X64=
@set BUILD_TOOLS_WITH=
@set LOCATION=
@set REBUILD_TOOLS=
@set SVN_PULL=
@set SRC_CONF=
@@ -178,11 +178,11 @@
@set BUILD_TOOLS_WITH=Latest
)
@REM This option will try to set the environment for building the Nt32Pkg/Nt32Pkg; on a 64-bit
@REM Windows OS
@if /I "%2"=="X64" (
- @set NT32_64=TRUE
+ @set NT32_X64=TRUE
@shift
)
@shift
@goto parse_cmd_line
)
@@ -375,11 +375,10 @@
@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 "%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=

[Ni, Ruiyu]

-----Original Message-----
Sent: Thursday, May 21, 2015 8:59 AM
Subject: [edk2] [PATCH v2] 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
---
Edk2Setup.bat | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Edk2Setup.bat b/Edk2Setup.bat
index cadc271..0aa786d 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 BUILD_TOOLS_WITH=
@set LOCATION=
@set REBUILD_TOOLS=
@set SVN_PULL=
@set SRC_CONF=
@@ -178,11 +178,11 @@
@set BUILD_TOOLS_WITH=Latest
)
@REM This option will try to set the environment for building the
Nt32Pkg/Nt32Pkg; on a 64-bit
@REM Windows OS
@if /I "%2"=="X64" (
@shift
)
@shift
@goto parse_cmd_line
)
@@ -375,11 +375,10 @@
@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"
)
@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 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 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
https://lists.sourceforge.net/lists/listinfo/edk2-devel

------------------------------------------------------------------------------