Skip to content

Commit

Permalink
remove edk2-basetools
Browse files Browse the repository at this point in the history
Removes edk2-basetools from pip-requirements.txt and any usage of it
in the CISettings.py. The is done as there are changes in the build
tools python source code that are available locally in BaseTools (as it
is managed by Project Mu) that is not available in edk2-basetools.
  • Loading branch information
Javagedes committed Feb 12, 2024
1 parent 06c7662 commit aef3835
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 17 deletions.
16 changes: 0 additions & 16 deletions .pytool/CISettings.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,19 @@ def __init__(self):
self.ActualArchitectures = []
self.ActualToolChainTag = ""
self.ActualScopes = None
# In tree BaseTools are required for Rust build support so enable
# it by default.
self.UseBuiltInBaseTools = False

# ####################################################################################### #
# Extra CmdLine configuration #
# ####################################################################################### #

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")

try:
codeql_helpers.add_command_line_option(parserObj)
except NameError:
pass

def RetrieveCommandLineOptions(self, args):
super().RetrieveCommandLineOptions(args)

if args.force_piptools:
self.UseBuiltInBaseTools = True

try:
self.codeql = codeql_helpers.is_codeql_enabled_on_command_line(args)
except NameError:
Expand Down Expand Up @@ -149,12 +139,6 @@ def GetActiveScopes(self):

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

if self.UseBuiltInBaseTools == True:
scopes += ('pipbuild-unix',) if is_linux else ('pipbuild-win',)
logging.warning("Using Pip Tools based BaseTools")
else:
logging.info("Using in-tree BaseTools")

if is_linux and self.ActualToolChainTag.upper().startswith("GCC"):
if "AARCH64" in self.ActualArchitectures:
scopes += ("gcc_aarch64_linux",)
Expand Down
1 change: 0 additions & 1 deletion pip-requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

edk2-pytool-library==0.21.2
edk2-pytool-extensions==0.27.2
edk2-basetools==0.1.29
antlr4-python3-runtime==4.13.1
regex==2023.12.25
pygount==1.6.1

0 comments on commit aef3835

Please sign in to comment.