Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1712133: Remove "windows" action support from virtualenvs r=ahal

Browse Source 
Last year, we stopped vendoring Python packages that have native
code. Since we have only had pure-python packages since, the
Windows-specific qualifier (or excluder in the case of `!windows`)
hasn't been needed.

I don't foresee us needing it again, but if anything we can peel it
back from `hg` history if this assumption is incorrect.

Differential Revision: https://phabricator.services.mozilla.com/D117468
This commit is contained in:
Mitchell Hentges 2021-06-15 14:46:55 +00:00
parent 318ecaf9b2
commit 9f7c330b60
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/mach_bootstrap.py
View File

@ -147,13 +147,6 @@ def search_path(mozilla_dir, packages_txt):
packages = [line.rstrip().split(":") for line in f]
def handle_package(package):
if package[0] in ("windows", "!windows"):
for_win = not package[0].startswith("!")
is_win = sys.platform == "win32"
if is_win == for_win:
for path in handle_package(package[1:]):
yield path
if package[0] == "packages.txt":
assert len(package) == 2
for p in search_path(mozilla_dir, package[1]):

11
python/mozbuild/mozbuild/virtualenv.py
View File

@ -311,12 +311,6 @@ class VirtualenvManager(VirtualenvHelper):
will be read and processed as if its contents were concatenated
into the manifest being read.
windows -- This denotes that the action should only be taken when run
on Windows.
!windows -- This denotes that the action should only be taken when run
on non-Windows systems.
set-variable -- Set the given environment variable; e.g.
`set-variable FOO=1`.
@ -362,11 +356,6 @@ class VirtualenvManager(VirtualenvHelper):
elif package[0] == "thunderbird":
if is_thunderbird:
handle_package(package[1:])
elif package[0] in ("windows", "!windows"):
for_win = not package[0].startswith("!")
is_win = sys.platform == "win32"
if is_win == for_win:
handle_package(package[1:])
else:
raise Exception("Unknown action: %s" % package[0])