Bug 1502457 - Move MOZILLA_OFFICIAL to init.configure. r=nalexander
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 16 Nov 2018 01:16:31 +0000
changeset 503381 83e6f0d47a8050ab1dc796dc0c795eac2f8cda4c
parent 503380 fd205107b0f4beac469995f809b7c77d6bddde0a
child 503382 88ba9f723934257d34fde00d87b5ed4f54e258ca
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1502457
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1502457 - Move MOZILLA_OFFICIAL to init.configure. r=nalexander Depends on D11985 Differential Revision: https://phabricator.services.mozilla.com/D11986
build/moz.configure/init.configure
moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -1046,16 +1046,31 @@ def js_option(*args, **kwargs):
     @depends(opt.option, build_project, when=kwargs.get('when'))
     def js_option(value, build_project):
         if build_project != 'js':
             return value.format(opt.option)
 
     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)
 # - otherwise, if we have "a" in GRE_MILESTONE, we're building Nightly or Aurora
 # - otherwise, we're building Release/Beta (define RELEASE_OR_BETA)
 @depends(check_build_environment, build_project, '--help')
 @imports(_from='__builtin__', _import='open')
 @imports('os')
--- a/moz.configure
+++ b/moz.configure
@@ -64,28 +64,16 @@ js_option('--disable-tests',
 @depends('--disable-tests')
 def enable_tests(value):
     if value:
         return True
 
 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:
         return '0'
 
 set_define('GTEST_HAS_RTTI', gtest_has_rtti)
 
 @depends(target, enable_tests)