From: "Dandan Bi" <dandan.bi@intel.com>
To: devel@edk2.groups.io
Cc: Bob Feng <bob.c.feng@intel.com>, Liming Gao <liming.gao@intel.com>
Subject: [patch 1/2] Edk2Setup: Remove nt32 related flag in bat files
Date: Sun, 23 Jun 2019 21:58:31 +0800 [thread overview]
Message-ID: <20190623135832.48300-2-dandan.bi@intel.com> (raw)
In-Reply-To: <20190623135832.48300-1-dandan.bi@intel.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1693
NT32Pkg has been removed, remove nt32 related
flags in bat files.
Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Dandan Bi <dandan.bi@intel.com>
---
BaseTools/toolsetup.bat | 8 --------
edksetup.bat | 23 +----------------------
2 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 23dae40..999f3b3 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -24,18 +24,10 @@ if /I "%1"=="/help" goto Usage
if /I "%1"=="/?" goto Usage
:loop
if "%1"=="" goto setup_workspace
- if /I "%1"=="--nt32" (
- if /I "%2" == "X64" (
- shift
- )
- @REM Ignore --nt32 flag
- shift
- goto loop
- )
if /I "%1"=="Reconfig" (
shift
set RECONFIG=TRUE
goto loop
)
diff --git a/edksetup.bat b/edksetup.bat
index 662ffc0..d607e2e 100755
--- a/edksetup.bat
+++ b/edksetup.bat
@@ -81,22 +81,10 @@ if exist %EDK_BASETOOLS% (
)
:checkNt32Flag
if exist %EDK_TOOLS_PATH%\Source set BASE_TOOLS_PATH=%EDK_TOOLS_PATH%
-@REM The Nt32 Emulation Platform requires Microsoft Libraries
-@REM and headers to interface with Windows.
-if /I "%1"=="--nt32" (
- if /I "%2"=="X64" (
- shift
- call "%BASE_TOOLS_PATH%\Scripts\SetVisualStudio.bat"
- ) else (
- call "%BASE_TOOLS_PATH%\get_vsvars.bat"
- )
- shift
-)
-
:checkBaseTools
IF NOT EXIST "%EDK_TOOLS_PATH%\toolsetup.bat" goto BadBaseTools
call %EDK_TOOLS_PATH%\toolsetup.bat %*
if /I "%1"=="Reconfig" shift
goto check_NASM
@@ -147,20 +135,11 @@ if /I "%1"=="Rebuild" shift
if /I "%1"=="ForceRebuild" shift
if "%1"=="" goto end
:Usage
@echo.
- @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64]] [Reconfig] [Rebuild] [ForceRebuild]"
- @echo --nt32 [X64] If a compiler tool chain is not available in the
- @echo environment, call a script to attempt to set one up.
- @echo This flag is only required if building the
- @echo Nt32Pkg/Nt32Pkg.dsc system emulator.
- @echo If the X64 argument is set, and a compiler tool chain is
- @echo not available, attempt to set up a tool chain that will
- @echo create X64 binaries. Setting these two options have the
- @echo potential side effect of changing tool chains used for a
- @echo rebuild.
+ @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [Reconfig] [Rebuild] [ForceRebuild]"
@echo.
@echo Reconfig Reinstall target.txt, tools_def.txt and build_rule.txt.
@echo Rebuild Perform incremental rebuild of BaseTools binaries.
@echo ForceRebuild Force a full rebuild of BaseTools binaries.
@echo.
--
1.9.5.msysgit.1
next prev parent reply other threads:[~2019-06-23 13:58 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-23 13:58 [patch 0/2] Edk2Setup: Enahnce edk2setup batch files Dandan Bi
2019-06-23 13:58 ` Dandan Bi [this message]
2019-06-23 13:58 ` [patch 2/2] Edk2Setup: Support different VS tool chain setup Dandan Bi
2019-06-27 9:38 ` [patch 0/2] Edk2Setup: Enahnce edk2setup batch files Liming Gao
2019-06-27 11:56 ` Bob Feng
2019-06-27 14:47 ` Liming Gao
2019-06-27 15:14 ` Bob Feng
2019-06-27 15:16 ` Liming Gao
2019-06-28 1:10 ` Dandan Bi
2019-06-28 1:11 ` Liming Gao
2019-07-03 12:23 ` Bob Feng
2019-07-04 0:54 ` Dandan Bi
2019-07-04 1:07 ` Bob Feng
[not found] ` <15AC379CC0BB042B.14856@groups.io>
2019-06-28 7:09 ` [edk2-devel] " Liming Gao
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=20190623135832.48300-2-dandan.bi@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