Bug 818333 - Make confvars.sh for desktop the same across branches wh…

…ere possible. r=glandium

browser/confvars.sh

@@ -23,6 +23,40 @@ if test "$OS_ARCH" = "WINNT"; then
   fi
 fi
 
+# The value of 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.
+# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
+case "$MOZ_UPDATE_CHANNEL" in
+release|aurora|esr)
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-$MOZ_UPDATE_CHANNEL
+  MAR_CHANNEL_ID=firefox-mozilla-$MOZ_UPDATE_CHANNEL
+  ;;
+beta)
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
+  MAR_CHANNEL_ID=firefox-mozilla-beta
+  ;;
+*)
+  ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-central
+  MAR_CHANNEL_ID=firefox-mozilla-central
+  ;;
+esac
+
+# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
+# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
+# because branding dependencies are broken.
+# MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
+# specified. It should never point to the "official" branding directory.
+# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
+# "nightly" branding (until bug 659568 is fixed).
+# For the mozilla-aurora repository, use "aurora".
+MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
+if test "$MOZ_UPDATE_CHANNEL" = "aurora"; then
+  MOZ_BRANDING_DIRECTORY=browser/branding/aurora
+else
+  MOZ_BRANDING_DIRECTORY=browser/branding/nightly
+fi
+
 MOZ_CHROME_FILE_FORMAT=omni
 MOZ_SAFE_BROWSING=1
 MOZ_SERVICES_AITC=1
@@ -33,23 +67,7 @@ MOZ_SERVICES_NOTIFICATIONS=1
 MOZ_SERVICES_SYNC=1
 MOZ_APP_VERSION=$FIREFOX_VERSION
 MOZ_EXTENSIONS_DEFAULT=" gio"
-# MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
-# Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results,
-# because branding dependencies are broken.
-# MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
-# specified. It should never point to the "official" branding directory.
-# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
-# "nightly" branding (until bug 659568 is fixed).
-# For the mozilla-aurora repository, use "aurora".
-MOZ_BRANDING_DIRECTORY=browser/branding/nightly
-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.
-# 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
 MOZ_PROFILE_MIGRATOR=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1