bug 1361361: allow MAR_CHANNEL_ID and ACCEPTED_MAR_CHANNEL_IDS to be set different for DevEdition. r=nalexander,rstrong

MozReview-Commit-ID: 971osZP9llA
This commit is contained in:
Ben Hearsum 2017-05-05 14:44:33 -04:00
parent af30648746
commit fd01a9ec9f

View File

@ -47,12 +47,17 @@ MOZ_APP_VERSION_DISPLAY=$FIREFOX_VERSION_DISPLAY
MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
# This should usually be the same as the value MAR_CHANNEL_ID.
# ACCEPTED_MAR_CHANNEL_IDS should usually be the same as the value MAR_CHANNEL_ID.
# If more than one ID is needed, then you should use a comma separated list
# of values.
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
MAR_CHANNEL_ID=firefox-mozilla-central
if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
MAR_CHANNEL_ID=firefox-mozilla-aurora
else
ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
MAR_CHANNEL_ID=firefox-mozilla-central
fi
MOZ_PROFILE_MIGRATOR=1
MOZ_JSDOWNLOADS=1