diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
| commit | d78e03d528ba9e7395160a23bce23726067600dd (patch) | |
| tree | e8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /build | |
| parent | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff) | |
| parent | 33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff) | |
| download | uxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz | |
Merge branch 'master' into 1829
* master:
No issue - Update README and SECURITY
Issue #1885 - Follow-up: Update error message if invalid rootMargin specified.
Issue #1879 - Follow-up: Update config/external/nss/target to security/target.
Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver.
Issue #1879 - Revert changes to cryptox.h
Revert "Issue #1879 - spot-fix typo in cryptox.h"
Issue #1879 - spot-fix typo in cryptox.h
Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement
Issue #21 - Remove use counters telemetry
Issue #1881 - Interpret empty or whitespace root margin string as zero length
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Issue #1880 - Boot Comic Sans out of the font configuration.
Diffstat (limited to 'build')
| -rw-r--r-- | build/moz.configure/init.configure | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure index 893da821cd..f0d6b791b6 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure @@ -666,11 +666,7 @@ set_define('MOZ_BUILD_APP', build_project) add_old_configure_assignment('MOZ_BUILD_APP', build_project) -# set RELEASE_OR_BETA and NIGHTLY_BUILD variables depending on the cycle we're in -# The logic works like this: -# - if we have "a1" in GRE_MILESTONE, we're building Nightly (define NIGHTLY_BUILD) -# - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora -# - otherwise, we're building Release/Beta (define RELEASE_OR_BETA) +# set RELEASE_OR_BETA and NIGHTLY_BUILD variables for compatibility @depends(check_build_environment, '--help') @imports(_from='__builtin__', _import='open') def milestone(build_env, _): @@ -680,12 +676,8 @@ def milestone(build_env, _): with open(milestone_path, 'r') as fh: milestone = fh.read().splitlines()[-1] - is_nightly = is_release_or_beta = None - - if 'a1' in milestone: - is_nightly = True - elif 'a' not in milestone: - is_release_or_beta = True + is_nightly = None + is_release_or_beta = True return namespace(version=milestone, is_nightly=is_nightly, |