Skip to content

Commit

Permalink
Bug 1769405 - Part 1: Move artifact build option to build/moz.configu…
Browse files Browse the repository at this point in the history
…re/init.configure. r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D147011
  • Loading branch information
arai-a committed Jun 14, 2022
1 parent fb9efcf commit 2922546
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 15 deletions.
18 changes: 18 additions & 0 deletions build/moz.configure/init.configure
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,24 @@ def default_project(build_env, js_package):
option("--enable-project", nargs=1, default=default_project, help="Project to build")


# Artifact builds
# ==============================================================

option(
"--enable-artifact-builds",
env="MOZ_ARTIFACT_BUILDS",
help="Download and use prebuilt binary artifacts.",
)


@depends("--enable-artifact-builds")
def artifact_builds(value):
if value:
return True


set_config("MOZ_ARTIFACT_BUILDS", artifact_builds)

# Host and target systems
# ==============================================================
option("--host", nargs=1, help="Define the system type performing the build")
Expand Down
15 changes: 0 additions & 15 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,6 @@ include("build/moz.configure/init.configure")
# - Spidermonkey-specific options and rules should go in js/moz.configure.
# - etc.

option(
"--enable-artifact-builds",
env="MOZ_ARTIFACT_BUILDS",
help="Download and use prebuilt binary artifacts.",
)


@depends("--enable-artifact-builds")
def artifact_builds(value):
if value:
return True


set_config("MOZ_ARTIFACT_BUILDS", artifact_builds)

imply_option(
"--enable-artifact-build-symbols",
depends(artifact_builds)(lambda v: False if v is None else None),
Expand Down

0 comments on commit 2922546

Please sign in to comment.