Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-21 17:59:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1502457 - Move MOZILLA_OFFICIAL to init.configure. r=nalexander

Browse Source 
Depends on D11985

Differential Revision: https://phabricator.services.mozilla.com/D11986

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2018-11-16 01:16:31 +00:00
parent f8aec6c458
commit a9d88a2903
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/moz.configure/init.configure
View File

@ -1051,6 +1051,21 @@ def js_option(*args, **kwargs):
add_old_configure_arg(js_option)
js_option(env='MOZILLA_OFFICIAL',
help='Build an official release')
@depends('MOZILLA_OFFICIAL')
def mozilla_official(official):
if official:
return True
set_config('MOZILLA_OFFICIAL', mozilla_official)
set_define('MOZILLA_OFFICIAL', mozilla_official)
add_old_configure_assignment('MOZILLA_OFFICIAL', mozilla_official)
# 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)

12
moz.configure
View File

@ -69,18 +69,6 @@ def enable_tests(value):
set_config('ENABLE_TESTS', enable_tests)
set_define('ENABLE_TESTS', enable_tests)
js_option(env='MOZILLA_OFFICIAL',
help='Build an official release')
@depends('MOZILLA_OFFICIAL')
def mozilla_official(official):
if official:
return True
set_config('MOZILLA_OFFICIAL', mozilla_official)
set_define('MOZILLA_OFFICIAL', mozilla_official)
add_old_configure_assignment('MOZILLA_OFFICIAL', mozilla_official)
@depends(enable_tests)
def gtest_has_rtti(value):
if value: