Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23333 - Manishearth:mach-module, r=jdm

Browse source 
Explicitly provide module names to mach so it doesn't try to autogenerate them

This works around https://bugzilla.mozilla.org/show_bug.cgi?id=1549636

r? @jdm

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23333)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-05-06 21:25:59 -04:00 • committed by GitHub
commit 7e8e3fe4de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/mach_bootstrap.py
View file

@ -293,6 +293,10 @@ def bootstrap(topdir):
mach.define_category(category, meta['short'], meta['long'], meta['priority'])
for path in MACH_MODULES:
mach.load_commands_from_file(os.path.join(topdir, path))
# explicitly provide a module name
# workaround for https://bugzilla.mozilla.org/show_bug.cgi?id=1549636
file = os.path.basename(path)
module_name = os.path.splitext(file)[0]
mach.load_commands_from_file(os.path.join(topdir, path), module_name)
return mach