From 3ea96a913b31b838b97c8ac7dd03d078efa9094d Mon Sep 17 00:00:00 2001 From: Panos Astithas Date: Tue, 28 Oct 2014 20:59:17 +0200 Subject: [PATCH] Use the full name as the short name (bug 1090324). r=gavin --HG-- extra : rebase_source : a5e6721a8ef53f611e36747c5ef3a7cec01f9f35 --- browser/branding/aurora/configure.sh | 2 +- browser/branding/aurora/locales/en-US/brand.dtd | 2 +- browser/branding/aurora/locales/en-US/brand.properties | 2 +- browser/config/mozconfigs/macosx-universal/l10n-mozconfig | 2 +- browser/config/mozconfigs/macosx-universal/nightly | 2 +- browser/config/mozconfigs/macosx64/debug | 2 +- browser/config/mozconfigs/macosx64/debug-asan | 2 +- browser/config/mozconfigs/whitelist | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/browser/branding/aurora/configure.sh b/browser/branding/aurora/configure.sh index cc60251cb7e5..511fcfa473fa 100644 --- a/browser/branding/aurora/configure.sh +++ b/browser/branding/aurora/configure.sh @@ -2,5 +2,5 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOZ_APP_DISPLAYNAME=FirefoxDevEdition +MOZ_APP_DISPLAYNAME=FirefoxDeveloperEdition MOZ_APP_REMOTINGNAME=firefox-dev diff --git a/browser/branding/aurora/locales/en-US/brand.dtd b/browser/branding/aurora/locales/en-US/brand.dtd index 8050f83e8004..9ac934aca36e 100644 --- a/browser/branding/aurora/locales/en-US/brand.dtd +++ b/browser/branding/aurora/locales/en-US/brand.dtd @@ -2,7 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + diff --git a/browser/branding/aurora/locales/en-US/brand.properties b/browser/branding/aurora/locales/en-US/brand.properties index f3732b58ac30..5c4f2c30dbbd 100644 --- a/browser/branding/aurora/locales/en-US/brand.properties +++ b/browser/branding/aurora/locales/en-US/brand.properties @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -brandShortName=FirefoxDevEdition +brandShortName=Firefox Developer Edition brandFullName=Firefox Developer Edition vendorShortName=Mozilla diff --git a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig index 8253c9e2de06..bae4c14c9289 100644 --- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig +++ b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig @@ -4,7 +4,7 @@ ac_add_options --with-l10n-base=../../../l10n ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL} ac_add_options --enable-update-packaging -if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then ac_add_options --with-macbundlename-prefix=Firefox fi diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly index defd1ef67180..55e35f77ccd3 100644 --- a/browser/config/mozconfigs/macosx-universal/nightly +++ b/browser/config/mozconfigs/macosx-universal/nightly @@ -9,7 +9,7 @@ ac_add_options --enable-dtrace # Nightlies only since this has a cost in performance ac_add_options --enable-js-diagnostics -if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then ac_add_options --with-macbundlename-prefix=Firefox fi diff --git a/browser/config/mozconfigs/macosx64/debug b/browser/config/mozconfigs/macosx64/debug index d18041b53bad..b4dab65cfdde 100644 --- a/browser/config/mozconfigs/macosx64/debug +++ b/browser/config/mozconfigs/macosx64/debug @@ -9,7 +9,7 @@ ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key # Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then ac_add_options --with-macbundlename-prefix=Firefox fi diff --git a/browser/config/mozconfigs/macosx64/debug-asan b/browser/config/mozconfigs/macosx64/debug-asan index 0ae3ed1ed7e0..9f8dc22ff5c4 100644 --- a/browser/config/mozconfigs/macosx64/debug-asan +++ b/browser/config/mozconfigs/macosx64/debug-asan @@ -11,7 +11,7 @@ ac_add_options --disable-unified-compilation # Package js shell. export MOZ_PACKAGE_JSSHELL=1 -if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then +if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then ac_add_options --with-macbundlename-prefix=Firefox fi diff --git a/browser/config/mozconfigs/whitelist b/browser/config/mozconfigs/whitelist index 6bc0a5e43294..59d29bfd7b3c 100644 --- a/browser/config/mozconfigs/whitelist +++ b/browser/config/mozconfigs/whitelist @@ -48,7 +48,7 @@ whitelist['nightly']['linux64'] += [ ] whitelist['nightly']['macosx-universal'] += [ - 'if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then', + 'if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then', 'ac_add_options --with-macbundlename-prefix=Firefox', 'fi', 'mk_add_options MOZ_MAKE_FLAGS="-j12"',