BaseTools: Remove Pip BaseTools

BaseTools was moved out to a separate repo and consumed as a pip
module by edk2 CI. This process has not led to the desired goals
of doing so, so this patch removes the pip based BaseTools from
edk2 CI.

The original goal of moving BaseTools to a pip module was
primarily to speed up the development process, as the old edk2
mailing list was slow. However, with edk2 moving to PRs, it now
actually slows the BaseTools development process to have to do
a PR in another repo, publish the module, and then make a PR
in edk2 to consume the new BaseTools. It also holds up using
the features in a new BaseTools in other PRs.

There were other goals of moving, such as allowing projects to
use the BaseTools outside of edk2. This can still be accomplished
outside of this PR, this PR simply stops edk2 CI from using the
pip module.

Continuous-integration-options: PatchCheck.ignore-multi-package

Signed-off-by: Oliver Smith-Denny <osde@linux.microsoft.com>

53 files changed, 1 insertions, 761 deletions

diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index 314758da32..e14b77d4e2 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -37,7 +37,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
         self.ActualTargets = []

         self.ActualArchitectures = []

         self.ActualToolChainTag = ""

-        self.UseBuiltInBaseTools = None

         self.ActualScopes = None

 

     # ####################################################################################### #

@@ -45,10 +44,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
     # ####################################################################################### #

 

     def AddCommandLineOptions(self, parserObj):

-        group = parserObj.add_mutually_exclusive_group()

-        group.add_argument("-force_piptools", "--fpt", dest="force_piptools", action="store_true", default=False, help="Force the system to use pip tools")

-        group.add_argument("-no_piptools", "--npt", dest="no_piptools", action="store_true", default=False, help="Force the system to not use pip tools")

-

         try:

             codeql_helpers.add_command_line_option(parserObj)

         except NameError:

@@ -56,10 +51,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
 

     def RetrieveCommandLineOptions(self, args):

         super().RetrieveCommandLineOptions(args)

-        if args.force_piptools:

-            self.UseBuiltInBaseTools = True

-        if args.no_piptools:

-            self.UseBuiltInBaseTools = False

 

         try:

             self.codeql = codeql_helpers.is_codeql_enabled_on_command_line(args)

@@ -176,24 +167,6 @@ class Settings(CiBuildSettingsManager, UpdateSettingsManager, SetupSettingsManag
 

             self.ActualToolChainTag = shell_environment.GetBuildVars().GetValue("TOOL_CHAIN_TAG", "")

 

-            is_linux = GetHostInfo().os.upper() == "LINUX"

-

-            if self.UseBuiltInBaseTools is None:

-                is_linux = GetHostInfo().os.upper() == "LINUX"

-                # try and import the pip module for basetools

-                try:

-                    import edk2basetools

-                    self.UseBuiltInBaseTools = True

-                except ImportError:

-                    self.UseBuiltInBaseTools = False

-                    pass

-

-            if self.UseBuiltInBaseTools == True:

-                scopes += ('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")

-

             try:

                 scopes += codeql_helpers.get_scopes(self.codeql)

 

diff --git a/BaseTools/BinPipWrappers/PosixLike/AmlToC b/BaseTools/BinPipWrappers/PosixLike/AmlToC
deleted file mode 100755
index 1dd28e9662..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/AmlToC
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-exe=$(basename "$full_cmd")
-
-export PYTHONPATH="$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
deleted file mode 100755
index a08cbd8de5..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/BPDG
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.EccMain "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/BrotliCompress b/BaseTools/BinPipWrappers/PosixLike/BrotliCompress
deleted file mode 100755
index 426f2a2ef1..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/BrotliCompress
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/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="-q 9 -w 22"
-ARGS=
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${full_cmd##*/}
-
-while test $# -gt 0
-do
-  case $1 in
-    -e)
-      ;;
-    -d)
-      ARGS+="$1 "
-      ;;
-    -o|-g)
-      ARGS+="$1 $2 "
-      shift
-      ;;
-    -q)
-      QLT="$1 $2 "
-      shift
-      ;;
-    *)
-      ARGS+="$1 "
-      ;;
-  esac
-  shift
-done
-
-
-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" $QLT $ARGS
-  fi
-elif [ -e "$dir/../../Source/C/bin/$cmd" ]
-then
-  exec "$dir/../../Source/C/bin/$cmd" $QLT $ARGS
-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/DevicePath b/BaseTools/BinPipWrappers/PosixLike/DevicePath
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/DevicePath
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 5987289150..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Ecc
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
-exec "${python_exe:-python}" -m $cmd.EccMain "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/EfiRom b/BaseTools/BinPipWrappers/PosixLike/EfiRom
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/EfiRom
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenCrc32
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index df75e43f9e..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenDepex
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.AutoGen.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFds b/BaseTools/BinPipWrappers/PosixLike/GenFds
deleted file mode 100755
index b27e84eaa2..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenFds
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/GenFfs b/BaseTools/BinPipWrappers/PosixLike/GenFfs
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenFfs
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenFv
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenFw
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 9d143c7fc6..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenPatchPcdTable
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/GenSec b/BaseTools/BinPipWrappers/PosixLike/GenSec
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenSec
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 366a268802..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/GenerateCapsule
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.Capsule.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/LzmaCompress b/BaseTools/BinPipWrappers/PosixLike/LzmaCompress
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/LzmaCompress
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index b55352ae4c..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/LzmaF86Compress
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script will exec LzmaCompress tool with --f86 option that enables 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
deleted file mode 100755
index 9d143c7fc6..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/PatchPcdValue
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign b/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
deleted file mode 100755
index 9d143c7fc6..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Pkcs7Sign
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
deleted file mode 100755
index aca2f3a6fe..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256GenerateKeys
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.Rsa2048Sha256Sign.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign b/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
deleted file mode 100755
index ead26cb369..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Rsa2048Sha256Sign
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Split
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 9d143c7fc6..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/TargetTool
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/TianoCompress b/BaseTools/BinPipWrappers/PosixLike/TianoCompress
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/TianoCompress
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 0bd14ee038..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/Trim
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=$(basename "$full_cmd")
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
-
diff --git a/BaseTools/BinPipWrappers/PosixLike/UPT b/BaseTools/BinPipWrappers/PosixLike/UPT
deleted file mode 100755
index ead26cb369..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/UPT
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/VfrCompile
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 0945d86d92..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/VolInfo
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-dir=$(dirname "$full_cmd")
-cmd=${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
deleted file mode 100755
index 9d143c7fc6..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/build
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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=${PYTHON_COMMAND}
-fi
-
-full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is not a good choice here
-cmd=${full_cmd##*/}
-
-exec "${python_exe:-python}" -m edk2basetools.$cmd.$cmd "$@"
diff --git a/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml b/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml
deleted file mode 100644
index eb1db9eb25..0000000000
--- a/BaseTools/BinPipWrappers/PosixLike/posix_path_env.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-## @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
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/AmlToC.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat b/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/BPDG.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat b/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
deleted file mode 100644
index 16a0a799a4..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Ecc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.EccMain %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat b/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
deleted file mode 100644
index 481b5ac47d..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/GenDepex.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.AutoGen.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat b/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/GenFds.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat b/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/GenPatchPcdTable.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat b/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
deleted file mode 100644
index 34c43ac7fc..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/GenerateCapsule.bat
+++ /dev/null
@@ -1 +0,0 @@
-@%PYTHON_COMMAND% -m edk2basetools.Capsule.GenerateCapsule %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat b/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/PatchPcdValue.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat b/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Pkcs7Sign.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat
deleted file mode 100644
index cdc2e3ea37..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256GenerateKeys.bat
+++ /dev/null
@@ -1 +0,0 @@
-@%PYTHON_COMMAND% -m edk2basetools.Rsa2048Sha256Sign.Rsa2048Sha256GenerateKeys %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat b/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Rsa2048Sha256Sign.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Split.bat b/BaseTools/BinPipWrappers/WindowsLike/Split.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Split.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat b/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/TargetTool.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/Trim.bat b/BaseTools/BinPipWrappers/WindowsLike/Trim.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/Trim.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/UPT.bat b/BaseTools/BinPipWrappers/WindowsLike/UPT.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/UPT.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/build.bat b/BaseTools/BinPipWrappers/WindowsLike/build.bat
deleted file mode 100644
index d347d64844..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/build.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@setlocal

-@set ToolName=%~n0%

-@%PYTHON_COMMAND% -m edk2basetools.%ToolName%.%ToolName% %*

diff --git a/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml b/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml
deleted file mode 100644
index 9fdbe1bcb0..0000000000
--- a/BaseTools/BinPipWrappers/WindowsLike/win_build_tools_path_env.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-## @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/BuildEnv b/BaseTools/BuildEnv
index bd6235d74f..1d9526bdfc 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -198,16 +198,7 @@ AddEdkToolsToPath() {
 
   EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
 
-  # check if the edk2basetools pip package is available
-  if $PYTHON_COMMAND -c "import edk2basetools" > /dev/null 2>&1; 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/BinWrappers/PosixLike
 
   AddDirToStartOfPath $EDK_TOOLS_PATH_BIN
 
diff --git a/BaseTools/Scripts/PatchCheck.py b/BaseTools/Scripts/PatchCheck.py
index d797ac80c1..83d6795188 100755
--- a/BaseTools/Scripts/PatchCheck.py
+++ b/BaseTools/Scripts/PatchCheck.py
@@ -395,7 +395,6 @@ class GitDiffCheck:
                     self.force_notabs = False

                 if self.filename.endswith('.sh') or \

                     self.filename.startswith('BaseTools/BinWrappers/PosixLike/') or \

-                    self.filename.startswith('BaseTools/BinPipWrappers/PosixLike/') or \

                     self.filename == 'BaseTools/BuildEnv':

                     #

                     # Do not enforce CR/LF line endings for linux shell scripts.

diff --git a/BaseTools/Source/Python/README.md b/BaseTools/Source/Python/README.md
deleted file mode 100644
index 8c4d9e73bb..0000000000
--- a/BaseTools/Source/Python/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# Edk2 Basetools

-

-This folder has traditionally held the source of Python based tools used 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 pip module rather than this tree for Basetools.

-By adding the scope `pipbuild-win` or `pipbuild-unix` (depending on your 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 well as a specific git commit.

diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
index 5b1070f1e4..bdbc052c21 100755
--- a/BaseTools/toolsetup.bat
+++ b/BaseTools/toolsetup.bat
@@ -350,28 +350,12 @@ if %ERRORLEVEL% NEQ 0 (
 

 endlocal

 

-%PYTHON_COMMAND% -c "import edk2basetools" >NUL 2>NUL

-if %ERRORLEVEL% EQU 0 (

-  goto use_pip_basetools

-) else (

-  REM reset ERRORLEVEL

-  type nul>nul

-  goto use_builtin_basetools

-)

-

-:use_builtin_basetools

   @echo Using EDK2 in-source Basetools

   if defined BASETOOLS_PYTHON_SOURCE goto print_python_info

   set "PATH=%BASE_TOOLS_PATH%\BinWrappers\WindowsLike;%PATH%"

   set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH%

   goto print_python_info

 

-:use_pip_basetools

-  @echo Using Pip Basetools

-  set "PATH=%BASE_TOOLS_PATH%\BinPipWrappers\WindowsLike;%PATH%"

-  set PYTHONPATH=%BASE_TOOLS_PATH%\Source\Python;%PYTHONPATH%

-  goto print_python_info

-

 :print_python_info

   echo           PATH      = %PATH%

   echo.

diff --git a/pip-requirements.txt b/pip-requirements.txt
index f9fb9e130b..c8de90fc2b 100644
--- a/pip-requirements.txt
+++ b/pip-requirements.txt
@@ -14,7 +14,6 @@
 

 edk2-pytool-library~=0.21.9

 edk2-pytool-extensions~=0.27.10

-edk2-basetools==0.1.53

 antlr4-python3-runtime>=4.7.1

 lcov-cobertura==2.0.2

 regex==2024.7.24