nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1686646 - Automatically find tools in MOZ_FETCHES_DIR. r=firefox-build-system-reviewers,dmajor

Browse source 
When MOZ_FETCHES_DIR is set, use that instead of ~/.mozbuild. This will
allow to find them on automation without explicit mozconfig help.

Differential Revision: https://phabricator.services.mozilla.com/D101719
This commit is contained in:
Mike Hommey 2021-01-15 04:33:00 +00:00
parent 8362a57bed
commit 758c53a631
1 changed files with 26 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

31
moz.configure
View file

@ -194,8 +194,26 @@ add_old_configure_assignment("DEVELOPER_OPTIONS", developer_options)
set_config("DEVELOPER_OPTIONS", developer_options) set_config("DEVELOPER_OPTIONS", developer_options)
@depends(developer_options) option(
def bootstrap_search_path_order(developer_options): env="MOZ_FETCHES_DIR",
nargs=1,
when="MOZ_AUTOMATION",
help="Directory containing fetched artifacts",
)
@depends("MOZ_FETCHES_DIR", when="MOZ_AUTOMATION")
def moz_fetches_dir(value):
if value:
return value[0]
@depends(developer_options, moz_fetches_dir)
def bootstrap_search_path_order(developer_options, moz_fetches_dir):
if moz_fetches_dir:
log.debug("Prioritizing MOZ_FETCHES_DIR in toolchain path.")
return "prepend"
if developer_options: if developer_options:
log.debug( log.debug(
"Prioritizing mozbuild state dir in toolchain paths because " "Prioritizing mozbuild state dir in toolchain paths because "
@ -211,6 +229,9 @@ def bootstrap_search_path_order(developer_options):
return "append" return "append"
toolchains_base_dir = moz_fetches_dir | mozbuild_state_path
@dependable @dependable
@imports("os") @imports("os")
@imports(_from="os", _import="environ") @imports(_from="os", _import="environ")
@ -220,9 +241,9 @@ def original_path():
@template @template
def bootstrap_search_path(*path_parts): def bootstrap_search_path(*path_parts):
@depends(bootstrap_search_path_order, original_path, mozbuild_state_path) @depends(bootstrap_search_path_order, original_path, toolchains_base_dir)
def bootstrap_search_path(order, original_path, mozbuild_state_path): def bootstrap_search_path(order, original_path, toolchains_base_dir):
path = [os.path.join(mozbuild_state_path, *path_parts)] path = [os.path.join(toolchains_base_dir, *path_parts)]
if order == "prepend": if order == "prepend":
return path + original_path return path + original_path
return original_path + path return original_path + path