Bug 717824: make --with-macbundle-prefix dependent on update channel in nightly mozconfigs, r=bhearsum/catlee
authorGavin Sharp <gavin@gavinsharp.com>
Fri, 31 Oct 2014 12:40:59 -0700
changeset 213291 c4a1fa5d2cf48521ee42ef7cfd0f8370866551a7
parent 213290 6bcd67382275c4d8288d7df84e50e59900da861a
child 213292 4f1e247709b9d1c2bec17d182f2568ed7e6bd578
push id9690
push usergsharp@mozilla.com
push dateFri, 31 Oct 2014 19:43:39 +0000
treeherderfx-team@c4a1fa5d2cf4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum, catlee
bugs717824
milestone36.0a1
Bug 717824: make --with-macbundle-prefix dependent on update channel in nightly mozconfigs, r=bhearsum/catlee
browser/config/mozconfigs/macosx-universal/l10n-mozconfig
browser/config/mozconfigs/macosx-universal/nightly
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/debug-asan
browser/config/mozconfigs/whitelist
--- a/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx-universal/l10n-mozconfig
@@ -1,11 +1,15 @@
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 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
 ac_add_options --with-macbundlename-prefix=Firefox
+fi
+
 . "$topsrcdir/build/mozconfig.cache"
 
 export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -4,11 +4,13 @@ ac_add_options --disable-install-strip
 ac_add_options --enable-signmar
 ac_add_options --enable-profiling
 ac_add_options --enable-instruments
 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
 ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -4,17 +4,19 @@ ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-accessibility
 ac_add_options --enable-signmar
 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
 ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/debug-asan
+++ b/browser/config/mozconfigs/macosx64/debug-asan
@@ -6,14 +6,16 @@ ac_add_options --enable-optimize="-O1"
 ac_add_options --enable-accessibility
 ac_add_options --with-google-oauth-api-keyfile=/builds/google-oauth-api.key
 
 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
 ac_add_options --with-macbundlename-prefix=Firefox
+fi
 
 # Need this to prevent name conflicts with the normal nightly build packages
 export MOZ_PKG_SPECIAL=asan
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@@ -43,17 +43,19 @@ whitelist['nightly']['linux64'] += [
     "mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py 10'",
     'STRIP_FLAGS="--strip-debug"',
     'ac_add_options --with-ccache=/usr/bin/ccache',
     '. "$topsrcdir/build/mozconfig.cache"',
     'ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling',
 ]
 
 whitelist['nightly']['macosx-universal'] += [
+    'if test "${MOZ_UPDATE_CHANNEL}" = "nightly" -o "${MOZ_UPDATE_CHANNEL}" = "aurora"; then',
     'ac_add_options --with-macbundlename-prefix=Firefox',
+    'fi',
     'mk_add_options MOZ_MAKE_FLAGS="-j12"',
     'ac_add_options --with-ccache',
     '. "$topsrcdir/build/mozconfig.cache"',
     'ac_add_options --disable-install-strip',
     'ac_add_options --enable-instruments',
     'ac_add_options --enable-dtrace',
 ]