Bug 818333 - Make confvars.sh for desktop the same across branches where possible. r=glandium
authorRobert Strong <robert.bugzilla@gmail.com>
Thu, 13 Dec 2012 09:43:39 -0800
changeset 115918 3cfc257e29a5a3725207fbaa0bf184e3719c8b73
parent 115917 049f91872fbfbbb241f65ca581988a2ed0e6f2f8
child 115919 29e9bc98ea775ffac363b77370f115184ad69d4b
push id19628
push userrstrong@mozilla.com
push dateThu, 13 Dec 2012 17:43:44 +0000
treeherdermozilla-inbound@3cfc257e29a5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs818333
milestone20.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 818333 - Make confvars.sh for desktop the same across branches where possible. r=glandium
browser/confvars.sh
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -18,40 +18,58 @@ if test "$OS_ARCH" = "WINNT"; then
             "$MOZ_UPDATE_CHANNEL" = "release"; then
       if ! test "$MOZ_DEBUG"; then
         MOZ_STUB_INSTALLER=1
       fi
     fi
   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
 MOZ_SERVICES_COMMON=1
 MOZ_SERVICES_CRYPTO=1
 MOZ_SERVICES_METRICS=1
 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
 MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1