Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
authorffxbld <release@mozilla.com>
Mon, 21 Jul 2014 14:19:07 -0700
changeset 217232 428d4d3c8588d8f3ba60dc9026b528c13645d29a
parent 217231 494a0d3ce52ec331795a5819665490103410faa6
child 217233 ed6f81562f094129f437650fdb07eacb3c551801
push id515
push userraliiev@mozilla.com
push dateMon, 06 Oct 2014 12:51:51 +0000
treeherdermozilla-release@267c7a481bef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrelease
milestone33.0a2
Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release
CLOBBER
b2g/confvars.sh
browser/config/mozconfigs/linux32/nightly
browser/config/mozconfigs/linux64/nightly
browser/config/mozconfigs/macosx-universal/nightly
browser/config/mozconfigs/win32/nightly
browser/config/mozconfigs/win64/nightly
browser/config/version.txt
browser/confvars.sh
browser/locales/all-locales
browser/locales/shipped-locales
config/milestone.txt
mobile/android/config/mozconfigs/android-armv6/debug
mobile/android/config/mozconfigs/android-armv6/l10n-nightly
mobile/android/config/mozconfigs/android-armv6/nightly
mobile/android/config/mozconfigs/android-x86/debug
mobile/android/config/mozconfigs/android-x86/l10n-nightly
mobile/android/config/mozconfigs/android-x86/nightly
mobile/android/config/mozconfigs/android/debug
mobile/android/config/mozconfigs/android/l10n-nightly
mobile/android/config/mozconfigs/android/nightly
mobile/android/confvars.sh
mobile/android/locales/all-locales
mobile/android/locales/maemo-locales
--- a/CLOBBER
+++ b/CLOBBER
@@ -17,9 +17,9 @@
 #
 # Modifying this file will now automatically clobber the buildbot machines \o/
 #
 
 # Are you updating CLOBBER because you think it's needed for your WebIDL
 # changes to stick? As of bug 928195, this shouldn't be necessary! Please
 # don't change CLOBBER for WebIDL changes any more.
 
-Clobber to work around bug 959928.
+Merge day clobber
\ No newline at end of file
--- a/b2g/confvars.sh
+++ b/b2g/confvars.sh
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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_BASENAME=B2G
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=33.0a1
+MOZ_APP_VERSION=33.0a2
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_UA_OS_AGNOSTIC=1
 
 MOZ_B2G_VERSION=2.1.0.0-prerelease
 MOZ_B2G_OS_NAME=Boot2Gecko
 
 MOZ_BRANDING_DIRECTORY=b2g/branding/unofficial
--- a/browser/config/mozconfigs/linux32/nightly
+++ b/browser/config/mozconfigs/linux32/nightly
@@ -1,13 +1,13 @@
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 
 ac_add_options --enable-signmar
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
+
+
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
--- a/browser/config/mozconfigs/linux64/nightly
+++ b/browser/config/mozconfigs/linux64/nightly
@@ -1,13 +1,13 @@
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 
 ac_add_options --enable-signmar
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
+
+
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling and debugging and only increases the package size
 # by 2 MBs.
 STRIP_FLAGS="--strip-debug"
--- a/browser/config/mozconfigs/macosx-universal/nightly
+++ b/browser/config/mozconfigs/macosx-universal/nightly
@@ -1,13 +1,13 @@
 . "$topsrcdir/browser/config/mozconfigs/macosx-universal/common-opt"
 
 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
 
 ac_add_options --with-macbundlename-prefix=Firefox
 
--- a/browser/config/mozconfigs/win32/nightly
+++ b/browser/config/mozconfigs/win32/nightly
@@ -1,11 +1,11 @@
 . "$topsrcdir/browser/config/mozconfigs/win32/common-opt"
 
 ac_add_options --enable-signmar
-ac_add_options --enable-profiling
+
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 . "$topsrcdir/build/mozconfig.cache"
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/mozconfigs/win64/nightly
+++ b/browser/config/mozconfigs/win64/nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/win64/common-opt"
 
 ac_add_options --enable-signmar
-ac_add_options --enable-profiling
+
 
 # Nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 . $topsrcdir/build/win64/mozconfig.vs2010
 
 . "$topsrcdir/build/mozconfig.common.override"
--- a/browser/config/version.txt
+++ b/browser/config/version.txt
@@ -1,1 +1,1 @@
-33.0a1
+33.0a2
--- a/browser/confvars.sh
+++ b/browser/confvars.sh
@@ -36,25 +36,25 @@ 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_BRANDING_DIRECTORY=browser/branding/aurora
 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
+ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-aurora
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-central
+MAR_CHANNEL_ID=firefox-mozilla-aurora
 MOZ_PROFILE_MIGRATOR=1
 MOZ_EXTENSION_MANAGER=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBAPP_RUNTIME=1
 MOZ_MEDIA_NAVIGATOR=1
 if test "$OS_TARGET" = "WINNT" -o "$OS_TARGET" = "Darwin"; then
   MOZ_FOLD_LIBS=1
 fi
--- a/browser/locales/all-locales
+++ b/browser/locales/all-locales
@@ -1,40 +1,97 @@
+ach
+af
+an
 ar
+as
 ast
+az
+be
+bg
+bn-BD
+bn-IN
+br
+bs
+ca
 cs
+csb
+cy
+da
 de
+dsb
+el
 en-GB
+en-ZA
 eo
 es-AR
 es-CL
 es-ES
 es-MX
+et
+eu
 fa
+ff
+fi
 fr
 fy-NL
+ga-IE
+gd
 gl
+gu-IN
 he
+hi-IN
+hr
+hsb
 hu
+hy-AM
 id
+is
 it
 ja
 ja-JP-mac
+ka
 kk
+km
+kn
 ko
+ku
+lij
 lt
 lv
+mai
+mk
+ml
+mr
+ms
+my
 nb-NO
 nl
 nn-NO
 oc
+or
+pa-IN
 pl
 pt-BR
 pt-PT
+rm
+ro
 ru
+si
 sk
+sl
+son
+sq
+sr
 sv-SE
+sw
+ta
+te
 th
 tr
 uk
+ur
+uz
 vi
+xh
 zh-CN
 zh-TW
+zu
--- a/browser/locales/shipped-locales
+++ b/browser/locales/shipped-locales
@@ -1,62 +1,70 @@
+ach
 af
 an
 ar
+as
 ast
 be
 bg
 bn-BD
 bn-IN
 br
 bs
 ca
 cs
+csb
 cy
 da
 de
 el
 en-GB
 en-US
 en-ZA
 eo
 es-AR
 es-CL
 es-ES
 es-MX
 et
 eu
 fa
+ff
 fi
 fr
 fy-NL
 ga-IE
 gd
 gl
 gu-IN
 he
 hi-IN
 hr
+hsb
 hu
 hy-AM
 id
 is
 it
 ja linux win32
 ja-JP-mac osx
 kk
+km
 kn
 ko
 ku
+lij
 lt
 lv
 mai
 mk
 ml
 mr
+ms
 nb-NO
 nl
 nn-NO
 or
 pa-IN
 pl
 pt-BR
 pt-PT
@@ -65,16 +73,17 @@ ro
 ru
 si
 sk
 sl
 son
 sq
 sr
 sv-SE
+sw
 ta
 te
 th
 tr
 uk
 vi
 xh
 zh-CN
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
 #    x.x.x.x
 #    x.x.x+
 #
 # Referenced by milestone.pl.
 # Hopefully I'll be able to automate replacement of *all*
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-33.0a1
+33.0a2
--- a/mobile/android/config/mozconfigs/android-armv6/debug
+++ b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -7,14 +7,14 @@ ac_add_options --disable-unified-compila
 # Android
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Android
@@ -15,11 +15,11 @@ ac_add_options --with-arch=armv6
 
 ac_add_options --enable-updater
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 
 export MOZILLA_OFFICIAL=1
 export MOZ_PKG_SPECIAL=armv6
 export MOZ_DISABLE_GECKOVIEW=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-armv6/nightly
+++ b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -1,13 +1,13 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --target=arm-linux-androideabi
 ac_add_options --with-arch=armv6
 
 export MOZ_PKG_SPECIAL=armv6
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/debug
+++ b/mobile/android/config/mozconfigs/android-x86/debug
@@ -5,14 +5,14 @@ ac_add_options --enable-debug
 ac_add_options --disable-unified-compilation
 
 # Android
 ac_add_options --target=i386-linux-android
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,23 +1,23 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Android
 ac_add_options --target=i386-linux-android
 
 ac_add_options --enable-updater
 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/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/nightly
+++ b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -1,16 +1,16 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 ac_add_options --target=i386-linux-android
 
 ac_add_options --enable-profiling
 ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mobile/android/config/mozconfigs/android/debug
+++ b/mobile/android/config/mozconfigs/android/debug
@@ -4,14 +4,14 @@
 ac_add_options --enable-debug
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # Treat warnings as errors in directories with FAIL_ON_WARNINGS.
 ac_add_options --enable-warnings-as-errors
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android/l10n-nightly
+++ b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -1,12 +1,12 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # L10n
-ac_add_options --with-l10n-base=../../l10n-central
+ac_add_options --with-l10n-base=..
 
 # Global options
 ac_add_options --disable-tests
 
 # Mozilla-Central nightlies only since this has a cost in performance
 ac_add_options --enable-js-diagnostics
 
 # Android
@@ -15,11 +15,11 @@ ac_add_options --target=arm-linux-androi
 ac_add_options --with-android-version=9
 ac_add_options --with-system-zlib
 ac_add_options --enable-updater
 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/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android/nightly
+++ b/mobile/android/config/mozconfigs/android/nightly
@@ -1,17 +1,17 @@
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
-ac_add_options --enable-profiling
-ac_add_options --disable-elf-hack # --enable-elf-hack conflicts with --enable-profiling
+
+
 
 # Android
 ac_add_options --target=arm-linux-androideabi
 
-ac_add_options --with-branding=mobile/android/branding/nightly
+ac_add_options --with-branding=mobile/android/branding/aurora
 
 # This will overwrite the default of stripping everything and keep the symbol table.
 # This is useful for profiling with eideticker. See bug 788680
 STRIP_FLAGS="--strip-debug"
 
 export MOZILLA_OFFICIAL=1
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mobile/android/confvars.sh
+++ b/mobile/android/confvars.sh
@@ -1,16 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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_BASENAME=Fennec
 MOZ_APP_VENDOR=Mozilla
 
-MOZ_APP_VERSION=33.0a1
+MOZ_APP_VERSION=33.0a2
 MOZ_APP_UA_NAME=Firefox
 
 MOZ_BRANDING_DIRECTORY=mobile/android/branding/unofficial
 MOZ_OFFICIAL_BRANDING_DIRECTORY=mobile/android/branding/official
 # MOZ_APP_DISPLAYNAME is set by branding/configure.sh
 
 MOZ_SAFE_BROWSING=1
 
--- a/mobile/android/locales/all-locales
+++ b/mobile/android/locales/all-locales
@@ -1,46 +1,81 @@
+ach
+af
+ak
 ar
+an
+as
 be
+bn-IN
 ca
 cs
+cy
 da
 de
+dsb
 el
+en-GB
+en-ZA
 es-AR
 es-ES
+es-MX
 et
 eu
 fa
+ff
 fi
 fr
 fy-NL
 ga-IE
 gd
 gl
+gu-IN
 he
+hi-IN
+hsb
 hu
+hy-AM
 id
+is
 it
+ja-JP-mac
 ja
-ja-JP-mac
+kk
+kn
 ko
+lg
+lij
 lt
+lv
+mai
+ml
+mr
+ms
 nb-NO
 nl
 nn-NO
+nso
+or
 pa-IN
 pl
 pt-BR
 pt-PT
 ro
 ru
 sk
 sl
+son
 sq
 sr
 sv-SE
+sw
+ta
+te
 th
 tr
 uk
 vi
+wo
+xh
 zh-CN
 zh-TW
+zu
--- a/mobile/android/locales/maemo-locales
+++ b/mobile/android/locales/maemo-locales
@@ -1,19 +1,54 @@
+as
+be
+bn-IN
+ca
 cs
+cy
 da
 de
+en-GB
+en-ZA
+es-AR
 es-ES
+es-MX
+et
+eu
 fi
+ff
 fr
+ga-IE
+gd
+gu-IN
+hi-IN
+hu
+hy-AM
+id
+is
+it
 ja
+kn
 ko
-it
+lt
+lv
+ml
+mr
+ms
 nb-NO
 nl
+or
+pa-IN
 pl
 pt-BR
 pt-PT
+ro
 ru
 sk
+sl
 sv-SE
+ta
+te
+th
+tr
+uk
 zh-CN
 zh-TW