зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1719852 - Disable MOZ_REQUIRE_SIGNING on esr. r=jcristau,firefox-build-system-reviewers,mhentges
It was enabled in bug 1712633 by mistake. Because there wasn't a way to distinguish esr yet, we add one, and while at it, expose it to the build system. Differential Revision: https://phabricator.services.mozilla.com/D119682
This commit is contained in:
Родитель
155e5f6d8b
Коммит
a6909dc7da
|
@ -1259,6 +1259,7 @@ def milestone(build_env, build_project, version_path, _):
|
|||
is_nightly=is_nightly,
|
||||
is_release_or_beta=is_release_or_beta,
|
||||
is_early_beta_or_earlier=is_early_beta_or_earlier,
|
||||
is_esr=app_version_display.endswith("esr"),
|
||||
app_version=app_version,
|
||||
app_version_display=app_version_display,
|
||||
)
|
||||
|
@ -1270,6 +1271,8 @@ set_define("NIGHTLY_BUILD", milestone.is_nightly)
|
|||
set_config("RELEASE_OR_BETA", milestone.is_release_or_beta)
|
||||
set_define("RELEASE_OR_BETA", milestone.is_release_or_beta)
|
||||
add_old_configure_assignment("RELEASE_OR_BETA", milestone.is_release_or_beta)
|
||||
set_config("ESR", milestone.is_esr)
|
||||
set_define("ESR", milestone.is_esr)
|
||||
set_config("EARLY_BETA_OR_EARLIER", milestone.is_early_beta_or_earlier)
|
||||
set_define("EARLY_BETA_OR_EARLIER", milestone.is_early_beta_or_earlier)
|
||||
add_old_configure_assignment(
|
||||
|
|
|
@ -1400,12 +1400,17 @@ set_config("ACCESSIBILITY", accessibility)
|
|||
set_define("ACCESSIBILITY", accessibility)
|
||||
add_old_configure_assignment("ACCESSIBILITY", accessibility)
|
||||
|
||||
|
||||
# Addon signing
|
||||
# ==============================================================
|
||||
@depends(milestone)
|
||||
def require_signing(milestone):
|
||||
return milestone.is_release_or_beta and not milestone.is_esr
|
||||
|
||||
|
||||
option(
|
||||
env="MOZ_REQUIRE_SIGNING",
|
||||
default=milestone.is_release_or_beta,
|
||||
default=require_signing,
|
||||
help="Enforce that add-ons are signed by the trusted root",
|
||||
)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче