From 541d6017e2d1f3a3a9e016c0ce03704e57f7ceb1 Mon Sep 17 00:00:00 2001 From: Dandan Bi Date: Thu, 6 Jun 2019 10:48:50 +0800 Subject: [PATCH] Edk2: Remove nt32 related flag in bat files REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1693 NT32Pkg has been removed, remove nt32 related flags in bat files. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Dandan Bi Reviewed-by: Bob Feng Reviewed-by: Liming Gao --- 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 23dae40b20..999f3b3984 100755 --- a/BaseTools/toolsetup.bat +++ b/BaseTools/toolsetup.bat @@ -26,14 +26,6 @@ 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 diff --git a/edksetup.bat b/edksetup.bat index 662ffc0060..d607e2ebea 100755 --- a/edksetup.bat +++ b/edksetup.bat @@ -83,18 +83,6 @@ 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 %* @@ -149,16 +137,7 @@ 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. -- 2.39.2