Bug 1363811 - Replace is_nightly with milestone.is_nightly. r=cmanchester+432261

And remove is_nightly.
This commit is contained in:
Mike Hommey 2017-05-17 17:33:25 +09:00
Родитель f10295dbae
Коммит 282a2bc3b8
3 изменённых файлов: 6 добавлений и 11 удалений

Просмотреть файл

@ -715,15 +715,10 @@ def milestone(build_env, _):
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',

Просмотреть файл

@ -63,7 +63,7 @@ project_flag('MOZ_ANDROID_DOWNLOAD_CONTENT_SERVICE',
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

Просмотреть файл

@ -540,7 +540,7 @@ project_flag('MOZ_ANDROID_HISTORY',
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):
@ -552,7 +552,7 @@ 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):