Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release

2024-09-13 09:24:08 -07:00 · 2016-04-25 09:34:48 -07:00 · 2016-04-25 09:34:48 -07:00 · efbd73db65
commit efbd73db65
parent b8564961ed
32 changed files with 33 additions and 33 deletions
--- a/2
+++ b/2
@ -23,4 +23,4 @@
 # don't change CLOBBER for WebIDL changes any more.


-Bug 1264786 needed a clobber and bug 1254356 hasn't been uplifted to aurora to fix the clobberer
+Merge day clobber
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@ -18,7 +18,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux32/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux32/l10n-mozconfig
@ -3,7 +3,7 @@ no_sccache=1
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 . $topsrcdir/build/unix/mozconfig.linux32

--- a/browser/config/mozconfigs/linux32/nightly
+++ b/browser/config/mozconfigs/linux32/nightly
@ -8,7 +8,7 @@ ac_add_options --enable-verify-mar
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@ -16,7 +16,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/linux64/l10n-mozconfig
+++ b/browser/config/mozconfigs/linux64/l10n-mozconfig
@ -3,7 +3,7 @@ no_sccache=1
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 . $topsrcdir/build/unix/mozconfig.linux

--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@ -8,7 +8,7 @@ ac_add_options --enable-verify-mar
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- 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
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@ -10,7 +10,7 @@ if test "${MOZ_UPDATE_CHANNEL}" = "nightly"; then
 ac_add_options --with-macbundlename-prefix=Firefox
 fi

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@ -18,7 +18,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/browser/config/mozconfigs/macosx64/l10n-mozconfig
@ -3,7 +3,7 @@
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/macosx64/nightly
+++ b/browser/config/mozconfigs/macosx64/nightly
@ -16,7 +16,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/whitelist
+++ b/browser/config/mozconfigs/whitelist
@ -10,7 +10,7 @@ all_platforms = ['win64', 'win32', 'linux32', 'linux64', 'macosx-universal']
 for platform in all_platforms:
    whitelist['nightly'][platform] = [
        'ac_add_options --enable-update-channel=nightly',
-        'ac_add_options --with-branding=browser/branding/aurora',
+        'ac_add_options --with-branding=browser/branding/nightly',
        'ac_add_options --enable-profiling',
        'mk_add_options CLIENT_PY_ARGS="--hg-options=\'--verbose --time\' --hgtool=../tools/buildfarm/utils/hgtool.py --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print"'
    ]
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@ -26,7 +26,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"

--- a/browser/config/mozconfigs/win32/l10n-mozconfig
+++ b/browser/config/mozconfigs/win32/l10n-mozconfig
@ -4,7 +4,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-windows-version=603
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 export MOZILLA_OFFICIAL=1

--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@ -4,7 +4,7 @@

 ac_add_options --enable-verify-mar

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.common.override"
 . "$topsrcdir/build/mozconfig.cache"
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@ -26,7 +26,7 @@ ac_add_options --enable-warnings-as-errors
 # Package js shell.
 export MOZ_PACKAGE_JSSHELL=1

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . $topsrcdir/build/win64/mozconfig.vs2013

--- a/browser/config/mozconfigs/win64/l10n-mozconfig
+++ b/browser/config/mozconfigs/win64/l10n-mozconfig
@ -5,7 +5,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-update-packaging
 ac_add_options --with-l10n-base=../../l10n
 ac_add_options --with-windows-version=603
-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --enable-official-branding

 export MOZILLA_OFFICIAL=1

--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@ -5,7 +5,7 @@

 ac_add_options --enable-verify-mar

-ac_add_options --with-branding=browser/branding/aurora
+ac_add_options --with-branding=browser/branding/nightly

 . "$topsrcdir/build/mozconfig.rust"

--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@ -1 +1 @@
-47.0a2
+47.0
--- a/browser/config/version_display.txt
+++ b/browser/config/version_display.txt
@ -1 +1 @@
-47.0a2
+47.0b1
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@ -50,9 +50,9 @@ 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-aurora
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-beta,firefox-mozilla-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-aurora
+MAR_CHANNEL_ID=firefox-mozilla-beta
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
--- a/config/milestone.txt
+++ b/config/milestone.txt
@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------

-47.0a2
+47.0
--- a/mobile/android/config/mozconfigs/android-api-15/debug
+++ b/mobile/android/config/mozconfigs/android-api-15/debug
@ -10,7 +10,7 @@ ac_add_options --target=arm-linux-androideabi
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
--- a/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/l10n-nightly
@ -17,7 +17,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 export MOZILLA_OFFICIAL=1
 export MOZ_DISABLE_GECKOVIEW=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 ac_add_options --disable-stdcxx-compat

--- a/mobile/android/config/mozconfigs/android-api-15/nightly
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly
@ -6,7 +6,7 @@
 ac_add_options --with-android-min-sdk=15
 ac_add_options --target=arm-linux-androideabi

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/debug
@ -14,7 +14,7 @@ ac_add_options --target=arm-linux-androideabi
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/l10n-nightly
@ -19,7 +19,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 export MOZILLA_OFFICIAL=1
 export MOZ_DISABLE_GECKOVIEW=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 ac_add_options --disable-stdcxx-compat

--- a/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly
+++ b/mobile/android/config/mozconfigs/android-api-9-10-constrained/nightly
@ -10,7 +10,7 @@ export MOZ_DISABLE_GECKOVIEW=1

 ac_add_options --target=arm-linux-androideabi

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@ -10,7 +10,7 @@ ac_add_options --with-android-min-sdk=15
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # Treat warnings as errors (modulo ALLOW_COMPILER_WARNINGS).
 ac_add_options --enable-warnings-as-errors
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@ -16,7 +16,7 @@ ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 export MOZILLA_OFFICIAL=1
 export MOZ_DISABLE_GECKOVIEW=1

-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 ac_add_options --disable-stdcxx-compat

--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@ -5,7 +5,7 @@ ac_add_options --with-android-min-sdk=15



-ac_add_options --with-branding=mobile/android/branding/aurora
+ac_add_options --with-branding=mobile/android/branding/beta

 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 @ -1 +1 @@
 .0a2
 .0
 @ -1 +1 @@
 .0a2
 .0b1