From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web11.1506.1610701114279435045
 for <devel@edk2.groups.io>;
 Fri, 15 Jan 2021 00:58:36 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <bob.c.feng@intel.com>; Fri, 15 Jan 2021 16:58:26 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: <devel@edk2.groups.io>,
	<matthewfcarlson@gmail.com>
Cc: "'Bob Feng'" <bob.c.feng@intel.com>,
	"'Yuwei Chen'" <yuwei.chen@intel.com>,
	"'Sean Brogan'" <sean.brogan@microsoft.com>,
	"'Michael Kinney'" <michael.d.kinney@intel.com>
References: <20210115021519.1080-1-matthewfcarlson@gmail.com> <20210115021519.1080-2-matthewfcarlson@gmail.com>
In-Reply-To: <20210115021519.1080-2-matthewfcarlson@gmail.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BBVENIIHYzIDEvMV0gQmFzZVRvb2xzOiBVc2UgcGlwIG1vZHVsZSBpZiBhdmFpbGFibGUsIENJIHVzZXMgaXQgYnkgZGVmYXVsdA==?=
Date: Fri, 15 Jan 2021 16:58:29 +0800
Message-ID: <004401d6eb1c$97ecab90$c7c602b0$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQHSFDCxYNRVX6KPutmANjdFQwIvcQGBwhOPqiYAFpA=
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Matthew:
  Can you share the forked repo? I would like to confirm the linux script
file ending in this patch.=20

Thanks
Liming
> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: bounce+27952+70355+4905953+8761045@groups.io
> <bounce+27952+70355+4905953+8761045@groups.io> =B4=FA=B1=ED Matthew
> Carlson
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA1=D4=C215=C8=D5 10:15
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> =B3=AD=CB=CD: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>; Sean
> Brogan <sean.brogan@microsoft.com>; Michael Kinney
> <michael.d.kinney@intel.com>; Matthew Carlson
> <matthewfcarlson@gmail.com>
> =D6=F7=CC=E2: [edk2-devel] [PATCH v3 1/1] BaseTools: Use pip module if a=
vailable,
CI
> uses it by default
>=20
> From: Matthew Carlson <matthewfcarlson@gmail.com>
>=20
> Use the new edk2-basetools pip module.
> Includes a helpful message in setup to let users know which has been
> selected.
>=20
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Sean Brogan <sean.brogan@microsoft.com>
> Cc: Michael Kinney <michael.d.kinney@intel.com>
>=20
> Reviewed-by: Bob Feng <bob.c.feng@intel.com>
>=20
> Signed-off-by: Matthew Carlson <matthewfcarlson@gmail.com>
> ---
>  .pytool/CISettings.py
> |  51 +-
>  BaseTools/BinPipWrappers/PosixLike/AmlToC
> |  14 +
>  BaseTools/BinPipWrappers/PosixLike/BPDG
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/Brotli
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/BrotliCompress
> |  34 ++
>  BaseTools/BinPipWrappers/PosixLike/DevicePath
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/Ecc
> |  13 +
>  BaseTools/BinPipWrappers/PosixLike/EfiRom
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenCrc32
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenDepex
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/GenFds
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/GenFfs
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenFv
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenFw
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/GenSec
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/LzmaCompress
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
> |  19 +
>  BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/Split
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/TargetTool
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/TianoCompress
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/Trim
> |  13 +
>  BaseTools/BinPipWrappers/PosixLike/UPT
> |  12 +
>  BaseTools/BinPipWrappers/PosixLike/VfrCompile
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/VolInfo
> |  29 ++
>  BaseTools/BinPipWrappers/PosixLike/build
> |  12 +
>  BaseTools/{BinWrappers =3D>
> BinPipWrappers}/PosixLike/posix_path_env.yaml             |  21 +-
>  BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat
> |  55 ++
>  BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
> |   1 +
>  BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat
> |   1 +
>  BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/Trim.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/UPT.bat
> |   3 +
>  BaseTools/BinPipWrappers/WindowsLike/build.bat
> |   3 +
>  BaseTools/{BinWrappers =3D>
> BinPipWrappers}/WindowsLike/win_build_tools_path_env.yaml |  21 +-
>  BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> |   1 +
>  BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> |   1 +
>  BaseTools/BuildEnv
> | 548 ++++++++++----------
>  BaseTools/Scripts/PatchCheck.py
> |   1 +
>  BaseTools/Source/Python/README.md
> |  29 ++
>  BaseTools/toolsetup.bat
> |  19 +
>  pip-requirements.txt
> |   1 +
>  56 files changed, 1102 insertions(+), 301 deletions(-)
>=20
> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
> index b337d046ae08..85e70b15dcda 100644
> --- a/.pytool/CISettings.py
> +++ b/.pytool/CISettings.py
> @@ -22,16 +22,24 @@ class Settings(CiBuildSettingsManager,
> UpdateSettingsManager, SetupSettingsManag
>          self.ActualTargets =3D []
>          self.ActualArchitectures =3D []
>          self.ActualToolChainTag =3D ""
> +        self.UseBuiltInBaseTools =3D None
> +        self.ActualScopes =3D None
>=20
>      #
> ##############################################################
> ######################### #
>      #                             Extra CmdLine configuration
> #
>      #
> ##############################################################
> ######################### #
>=20
>      def AddCommandLineOptions(self, parserObj):
> -        pass
> +        group =3D parserObj.add_mutually_exclusive_group()
> +        group.add_argument("-force_piptools", "--fpt",
> dest=3D"force_piptools", action=3D"store_true", default=3DFalse, help=3D=
"Force the
> system to use pip tools")
> +        group.add_argument("-no_piptools", "--npt", dest=3D"no_piptools=
",
> action=3D"store_true", default=3DFalse, help=3D"Force the system to not =
use pip
> tools")
>=20
>      def RetrieveCommandLineOptions(self, args):
> -        pass
> +        super().RetrieveCommandLineOptions(args)
> +        if args.force_piptools:
> +            self.UseBuiltInBaseTools =3D True
> +        if args.no_piptools:
> +            self.UseBuiltInBaseTools =3D False
>=20
>      #
> ##############################################################
> ######################### #
>      #                        Default Support for this Ci Build
> #
> @@ -127,19 +135,38 @@ class Settings(CiBuildSettingsManager,
> UpdateSettingsManager, SetupSettingsManag
>=20
>      def GetActiveScopes(self):
>          ''' return tuple containing scopes that should be active for th=
is
> process '''
> -        scopes =3D ("cibuild", "edk2-build", "host-based-test")
> +        if self.ActualScopes is None:
> +            scopes =3D ("cibuild", "edk2-build", "host-based-test")
>=20
> -        self.ActualToolChainTag =3D
> shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")
> +            self.ActualToolChainTag =3D
> shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")
>=20
> -        if GetHostInfo().os.upper() =3D=3D "LINUX" and
> self.ActualToolChainTag.upper().startswith("GCC"):
> -            if "AARCH64" in self.ActualArchitectures:
> -                scopes +=3D ("gcc_aarch64_linux",)
> -            if "ARM" in self.ActualArchitectures:
> -                scopes +=3D ("gcc_arm_linux",)
> -            if "RISCV64" in self.ActualArchitectures:
> -                scopes +=3D ("gcc_riscv64_unknown",)
> +            is_linux =3D GetHostInfo().os.upper() =3D=3D "LINUX"
>=20
> -        return scopes
> +            if self.UseBuiltInBaseTools is None:
> +                is_linux =3D GetHostInfo().os.upper() =3D=3D "LINUX"
> +                # try and import the pip module for basetools
> +                try:
> +                    import edk2basetools
> +                    self.UseBuiltInBaseTools =3D True
> +                except ImportError:
> +                    self.UseBuiltInBaseTools =3D False
> +                    pass
> +
> +            if self.UseBuiltInBaseTools =3D=3D True:
> +                scopes +=3D ('pipbuild-unix',) if is_linux else
('pipbuild-win',)
> +                logging.warning("Using Pip Tools based BaseTools")
> +            else:
> +                logging.warning("Falling back to using in-tree
> BaseTools")
> +
> +            if is_linux and
> self.ActualToolChainTag.upper().startswith("GCC"):
> +                if "AARCH64" in self.ActualArchitectures:
> +                    scopes +=3D ("gcc_aarch64_linux",)
> +                if "ARM" in self.ActualArchitectures:
> +                    scopes +=3D ("gcc_arm_linux",)
> +                if "RISCV64" in self.ActualArchitectures:
> +                    scopes +=3D ("gcc_riscv64_unknown",)
> +            self.ActualScopes =3D scopes
> +        return self.ActualScopes
>=20
>      def GetRequiredSubmodules(self):
>          ''' return iterable containing RequiredSubmodule objects.
> diff --git a/BaseTools/BinPipWrappers/PosixLike/AmlToC
> b/BaseTools/BinPipWrappers/PosixLike/AmlToC
> new file mode 100644
> index 000000000000..1dd28e966288
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/AmlToC
> @@ -0,0 +1,14 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +exe=3D$(basename "$full_cmd")
> +
> +export
> PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
> +exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py"
> "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/BPDG
> b/BaseTools/BinPipWrappers/PosixLike/BPDG
> new file mode 100644
> index 000000000000..a08cbd8de5c5
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/BPDG
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.EccMain "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Brotli
> b/BaseTools/BinPipWrappers/PosixLike/Brotli
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Brotli
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/BrotliCompress
> b/BaseTools/BinPipWrappers/PosixLike/BrotliCompress
> new file mode 100644
> index 000000000000..663860bb3e57
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/BrotliCompress
> @@ -0,0 +1,34 @@
> +#!/usr/bin/env bash
> +#
> +# This script will exec Brotli tool with -e/-d options.
> +#
> +# Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR=
>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +QLT=3D"-q 9 -w 22"
> +ARGS=3D
> +
> +while test $# -gt 0
> +do
> +  case $1 in
> +    -e)
> +      ;;
> +    -d)
> +      ARGS+=3D"$1 "
> +      ;;
> +    -o|-g)
> +      ARGS+=3D"$1 $2 "
> +      shift
> +      ;;
> +    -q)
> +      QLT=3D"$1 $2 "
> +      shift
> +      ;;
> +    *)
> +      ARGS+=3D"$1 "
> +      ;;
> +  esac
> +  shift
> +done
> +
> +exec Brotli $QLT $ARGS
> diff --git a/BaseTools/BinPipWrappers/PosixLike/DevicePath
> b/BaseTools/BinPipWrappers/PosixLike/DevicePath
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/DevicePath
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Ecc
> b/BaseTools/BinPipWrappers/PosixLike/Ecc
> new file mode 100644
> index 000000000000..598728915095
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Ecc
> @@ -0,0 +1,13 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +export
> PYTHONPATH=3D"$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
> +exec "${python_exe:-python}" -m $cmd.EccMain "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/EfiRom
> b/BaseTools/BinPipWrappers/PosixLike/EfiRom
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/EfiRom
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenCrc32
> b/BaseTools/BinPipWrappers/PosixLike/GenCrc32
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenCrc32
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenDepex
> b/BaseTools/BinPipWrappers/PosixLike/GenDepex
> new file mode 100644
> index 000000000000..df75e43f9ec1
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenDepex
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.AutoGen.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFds
> b/BaseTools/BinPipWrappers/PosixLike/GenFds
> new file mode 100644
> index 000000000000..b27e84eaa210
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenFds
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFfs
> b/BaseTools/BinPipWrappers/PosixLike/GenFfs
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenFfs
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFv
> b/BaseTools/BinPipWrappers/PosixLike/GenFv
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenFv
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFw
> b/BaseTools/BinPipWrappers/PosixLike/GenFw
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenFw
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
> b/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
> new file mode 100644
> index 000000000000..9d143c7fc6c2
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenSec
> b/BaseTools/BinPipWrappers/PosixLike/GenSec
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenSec
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
> b/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
> new file mode 100644
> index 000000000000..366a268802c4
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.Capsule.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/LzmaCompress
> b/BaseTools/BinPipWrappers/PosixLike/LzmaCompress
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/LzmaCompress
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
> b/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
> new file mode 100644
> index 000000000000..b55352ae4c79
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
> @@ -0,0 +1,19 @@
> +#!/usr/bin/env bash
> +#
> +# This script will exec LzmaCompress tool with --f86 option that enable=
s
> converter for x86 code.
> +#
> +# (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> +# Copyright (c) 2012, Intel Corporation. All rights reserved.<BR>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +
> +for arg; do
> +  case $arg in
> +    -e|-d)
> +      set -- "$@" --f86
> +      break
> +    ;;
> +  esac
> +done
> +
> +exec LzmaCompress "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
> b/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
> new file mode 100644
> index 000000000000..9d143c7fc6c2
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
> b/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
> new file mode 100644
> index 000000000000..9d143c7fc6c2
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> diff --git
> a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> new file mode 100644
> index 000000000000..aca2f3a6fe2a
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.Rsa2048Sha256Sign.$cmd
> "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
> b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
> new file mode 100644
> index 000000000000..068364070518
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> \ No newline at end of file
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Split
> b/BaseTools/BinPipWrappers/PosixLike/Split
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Split
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/TargetTool
> b/BaseTools/BinPipWrappers/PosixLike/TargetTool
> new file mode 100644
> index 000000000000..9d143c7fc6c2
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/TargetTool
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> diff --git a/BaseTools/BinPipWrappers/PosixLike/TianoCompress
> b/BaseTools/BinPipWrappers/PosixLike/TianoCompress
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/TianoCompress
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/Trim
> b/BaseTools/BinPipWrappers/PosixLike/Trim
> new file mode 100644
> index 000000000000..0bd14ee03872
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/Trim
> @@ -0,0 +1,13 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D$(basename "$full_cmd")
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/UPT
> b/BaseTools/BinPipWrappers/PosixLike/UPT
> new file mode 100644
> index 000000000000..068364070518
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/UPT
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> \ No newline at end of file
> diff --git a/BaseTools/BinPipWrappers/PosixLike/VfrCompile
> b/BaseTools/BinPipWrappers/PosixLike/VfrCompile
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/VfrCompile
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/VolInfo
> b/BaseTools/BinPipWrappers/PosixLike/VolInfo
> new file mode 100644
> index 000000000000..0945d86d9209
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/VolInfo
> @@ -0,0 +1,29 @@
> +#!/usr/bin/env bash
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
> +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> +then
> +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> +then
> +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> +  then
> +    echo "BaseTools C Tool binary was not found ($cmd)"
> +    echo "You may need to run:"
> +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> +  else
> +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> +  fi
> +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> +then
> +  exec "$dir/../../Source/C/bin/$cmd" "$@"
> +else
> +  echo "Unable to find the real '$cmd' to run"
> +  echo "This message was printed by"
> +  echo "  $0"
> +  exit 127
> +fi
> +
> diff --git a/BaseTools/BinPipWrappers/PosixLike/build
> b/BaseTools/BinPipWrappers/PosixLike/build
> new file mode 100644
> index 000000000000..9d143c7fc6c2
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/PosixLike/build
> @@ -0,0 +1,12 @@
> +#!/usr/bin/env bash
> +#python `dirname $0`/RunToolFromSource.py `basename $0` $*
> +
> +# If a ${PYTHON_COMMAND} command is available, use it in preference to
> python
> +if command -v ${PYTHON_COMMAND} >/dev/null 2>&1; then
> +    python_exe=3D${PYTHON_COMMAND}
> +fi
> +
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not=
 a
> good choice here
> +cmd=3D${full_cmd##*/}
> +
> +exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> b/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml
> similarity index 74%
> copy from BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> copy to BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml
> index 8b32e010bb1d..830670305c0c 100644
> --- a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> +++ b/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml
> @@ -1,10 +1,11 @@
> -## @file
> -# Set this folder on the path for all linux builds
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "global-nix",
> -  "flags": ["set_path"]
> -}
> +## @file
> +# Set this folder on the path for all linux builds
> +#
> +# Copyright (c) Microsoft Corporation.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +{
> +  "scope": "pipbuild-unix",
> +  "override_id": "binwrappers",
> +  "flags": ["set_path"]
> +}
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat
> b/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
> b/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat
> b/BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat
> new file mode 100644
> index 000000000000..02ed682f13eb
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/BrotliCompress.bat
> @@ -0,0 +1,55 @@
> +@REM @file
> +@REM This script will exec Brotli tool with -e/-d options.
> +@REM
> +@REM Copyright (c) 2017 - 2018, Intel Corporation. All rights
reserved.<BR>
> +@REM SPDX-License-Identifier: BSD-2-Clause-Patent
> +@REM
> +
> +@echo off
> +@setlocal
> +
> +set QLT=3D-q 9 -w 22
> +set ARGS=3D
> +
> +:Begin
> +if "%1"=3D=3D"" goto End
> +
> +if "%1"=3D=3D"-d" (
> +  set ARGS=3D%ARGS% %1
> +  shift
> +  goto Begin
> +)
> +
> +if "%1"=3D=3D"-e" (
> +  shift
> +  goto Begin
> +)
> +
> +if "%1"=3D=3D"-g" (
> +  set ARGS=3D%ARGS% %1 %2
> +  shift
> +  shift
> +  goto Begin
> +)
> +
> +if "%1"=3D=3D"-o" (
> +  set ARGS=3D%ARGS% %1 %2
> +  shift
> +  shift
> +  goto Begin
> +)
> +
> +if "%1"=3D=3D"-q" (
> +  set QLT=3D%1 %2
> +  shift
> +  shift
> +  goto Begin
> +)
> +
> +set ARGS=3D%ARGS% %1
> +shift
> +goto Begin
> +
> +:End
> +Brotli %QLT% %ARGS%
> +@echo on
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
> b/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
> new file mode 100644
> index 000000000000..c8d1ed844d36
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.EccMain %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
> b/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
> new file mode 100644
> index 000000000000..aff3cce340fb
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m edk2basetools.AutoGen.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
> b/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
> b/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
> b/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
> new file mode 100644
> index 000000000000..70907c079943
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
> @@ -0,0 +1 @@
> +@%PYTHON_COMMAND% -m edk2basetools.Capsule.GenerateCapsule %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
> b/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
> b/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git
> a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.ba
> t
> b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.ba
> t
> new file mode 100644
> index 000000000000..55b5d3b5a8d5
> --- /dev/null
> +++
> b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.ba
> t
> @@ -0,0 +1 @@
> +@%PYTHON_COMMAND% -m
> edk2basetools.Rsa2048Sha256Sign.Rsa2048Sha256GenerateKeys %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
> b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
> b/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/Trim.bat
> b/BaseTools/BinPipWrappers/WindowsLike/Trim.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/Trim.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/UPT.bat
> b/BaseTools/BinPipWrappers/WindowsLike/UPT.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/UPT.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git a/BaseTools/BinPipWrappers/WindowsLike/build.bat
> b/BaseTools/BinPipWrappers/WindowsLike/build.bat
> new file mode 100644
> index 000000000000..895d72d2594d
> --- /dev/null
> +++ b/BaseTools/BinPipWrappers/WindowsLike/build.bat
> @@ -0,0 +1,3 @@
> +@setlocal
> +@set ToolName=3D%~n0%
> +@%PYTHON_COMMAND% -m
> edk2basetools.%ToolName%.%ToolName% %*
> diff --git
> a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> b/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml
> similarity index 74%
> copy from
> BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> copy to
> BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml
> index 83f5856e75c6..fbeede54b428 100644
> --- a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> +++
> b/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml
> @@ -1,10 +1,11 @@
> -## @file
> -# Add this folder to the path on Windows
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "global-win",
> -  "flags": ["set_path"]
> -}
> +## @file
> +# Add this folder to the path on Windows
> +#
> +# Copyright (c) Microsoft Corporation.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +##
> +{
> +  "scope": "pipbuild-win",
> +  "override_id": "binwrappers",
> +  "flags": ["set_path"]
> +}
> diff --git a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> b/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> index 8b32e010bb1d..99529235ec9a 100644
> --- a/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> +++ b/BaseTools/BinWrappers/PosixLike/posix_path_env.yaml
> @@ -5,6 +5,7 @@
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  ##
>  {
> +  "id": "binwrappers",
>    "scope": "global-nix",
>    "flags": ["set_path"]
>  }
> diff --git
> a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> b/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> index 83f5856e75c6..43da76f354e5 100644
> --- a/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> +++ b/BaseTools/BinWrappers/WindowsLike/win_build_tools_path_env.yaml
> @@ -5,6 +5,7 @@
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  ##
>  {
> +  "id": "binwrappers",
>    "scope": "global-win",
>    "flags": ["set_path"]
>  }
> diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
> index 5943bb9ef908..cc8e92db6558 100755
> --- a/BaseTools/BuildEnv
> +++ b/BaseTools/BuildEnv
> @@ -1,269 +1,279 @@
> -## @file
> -# Setup the environment for unix-like systems running a bash-like shell=
.
> -# This file must be "sourced" not merely executed. For example: ".
> edksetup.sh"
> -#
> -# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR=
>
> -# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -#
> -
> -SetWorkspace() {
> -
> -  #
> -  # If WORKSPACE is already set, then we can return right now
> -  #
> -  if [ -n "$WORKSPACE" ]
> -  then
> -    return 0
> -  fi
> -
> -  #
> -  # Set $WORKSPACE
> -  #
> -  export WORKSPACE=3D`pwd`
> -
> -  return 0
> -
> -}
> -
> -RestorePreviousConfiguration() {
> -  #
> -  # Restore previous configuration
> -  #
> -  if [ -z "$CONF_PATH" ]
> -  then
> -    export CONF_PATH=3D$WORKSPACE/Conf
> -    if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
> -    then
> -      PATH_LIST=3D${PACKAGES_PATH//:/ }
> -      for DIR in $PATH_LIST
> -      do
> -        if [ -d $DIR/Conf ]
> -        then
> -          export CONF_PATH=3D$DIR/Conf
> -          break
> -        fi
> -      done
> -    fi
> -  fi
> -
> -  PREVIOUS_CONF_FILE=3D$CONF_PATH/BuildEnv.sh
> -  if [ -e $PREVIOUS_CONF_FILE ]
> -  then
> -    echo Loading previous configuration from $PREVIOUS_CONF_FILE
> -    . $PREVIOUS_CONF_FILE
> -  fi
> -}
> -
> -GenerateShellCodeToSetVariable() {
> -  VARIABLE=3D$1
> -  OUTPUT_FILE=3D$2
> -  VAR_VALUE=3D"echo \${${VARIABLE}}"
> -  VAR_VALUE=3D`eval $VAR_VALUE`
> -  echo "if [ -z \"\$${VARIABLE}\" ]"             >> $OUTPUT_FILE
> -  echo "then"                                    >>
> $OUTPUT_FILE
> -  echo "  export ${VARIABLE}=3D${VAR_VALUE}"       >> $OUTPUT_FILE
> -  echo "fi"                                      >> $OUTPUT_FILE
> -}
> -
> -GenerateShellCodeToUpdatePath() {
> -  OUTPUT_FILE=3D$1
> -  echo "if [ -e $EDK_TOOLS_PATH_BIN ]"                        >>
> $OUTPUT_FILE
> -  echo "then"                                                 >>
> $OUTPUT_FILE
> -  echo "  if [ "\${PATH/$EDK_TOOLS_PATH_BIN/}" =3D=3D "\$PATH" ]" >>
> $OUTPUT_FILE
> -  echo "  then"                                               >>
> $OUTPUT_FILE
> -  echo "    export PATH=3D$EDK_TOOLS_PATH_BIN:\$PATH"           >>
> $OUTPUT_FILE
> -  echo "  fi"                                                 >>
> $OUTPUT_FILE
> -  echo "fi"                                                   >>
> $OUTPUT_FILE
> -}
> -
> -StoreCurrentConfiguration() {
> -  #
> -  # Write configuration to a shell script to allow for configuration to
be
> -  # easily reloaded.
> -  #
> -  OUTPUT_FILE=3D$CONF_PATH/BuildEnv.sh
> -  #echo Storing current configuration into $OUTPUT_FILE
> -  echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
> -  GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
> -  GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
> -  GenerateShellCodeToUpdatePath $OUTPUT_FILE
> -}
> -
> -SetEdkToolsPath() {
> -
> -  #
> -  # If EDK_TOOLS_PATH is already set, then we can return right now
> -  #
> -  if [ -n "$EDK_TOOLS_PATH" ]
> -  then
> -    return 0
> -  fi
> -
> -  #
> -  # Try $CONF_PATH/EdkTools
> -  #
> -  if [ -e $CONF_PATH/EdkTools ]
> -  then
> -    export EDK_TOOLS_PATH=3D$CONF_PATH/EdkTools
> -    return 0
> -  fi
> -
> -  #
> -  # Try $CONF_PATH/BaseToolsSource
> -  #
> -  if [ -e $CONF_PATH/BaseToolsSource ]
> -  then
> -    export EDK_TOOLS_PATH=3D$CONF_PATH/BaseToolsSource
> -    return 0
> -  fi
> -
> -  #
> -  # Try $WORKSPACE/BaseTools
> -  #
> -  if [ -e $WORKSPACE/BaseTools ]
> -  then
> -    export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools
> -    return 0
> -  fi
> -
> -  #
> -  # Try $PACKAGES_PATH
> -  #
> -  if [ -n "$PACKAGES_PATH"]
> -  then
> -    PATH_LIST=3D${PACKAGES_PATH//:/ }
> -    for DIR in $PATH_LIST
> -    do
> -      if [ -d $DIR/BaseTools ]
> -      then
> -        export EDK_TOOLS_PATH=3D$DIR/BaseTools
> -        return 0
> -      fi
> -    done
> -  fi
> -
> -  echo "Unable to determine EDK_TOOLS_PATH"
> -  echo
> -  echo "You may need to download the 'BaseTools' from
> buildtools.tianocore.org."
> -  echo "After downloading, either create a symbolic link to the source
at"
> -  echo "\$WORKSPACE/Conf/BaseToolsSource, or set the EDK_TOOLS_PATH
> environment"
> -  echo "variable."
> -
> -}
> -
> -GetBaseToolsBinSubDir() {
> -  #
> -  # Figure out a uniq directory name from the uname command
> -  #
> -  UNAME_DIRNAME=3D`uname -sm`
> -  UNAME_DIRNAME=3D${UNAME_DIRNAME// /-}
> -  UNAME_DIRNAME=3D${UNAME_DIRNAME//\//-}
> -  echo $UNAME_DIRNAME
> -}
> -
> -GetEdkToolsPathBinDirectory() {
> -  #
> -  # Figure out a uniq directory name from the uname command
> -  #
> -  BIN_SUB_DIR=3D`GetBaseToolsBinSubDir`
> -
> -  if [ -e $EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR ]
> -  then
> -
> EDK_TOOLS_PATH_BIN=3D$EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR
> -  else
> -    EDK_TOOLS_PATH_BIN=3D$EDK_TOOLS_PATH/Bin/$BIN_SUB_DIR
> -  fi
> -
> -  echo $EDK_TOOLS_PATH_BIN
> -}
> -
> -AddDirToStartOfPath() {
> -  DIRNAME=3D$1
> -  PATH=3D$DIRNAME:$DIRNAME:$DIRNAME:$PATH
> -  PATH=3D${PATH//$DIRNAME:/}
> -  PATH=3D$DIRNAME:$PATH
> -  export PATH
> -}
> -
> -AddEdkToolsToPath() {
> -
> -  #
> -  # If EDK_TOOLS_PATH is not set, then we cannot update PATH
> -  #
> -  if [ -z "$EDK_TOOLS_PATH" ]
> -  then
> -    return 1
> -  fi
> -
> -  EDK_TOOLS_PATH_BIN=3D`GetEdkToolsPathBinDirectory`
> -
> -  AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
> -  AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
> -
> -}
> -
> -CopySingleTemplateFile() {
> -
> -  SRC_FILENAME=3DConf/$1.template
> -  DST_FILENAME=3D$CONF_PATH/$1.txt
> -
> -  if [ -e $DST_FILENAME ]
> -  then
> -    [ $RECONFIG !=3D TRUE ] && return
> -  fi
> -
> -  echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"
> -  echo "     to $DST_FILENAME"
> -  SRC_FILENAME=3D$EDK_TOOLS_PATH/$SRC_FILENAME
> -  cp $SRC_FILENAME $DST_FILENAME
> -
> -}
> -
> -CopyTemplateFiles() {
> -
> -  CopySingleTemplateFile build_rule
> -  CopySingleTemplateFile tools_def
> -  CopySingleTemplateFile target
> -
> -}
> -
> -ScriptMain() {
> -
> -  SetWorkspace
> -  if [ -z $WORKSPACE ]
> -  then
> -    echo "Failure setting WORKSPACE"
> -    return 1
> -  fi
> -
> -  RestorePreviousConfiguration
> -
> -  SetEdkToolsPath
> -  if [ -z $EDK_TOOLS_PATH ]
> -  then
> -    return 1
> -  fi
> -
> -  AddEdkToolsToPath
> -  if [ $? -ne 0 ]
> -  then
> -    echo "Failure adding EDK Tools into PATH!"
> -    return 1
> -  fi
> -
> -  StoreCurrentConfiguration
> -
> -  echo WORKSPACE: $WORKSPACE
> -  echo EDK_TOOLS_PATH: $EDK_TOOLS_PATH
> -  echo CONF_PATH: $CONF_PATH
> -
> -  CopyTemplateFiles
> -
> -}
> -
> -#
> -# Run the main function
> -#
> -ScriptMain
> -
> +## @file
> +# Setup the environment for unix-like systems running a bash-like shell=
.
> +# This file must be "sourced" not merely executed. For example: ".
> edksetup.sh"
> +#
> +# Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR=
>
> +# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
> +#
> +
> +SetWorkspace() {
> +
> +  #
> +  # If WORKSPACE is already set, then we can return right now
> +  #
> +  if [ -n "$WORKSPACE" ]
> +  then
> +    return 0
> +  fi
> +
> +  #
> +  # Set $WORKSPACE
> +  #
> +  export WORKSPACE=3D`pwd`
> +
> +  return 0
> +
> +}
> +
> +RestorePreviousConfiguration() {
> +  #
> +  # Restore previous configuration
> +  #
> +  if [ -z "$CONF_PATH" ]
> +  then
> +    export CONF_PATH=3D$WORKSPACE/Conf
> +    if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
> +    then
> +      PATH_LIST=3D${PACKAGES_PATH//:/ }
> +      for DIR in $PATH_LIST
> +      do
> +        if [ -d $DIR/Conf ]
> +        then
> +          export CONF_PATH=3D$DIR/Conf
> +          break
> +        fi
> +      done
> +    fi
> +  fi
> +
> +  PREVIOUS_CONF_FILE=3D$CONF_PATH/BuildEnv.sh
> +  if [ -e $PREVIOUS_CONF_FILE ]
> +  then
> +    echo Loading previous configuration from $PREVIOUS_CONF_FILE
> +    . $PREVIOUS_CONF_FILE
> +  fi
> +}
> +
> +GenerateShellCodeToSetVariable() {
> +  VARIABLE=3D$1
> +  OUTPUT_FILE=3D$2
> +  VAR_VALUE=3D"echo \${${VARIABLE}}"
> +  VAR_VALUE=3D`eval $VAR_VALUE`
> +  echo "if [ -z \"\$${VARIABLE}\" ]"             >> $OUTPUT_FILE
> +  echo "then"                                    >>
> $OUTPUT_FILE
> +  echo "  export ${VARIABLE}=3D${VAR_VALUE}"       >> $OUTPUT_FILE
> +  echo "fi"                                      >>
> $OUTPUT_FILE
> +}
> +
> +GenerateShellCodeToUpdatePath() {
> +  OUTPUT_FILE=3D$1
> +  echo "if [ -e $EDK_TOOLS_PATH_BIN ]"                        >>
> $OUTPUT_FILE
> +  echo
> "then"                                                 >>
> $OUTPUT_FILE
> +  echo "  if [ "\${PATH/$EDK_TOOLS_PATH_BIN/}" =3D=3D "\$PATH" ]" >>
> $OUTPUT_FILE
> +  echo "
> then"                                               >>
> $OUTPUT_FILE
> +  echo "    export PATH=3D$EDK_TOOLS_PATH_BIN:\$PATH"           >>
> $OUTPUT_FILE
> +  echo "  fi"                                                 >>
> $OUTPUT_FILE
> +  echo "fi"                                                   >>
> $OUTPUT_FILE
> +}
> +
> +StoreCurrentConfiguration() {
> +  #
> +  # Write configuration to a shell script to allow for configuration to
be
> +  # easily reloaded.
> +  #
> +  OUTPUT_FILE=3D$CONF_PATH/BuildEnv.sh
> +  #echo Storing current configuration into $OUTPUT_FILE
> +  echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
> +  GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
> +  GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
> +  GenerateShellCodeToUpdatePath $OUTPUT_FILE
> +}
> +
> +SetEdkToolsPath() {
> +
> +  #
> +  # If EDK_TOOLS_PATH is already set, then we can return right now
> +  #
> +  if [ -n "$EDK_TOOLS_PATH" ]
> +  then
> +    return 0
> +  fi
> +
> +  #
> +  # Try $CONF_PATH/EdkTools
> +  #
> +  if [ -e $CONF_PATH/EdkTools ]
> +  then
> +    export EDK_TOOLS_PATH=3D$CONF_PATH/EdkTools
> +    return 0
> +  fi
> +
> +  #
> +  # Try $CONF_PATH/BaseToolsSource
> +  #
> +  if [ -e $CONF_PATH/BaseToolsSource ]
> +  then
> +    export EDK_TOOLS_PATH=3D$CONF_PATH/BaseToolsSource
> +    return 0
> +  fi
> +
> +  #
> +  # Try $WORKSPACE/BaseTools
> +  #
> +  if [ -e $WORKSPACE/BaseTools ]
> +  then
> +    export EDK_TOOLS_PATH=3D$WORKSPACE/BaseTools
> +    return 0
> +  fi
> +
> +  #
> +  # Try $PACKAGES_PATH
> +  #
> +  if [ -n "$PACKAGES_PATH"]
> +  then
> +    PATH_LIST=3D${PACKAGES_PATH//:/ }
> +    for DIR in $PATH_LIST
> +    do
> +      if [ -d $DIR/BaseTools ]
> +      then
> +        export EDK_TOOLS_PATH=3D$DIR/BaseTools
> +        return 0
> +      fi
> +    done
> +  fi
> +
> +  echo "Unable to determine EDK_TOOLS_PATH"
> +  echo
> +  echo "You may need to download the 'BaseTools' from
> buildtools.tianocore.org."
> +  echo "After downloading, either create a symbolic link to the source
at"
> +  echo "\$WORKSPACE/Conf/BaseToolsSource, or set the EDK_TOOLS_PATH
> environment"
> +  echo "variable."
> +
> +}
> +
> +GetBaseToolsBinSubDir() {
> +  #
> +  # Figure out a uniq directory name from the uname command
> +  #
> +  UNAME_DIRNAME=3D`uname -sm`
> +  UNAME_DIRNAME=3D${UNAME_DIRNAME// /-}
> +  UNAME_DIRNAME=3D${UNAME_DIRNAME//\//-}
> +  echo $UNAME_DIRNAME
> +}
> +
> +GetEdkToolsPathBinDirectory() {
> +  #
> +  # Figure out a uniq directory name from the uname command
> +  #
> +  BIN_SUB_DIR=3D`GetBaseToolsBinSubDir`
> +
> +  if [ -e $EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR ]
> +  then
> +
> EDK_TOOLS_PATH_BIN=3D$EDK_TOOLS_PATH/BinWrappers/$BIN_SUB_DIR
> +  else
> +    EDK_TOOLS_PATH_BIN=3D$EDK_TOOLS_PATH/Bin/$BIN_SUB_DIR
> +  fi
> +
> +  echo $EDK_TOOLS_PATH_BIN
> +}
> +
> +AddDirToStartOfPath() {
> +  DIRNAME=3D$1
> +  PATH=3D$DIRNAME:$DIRNAME:$DIRNAME:$PATH
> +  PATH=3D${PATH//$DIRNAME:/}
> +  PATH=3D$DIRNAME:$PATH
> +  export PATH
> +}
> +
> +AddEdkToolsToPath() {
> +
> +  #
> +  # If EDK_TOOLS_PATH is not set, then we cannot update PATH
> +  #
> +  if [ -z "$EDK_TOOLS_PATH" ]
> +  then
> +    return 1
> +  fi
> +
> +  EDK_TOOLS_PATH_BIN=3D`GetEdkToolsPathBinDirectory`
> +
> +  # check if the edk2basetools pip package is available
> +  if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
> +    # if it is, use the pip version of the wrappers
> +    echo "Using Pip Basetools"
> +    AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
> +  else
> +    echo "Using EDK2 in-source Basetools"
> +    AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike
> +  fi
> +
> +
> +  AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
> +
> +}
> +
> +CopySingleTemplateFile() {
> +
> +  SRC_FILENAME=3DConf/$1.template
> +  DST_FILENAME=3D$CONF_PATH/$1.txt
> +
> +  if [ -e $DST_FILENAME ]
> +  then
> +    [ $RECONFIG !=3D TRUE ] && return
> +  fi
> +
> +  echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"
> +  echo "     to $DST_FILENAME"
> +  SRC_FILENAME=3D$EDK_TOOLS_PATH/$SRC_FILENAME
> +  cp $SRC_FILENAME $DST_FILENAME
> +
> +}
> +
> +CopyTemplateFiles() {
> +
> +  CopySingleTemplateFile build_rule
> +  CopySingleTemplateFile tools_def
> +  CopySingleTemplateFile target
> +
> +}
> +
> +ScriptMain() {
> +
> +  SetWorkspace
> +  if [ -z $WORKSPACE ]
> +  then
> +    echo "Failure setting WORKSPACE"
> +    return 1
> +  fi
> +
> +  RestorePreviousConfiguration
> +
> +  SetEdkToolsPath
> +  if [ -z $EDK_TOOLS_PATH ]
> +  then
> +    return 1
> +  fi
> +
> +  AddEdkToolsToPath
> +  if [ $? -ne 0 ]
> +  then
> +    echo "Failure adding EDK Tools into PATH!"
> +    return 1
> +  fi
> +
> +  StoreCurrentConfiguration
> +
> +  echo WORKSPACE: $WORKSPACE
> +  echo EDK_TOOLS_PATH: $EDK_TOOLS_PATH
> +  echo CONF_PATH: $CONF_PATH
> +
> +  CopyTemplateFiles
> +
> +}
> +
> +#
> +# Run the main function
> +#
> +ScriptMain
> +
> diff --git a/BaseTools/Scripts/PatchCheck.py
> b/BaseTools/Scripts/PatchCheck.py
> index 68c984ed0e4d..80754e763c5a 100755
> --- a/BaseTools/Scripts/PatchCheck.py
> +++ b/BaseTools/Scripts/PatchCheck.py
> @@ -359,6 +359,7 @@ class GitDiffCheck:
>                  self.force_notabs =3D True
>                  if self.filename.endswith('.sh') or \
>=20
> self.filename.startswith('BaseTools/BinWrappers/PosixLike/') or \
> +
> self.filename.startswith('BaseTools/BinPipWrappers/PosixLike/') or \
>=20
> self.filename.startswith('BaseTools/Bin/CYGWIN_NT-5.1-i686/') or \
>                      self.filename =3D=3D 'BaseTools/BuildEnv':
>                      #
> diff --git a/BaseTools/Source/Python/README.md
> b/BaseTools/Source/Python/README.md
> new file mode 100644
> index 000000000000..56f5b0ff027b
> --- /dev/null
> +++ b/BaseTools/Source/Python/README.md
> @@ -0,0 +1,29 @@
> +# Edk2 Basetools
> +
> +This folder has traditionally held the source of Python based tools use=
d
by
> EDK2.
> +The official repo this source has moved to
> https://github.com/tianocore/edk2-basetools.
> +This folder will remain in the tree until the next stable release
(expected
> 202102).
> +There is a new folder under Basetools `BinPipWrappers` that uses the pi=
p
> module rather than this tree for Basetools.
> +By adding the scope `pipbuild-win` or `pipbuild-unix` (depending on you=
r
host
> system), the SDE will use the
> +`BinPipWrappers` instead of the regular `BinWrappers`.
> +
> +## Why Move It?
> +
> +The discussion is on the mailing list. The RFC is here:
> https://edk2.groups.io/g/rfc/topic/74009714#270
> +The benefits allow for the Basetools project to be used separately from
EDK2
> itself as well as offering it in a
> +globally accessible manner.
> +This makes it much easier to build a module using Basetools.
> +Separating the Basetools into their own repo allows for easier CI and
> contribution process.
> +Additional pros, cons, and process can be found on the mailing list.
> +
> +## How Do I Install It?
> +
> +By default, EDK2 is tied to and tested with a specific version of the
Basetools
> through `pip-requirements.txt`.
> +You can simply run:
> +
> +```bash
> +pip install -r pip-requirements.txt
> +```
> +
> +This will install the required module, thought we strongly suggest
setting up
> a virtual environment.
> +Additionally, you can also install a local clone of the Basetools as we=
ll
as a
> specific git commit.
> diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
> index 61ebf4ae09bc..4b5256ab6e93 100755
> --- a/BaseTools/toolsetup.bat
> +++ b/BaseTools/toolsetup.bat
> @@ -393,12 +393,31 @@ goto end
>      goto check_freezer_path
>    )
>=20
> +
> +
>  :check_freezer_path
>    endlocal
> +
> +  %PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL
> +  if %ERRORLEVEL% EQU 0 (
> +    goto use_pip_basetools
> +  ) else (
> +    goto use_builtin_basetools
> +  )
> +
> +:use_builtin_basetools
> +  @echo Using EDK2 in-source Basetools
>    if defined BASETOOLS_PYTHON_SOURCE goto print_python_info
>    set "PATH=3D%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"
>    set
> BASETOOLS_PYTHON_SOURCE=3D%BASE_TOOLS_PATH%\Source\Python
>    set PYTHONPATH=3D%BASETOOLS_PYTHON_SOURCE%;%PYTHONPATH%
> +  goto print_python_info
> +
> +:use_pip_basetools
> +  @echo Using Pip Basetools
> +  set
> "PATH=3D%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%"
> +  set BASETOOLS_PYTHON_SOURCE=3Dedk2basetools
> +  goto print_python_info
>=20
>  :print_python_info
>    echo                PATH =3D %PATH%
> diff --git a/pip-requirements.txt b/pip-requirements.txt
> index 0fecd37f2a83..b634106beada 100644
> --- a/pip-requirements.txt
> +++ b/pip-requirements.txt
> @@ -14,4 +14,5 @@
>=20
>  edk2-pytool-library=3D=3D0.10.*
>  edk2-pytool-extensions~=3D0.13.3
> +edk2-basetools=3D=3D0.1.0
>  antlr4-python3-runtime=3D=3D4.7.1
> --
> 2.29.0.vfs.0.0
>=20
>=20
>=20
>=20
>=20