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

… ba=release
nemomobile-packages · Jul 21, 2014 · bec8c07 · bec8c07
1 parent eb9b469
commit bec8c07
Show file tree

Hide file tree

Showing 24 changed files with 167 additions and 31 deletions.
diff --git a/CLOBBER b/CLOBBER
@@ -22,4 +22,4 @@
 # 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
diff --git a/b2g/confvars.sh b/b2g/confvars.sh
@@ -5,7 +5,7 @@
 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

diff --git a/browser/config/mozconfigs/linux32/nightly b/browser/config/mozconfigs/linux32/nightly
@@ -1,8 +1,8 @@
 . "$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

diff --git a/browser/config/mozconfigs/linux64/nightly b/browser/config/mozconfigs/linux64/nightly
@@ -1,8 +1,8 @@
 . "$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

diff --git a/browser/config/mozconfigs/macosx-universal/nightly b/browser/config/mozconfigs/macosx-universal/nightly
@@ -2,7 +2,7 @@
 
 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
 

diff --git a/browser/config/mozconfigs/win32/nightly b/browser/config/mozconfigs/win32/nightly
@@ -1,7 +1,7 @@
 . "$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

diff --git a/browser/config/mozconfigs/win64/nightly b/browser/config/mozconfigs/win64/nightly
@@ -2,7 +2,7 @@
 . "$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

diff --git a/browser/config/version.txt b/browser/config/version.txt
@@ -1 +1 @@
-33.0a1
+33.0a2
diff --git a/browser/confvars.sh b/browser/confvars.sh
@@ -41,15 +41,15 @@ MOZ_EXTENSIONS_DEFAULT=" gio"
 # 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

diff --git 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
diff --git a/browser/locales/shipped-locales b/browser/locales/shipped-locales
@@ -1,6 +1,8 @@
+ach
 af
 an
 ar
+as
 ast
 be
 bg
@@ -10,6 +12,7 @@ br
 bs
 ca
 cs
+csb
 cy
 da
 de
@@ -25,6 +28,7 @@ es-MX
 et
 eu
 fa
+ff
 fi
 fr
 fy-NL
@@ -35,6 +39,7 @@ gu-IN
 he
 hi-IN
 hr
+hsb
 hu
 hy-AM
 id
@@ -43,15 +48,18 @@ 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
@@ -70,6 +78,7 @@ son
 sq
 sr
 sv-SE
+sw
 ta
 te
 th

diff --git a/config/milestone.txt b/config/milestone.txt
@@ -10,4 +10,4 @@
 # hardcoded milestones in the tree from these two files.
 #--------------------------------------------------------
 
-33.0a1
+33.0a2
diff --git a/mobile/android/config/mozconfigs/android-armv6/debug b/mobile/android/config/mozconfigs/android-armv6/debug
@@ -12,7 +12,7 @@ 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

diff --git a/mobile/android/config/mozconfigs/android-armv6/l10n-nightly b/mobile/android/config/mozconfigs/android-armv6/l10n-nightly
@@ -1,7 +1,7 @@
 . "$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
@@ -20,6 +20,6 @@ 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"
diff --git a/mobile/android/config/mozconfigs/android-armv6/nightly b/mobile/android/config/mozconfigs/android-armv6/nightly
@@ -5,7 +5,7 @@ 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

diff --git a/mobile/android/config/mozconfigs/android-x86/debug b/mobile/android/config/mozconfigs/android-x86/debug
@@ -10,7 +10,7 @@ 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

diff --git a/mobile/android/config/mozconfigs/android-x86/l10n-nightly b/mobile/android/config/mozconfigs/android-x86/l10n-nightly
@@ -1,7 +1,7 @@
 . "$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
@@ -18,6 +18,6 @@ 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"
diff --git a/mobile/android/config/mozconfigs/android-x86/nightly b/mobile/android/config/mozconfigs/android-x86/nightly
@@ -5,7 +5,7 @@ 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

diff --git a/mobile/android/config/mozconfigs/android/debug b/mobile/android/config/mozconfigs/android/debug
@@ -9,7 +9,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/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

diff --git a/mobile/android/config/mozconfigs/android/l10n-nightly b/mobile/android/config/mozconfigs/android/l10n-nightly
@@ -1,7 +1,7 @@
 . "$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
@@ -20,6 +20,6 @@ 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"
diff --git a/mobile/android/config/mozconfigs/android/nightly b/mobile/android/config/mozconfigs/android/nightly
@@ -1,12 +1,12 @@
 . "$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

diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh
@@ -5,7 +5,7 @@
 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