From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 6970D1A1E2A for ; Thu, 20 Oct 2016 02:07:41 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP; 20 Oct 2016 02:07:41 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,518,1473145200"; d="scan'208";a="891977239" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga003.jf.intel.com with ESMTP; 20 Oct 2016 02:07:40 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.248.2; Thu, 20 Oct 2016 02:07:39 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.209]) with mapi id 14.03.0248.002; Thu, 20 Oct 2016 17:07:39 +0800 From: "Gao, Liming" To: Cinnamon Shia , "edk2-devel@lists.01.org" CC: "Ni, Ruiyu" Thread-Topic: [edk2] [PATCH] edksetup.bat: Support --nt32 X64 Thread-Index: AQHSKcHKwz1SpsfxGkKqrER+YDbTy6CxDzag Date: Thu, 20 Oct 2016 09:07:38 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14B4972A4@shsmsx102.ccr.corp.intel.com> References: <20161019043136.14800-1-cinnamon.shia@hpe.com> In-Reply-To: <20161019043136.14800-1-cinnamon.shia@hpe.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] edksetup.bat: Support --nt32 X64 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2016 09:07:41 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of > Cinnamon Shia > Sent: Wednesday, October 19, 2016 12:32 PM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Gao, Liming > Subject: [edk2] [PATCH] edksetup.bat: Support --nt32 X64 >=20 > Support --nt32 X64 for building 64-bit NT32. > For setting up Windows environment variables requited by NT32, follow the > same approach as Edk2Setup.bat by using the get_vsvars.bat and > SetVisualStudio.bat. >=20 > Sync the help text of NT32 with Edk2Setup.bat. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Cinnamon Shia > --- > BaseTools/toolsetup.bat | 4 +++ > edksetup.bat | 71 +++++++++++++++++--------------------------= ------ > 2 files changed, 29 insertions(+), 46 deletions(-) >=20 > diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat > index 21f5b76..17b7239 100755 > --- a/BaseTools/toolsetup.bat > +++ b/BaseTools/toolsetup.bat > @@ -4,6 +4,7 @@ > @REM if the file is not executed within a WORKSPACE\BaseTools folder. > @REM > @REM Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<= BR> > +@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> @REM > @REM This program and the accompanying materials are licensed and made > available > @REM under the terms and conditions of the BSD License which > accompanies this > @@ -33,6 +34,9 @@ if /I "%1"=3D=3D"/?" goto Usage > :loop > if "%1"=3D=3D"" goto setup_workspace > if /I "%1"=3D=3D"--nt32" ( > + if /I "%2" =3D=3D "X64" ( > + shift > + ) > @REM Ignore --nt32 flag > shift > goto loop > diff --git a/edksetup.bat b/edksetup.bat > index f066d86..6c8c0aa 100755 > --- a/edksetup.bat > +++ b/edksetup.bat > @@ -2,6 +2,7 @@ > @REM Windows batch file to setup a WORKSPACE environment > @REM > @REM Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<= BR> > +@REM (C) Copyright 2016 Hewlett Packard Enterprise Development LP
> @REM This program and the accompanying materials > @REM are licensed and made available under the terms and conditions of > the BSD License > @REM which accompanies this distribution. The full text of the license = may > be found at > @@ -56,49 +57,6 @@ if /I "%1"=3D=3D"/h" goto Usage > if /I "%1"=3D=3D"/?" goto Usage > if /I "%1"=3D=3D"/help" goto Usage >=20 > -if /I not "%1"=3D=3D"--nt32" goto no_nt32 > - > -@REM Flag, --nt32 is set > -@REM The Nt32 Emluation Platform requires Microsoft Libraries > -@REM and headers to interface with Windows. > - > -if not defined VCINSTALLDIR ( > - if defined VS140COMNTOOLS ( > - call "%VS140COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS120COMNTOOLS ( > - call "%VS120COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS110COMNTOOLS ( > - call "%VS110COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS100COMNTOOLS ( > - call "%VS100COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS90COMNTOOLS ( > - call "%VS90COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS80COMNTOOLS ( > - call "%VS80COMNTOOLS%\vsvars32.bat" > - ) else ( > - if defined VS71COMNTOOLS ( > - call "%VS71COMNTOOLS%\vsvars32.bat" > - ) else ( > - echo. > - echo !!! WARNING !!! Cannot find Visual Studio !!! > - echo. > - ) > - ) > - ) > - ) > - ) > - ) > - ) > -) > -shift > - > -:no_nt32 > - > if /I "%1"=3D=3D"NewBuild" shift > if not defined EDK_TOOLS_PATH ( > if exist %WORKSPACE%\BaseTools ( > @@ -108,7 +66,7 @@ if not defined EDK_TOOLS_PATH ( > for %%i IN (%PACKAGES_PATH%) DO ( > if exist %%~fi\BaseTools ( > set EDK_TOOLS_PATH=3D%%~fi\BaseTools > - goto checkBaseTools > + goto checkNt32Flag > ) > ) > ) else ( > @@ -121,6 +79,19 @@ if not defined EDK_TOOLS_PATH ( > ) > if exist %EDK_TOOLS_PATH%\Source set > BASE_TOOLS_PATH=3D%EDK_TOOLS_PATH% >=20 > +:checkNt32Flag > +@REM The Nt32 Emluation Platform requires Microsoft Libraries > +@REM and headers to interface with Windows. > +if /I "%1"=3D=3D"--nt32" ( > + if /I "%2"=3D=3D"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 %* > @@ -173,8 +144,16 @@ if "%1"=3D=3D"" goto end >=20 > :Usage > @echo. > - @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32] > [Reconfig]" > - @echo --nt32 Call vsvars32.bat for NT32 platform build= . > + @echo Usage: "%0 [-h | -help | --help | /h | /help | /?] [--nt32 [X64= ]] > [Reconfig]" > + @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 th= e > + @echo Nt32Pkg/Nt32Pkg.dsc system emulator. > + @echo If the X64 argument is set, and a compile= r tool chain is > + @echo not available, attempt to set up a tool c= hain that will > + @echo create X64 binaries. Setting these two op= tions have the > + @echo potential side effect of changing tool ch= ains used for a > + @echo rebuild. > @echo. > @echo Reconfig Reinstall target.txt, tools_def.txt and b= uild_rule.txt. > @echo. > -- > 2.10.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel