Bug 1363811 - Replace is_nightly with milestone.is_nightly. r?chmanchester draft
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 17 May 2017 17:33:25 +0900
changeset 580727 5cb00873e9f60a59bf53f720a112793affe5cb0a
parent 580726 48484f3995aa9395d41597c9c3ba4c12e4ddd85d
child 629371 817640d7cd7f5d4bbfb12f6670b0b93789f7a75e
push id59648
push userbmo:mh+mozilla@glandium.org
push dateThu, 18 May 2017 22:06:14 +0000
reviewerschmanchester
bugs1363811
milestone55.0a1
Bug 1363811 - Replace is_nightly with milestone.is_nightly. r?chmanchester And remove is_nightly.
build/moz.configure/init.configure
mobile/android/moz.configure
toolkit/moz.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -710,25 +710,20 @@ def milestone(build_env, _):
         is_nightly = True
     elif 'a' not in milestone:
         is_release_or_beta = True
 
     return namespace(version=milestone,
                      is_nightly=is_nightly,
                      is_release_or_beta=is_release_or_beta)
 
-@depends(milestone)
-def is_nightly(milestone):
-    return milestone.is_nightly
-
 set_config('GRE_MILESTONE', milestone.version)
-set_config('NIGHTLY_BUILD', is_nightly)
-set_define('NIGHTLY_BUILD', is_nightly)
-add_old_configure_assignment('NIGHTLY_BUILD',
-                             is_nightly)
+set_config('NIGHTLY_BUILD', milestone.is_nightly)
+set_define('NIGHTLY_BUILD', milestone.is_nightly)
+add_old_configure_assignment('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)
 
 # The app update channel is 'default' when not supplied. The value is used in
 # the application's confvars.sh (and is made available to a project specific
 # moz.configure).
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -58,17 +58,17 @@ project_flag('MOZ_ANDROID_MLS_STUMBLER',
              default=True)
 
 project_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
              help='Background service for downloading additional content at runtime',
              default=True)
 
 project_flag('MOZ_ANDROID_CUSTOM_TABS',
              help='Enable support for Android custom tabs',
-             default=is_nightly)
+             default=milestone.is_nightly)
 
 # Enable the Switchboard A/B framework code.
 # Note: The framework is always included in the app. This flag controls
 # usage of the framework.
 project_flag('MOZ_SWITCHBOARD',
              help='Include Switchboard A/B framework on Android',
              default=True)
 
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -535,29 +535,29 @@ project_flag('MOZ_SERVICES_SYNC',
              help='Build Sync Services if required')
 
 project_flag('MOZ_ANDROID_HISTORY',
              help='Enable Android History instead of Places',
              set_as_define=True)
 
 option(env='MOZ_PHOTON_ANIMATIONS',
        help='Enable Photon UI animations',
-       default=is_nightly)
+       default=milestone.is_nightly)
 
 @depends('MOZ_PHOTON_ANIMATIONS')
 def photon_animations(value):
     if value:
         return bool(value)
 
 set_config('MOZ_PHOTON_ANIMATIONS', photon_animations)
 set_define('MOZ_PHOTON_ANIMATIONS', photon_animations)
 
 option(env='MOZ_PHOTON_THEME',
        help='Enable Photon theme',
-       default=is_nightly)
+       default=milestone.is_nightly)
 
 @depends('MOZ_PHOTON_THEME')
 def photon_theme(value):
     if value:
         return bool(value)
 
 set_config('MOZ_PHOTON_THEME', photon_theme)
 set_define('MOZ_PHOTON_THEME', photon_theme)