From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: dandan.bi@intel.com) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Sun, 23 Jun 2019 06:58:52 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Jun 2019 06:58:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,408,1557212400"; d="scan'208";a="166096503" Received: from shwdeopenpsi114.ccr.corp.intel.com ([10.239.157.147]) by orsmga006.jf.intel.com with ESMTP; 23 Jun 2019 06:58:50 -0700 From: "Dandan Bi" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [patch 1/2] Edk2Setup: Remove nt32 related flag in bat files Date: Sun, 23 Jun 2019 21:58:31 +0800 Message-Id: <20190623135832.48300-2-dandan.bi@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190623135832.48300-1-dandan.bi@intel.com> References: <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 Cc: Liming Gao Signed-off-by: Dandan Bi --- 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