From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: hao.a.wu@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Wed, 07 Aug 2019 22:55:29 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Aug 2019 22:55:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,360,1559545200"; d="scan'208";a="182496729" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by FMSMGA003.fm.intel.com with ESMTP; 07 Aug 2019 22:55:28 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 7 Aug 2019 22:55:28 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 7 Aug 2019 22:55:28 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.80]) with mapi id 14.03.0439.000; Thu, 8 Aug 2019 13:55:26 +0800 From: "Wu, Hao A" To: "devel@edk2.groups.io" , "Kinney, Michael D" CC: "Justen, Jordan L" , Andrew Fish , "Ni, Ray" Subject: Re: [edk2-devel] [Patch V2 2/3] EmulatorPkg: Remove UNIX_SEC_BUILD/WIN_SEC_BUILD Thread-Topic: [edk2-devel] [Patch V2 2/3] EmulatorPkg: Remove UNIX_SEC_BUILD/WIN_SEC_BUILD Thread-Index: AQHVTZCpqlbTZUD+YESeWr3mj4h6K6bwwHHw Date: Thu, 8 Aug 2019 05:55:25 +0000 Message-ID: References: <20190808022556.18828-1-michael.d.kinney@intel.com> <20190808022556.18828-3-michael.d.kinney@intel.com> In-Reply-To: <20190808022556.18828-3-michael.d.kinney@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: hao.a.wu@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Michael D Kinney > Sent: Thursday, August 08, 2019 10:26 AM > To: devel@edk2.groups.io > Cc: Justen, Jordan L; Andrew Fish; Ni, Ray > Subject: [edk2-devel] [Patch V2 2/3] EmulatorPkg: Remove > UNIX_SEC_BUILD/WIN_SEC_BUILD >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2055 >=20 > Remove the use of the defines UNIX_SEC_BUILD and > WIN_SEC_BUILD. This simplifies the build command > for the EmulatorPkg. Instead, use !if statements > in the DSC file using $(ARCH) and $(FAMILY) to > determine if the build is for a Windows or POSIX > environment. >=20 > The Readme.md, BAT, and sh files are also updated > to remove the use of these defines. >=20 > Cc: Jordan Justen > Cc: Andrew Fish > Cc: Ray Ni > Signed-off-by: Michael D Kinney > --- > EmulatorPkg/EmulatorPkg.dsc | 26 +++++++++++++------------- > EmulatorPkg/Readme.md | 8 ++++---- > EmulatorPkg/Win/VS2017/BuildVS.bat | 2 +- > EmulatorPkg/build.sh | 8 ++++---- > 4 files changed, 22 insertions(+), 22 deletions(-) >=20 > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index ea8b6ce76e..153da464f1 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -4,7 +4,7 @@ > # The Emulation Platform can be used to debug individual modules, prior= to > creating > # a real platform. This also provides an example for how an DSC is crea= ted. > # > -# Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. > +# Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved. > # Portions copyright (c) 2010 - 2011, Apple Inc. All rights reserved. > # > # SPDX-License-Identifier: BSD-2-Clause-Patent > @@ -236,18 +236,18 @@ [PcdsDynamicHii.common.DEFAULT] >=20 > gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlo > balVariableGuid|0x0|10 >=20 > [Components] > -!ifdef $(UNIX_SEC_BUILD) > - ## > - # Emulator, OS POSIX application > - ## > - EmulatorPkg/Unix/Host/Host.inf > -!endif > - > -!ifdef $(WIN_SEC_BUILD) > - ## > - # Emulator, OS WIN application > - ## > - EmulatorPkg/Win/Host/WinHost.inf > +!if "IA32" in $(ARCH) || "X64" in $(ARCH) > + !if "MSFT" in $(FAMILY) > + ## > + # Emulator, OS WIN application > + ## > + EmulatorPkg/Win/Host/WinHost.inf > + !else > + ## > + # Emulator, OS POSIX application > + ## > + EmulatorPkg/Unix/Host/Host.inf > + !endif > !endif >=20 > !ifndef $(SKIP_MAIN_BUILD) > diff --git a/EmulatorPkg/Readme.md b/EmulatorPkg/Readme.md > index 461975e859..5ea61ca7ab 100644 > --- a/EmulatorPkg/Readme.md > +++ b/EmulatorPkg/Readme.md > @@ -21,19 +21,19 @@ > https://github.com/tianocore/tianocore.github.io/wiki/EmulatorPkg > **You can use the following command to build.** > * 32bit emulator in Windows: >=20 > - `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 -D WIN_SEC_BUILD -a > IA32` > + `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 -a IA32` >=20 > * 64bit emulator in Windows: >=20 > - `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 -D WIN_SEC_BUILD -a > X64` > + `build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 -a X64` >=20 > * 32bit emulator in Linux: >=20 > - `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -D UNIX_SEC_BUILD -a > IA32` > + `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a IA32` >=20 > * 64bit emulator in Linux: >=20 > - `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -D UNIX_SEC_BUILD -a > X64` > + `build -p EmulatorPkg\EmulatorPkg.dsc -t GCC5 -a X64` >=20 > **You can start/run the emulator using the following command:** > * 32bit emulator in Windows: > diff --git a/EmulatorPkg/Win/VS2017/BuildVS.bat > b/EmulatorPkg/Win/VS2017/BuildVS.bat > index 83aebc77dc..6fcf40cc0a 100644 > --- a/EmulatorPkg/Win/VS2017/BuildVS.bat > +++ b/EmulatorPkg/Win/VS2017/BuildVS.bat > @@ -1,3 +1,3 @@ > cd ../../../ > @call edksetup.bat > -build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 -D WIN_SEC_BUILD %* > +build -p EmulatorPkg\EmulatorPkg.dsc -t VS2017 %* > diff --git a/EmulatorPkg/build.sh b/EmulatorPkg/build.sh > index 2dab035ed5..60056e1b6c 100755 > --- a/EmulatorPkg/build.sh > +++ b/EmulatorPkg/build.sh > @@ -233,13 +233,13 @@ fi >=20 > case $CLEAN_TYPE in > clean) > - build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $HOST_TOOLS -D UNIX_SEC_BUILD -n 3 clean > + build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $HOST_TOOLS -n 3 clean > build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $TARGET_TOOLS -n 3 clean > exit $? > ;; > cleanall) > make -C $WORKSPACE/BaseTools clean > - build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $HOST_TOOLS -D UNIX_SEC_BUILD -n 3 clean > + build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $HOST_TOOLS -n 3 clean > build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc -a $PROCESSOR -b > $BUILDTARGET -t $TARGET_TOOLS -n 3 clean > build -p $WORKSPACE/ShellPkg/ShellPkg.dsc -a IA32 -b $BUILDTARGET -= t > $TARGET_TOOLS -n 3 clean > exit $? > @@ -251,9 +251,9 @@ esac > # Build the edk2 EmulatorPkg > # > if [[ $HOST_TOOLS =3D=3D $TARGET_TOOLS ]]; then > - build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a > $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS -D BUILD_$ARCH_SIZE -D > UNIX_SEC_BUILD $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n > 3 > + build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a > $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS -D BUILD_$ARCH_SIZE > $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 > else > - build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a > $PROCESSOR -b $BUILDTARGET -t $HOST_TOOLS -D BUILD_$ARCH_SIZE -D > UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 modules > + build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a > $PROCESSOR -b $BUILDTARGET -t $HOST_TOOLS -D BUILD_$ARCH_SIZE -D > SKIP_MAIN_BUILD -n 3 modules Reviewed-by: Hao A Wu Best Regards, Hao Wu > build -p $WORKSPACE/EmulatorPkg/EmulatorPkg.dsc $BUILD_OPTIONS -a > $PROCESSOR -b $BUILDTARGET -t $TARGET_TOOLS -D BUILD_$ARCH_SIZE > $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 > cp > "$BUILD_OUTPUT_DIR/${BUILDTARGET}_$HOST_TOOLS/$PROCESSOR/Host" > $BUILD_ROOT_ARCH > fi > -- > 2.21.0.windows.1 >=20 >=20 >=20