Bug 1423313: Refefactor L10N configuration for thunderbird; r=me
MozReview-Commit-ID: IOwPnkzXOPg
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/l10n-common
@@ -0,0 +1,13 @@
+. "$commtopsrcdir/mail/config/mozconfigs/common"
+
+ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
+ac_add_options --with-l10n-base=../../l10n
+. "$topsrcdir/build/mozconfig.no-compile"
+
+# Needed to enable breakpad in application.ini
+export MOZILLA_OFFICIAL=1
+
+# Disable checking that add-ons are signed by the trusted root
+MOZ_ADDON_SIGNING=0
+# Disable enforcing that add-ons are signed by the trusted root
+MOZ_REQUIRE_ADDON_SIGNING=0
--- a/mail/config/mozconfigs/linux32/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux32/l10n-mozconfig
@@ -1,16 +1,4 @@
. "$topsrcdir/build/mozconfig.comm-support"
-. "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-l10n-base=../../l10n
-. "$topsrcdir/build/mozconfig.no-compile"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
+. "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
ac_add_options --disable-stdcxx-compat
--- a/mail/config/mozconfigs/linux64/l10n-mozconfig
+++ b/mail/config/mozconfigs/linux64/l10n-mozconfig
@@ -1,16 +1,4 @@
. "$topsrcdir/build/mozconfig.comm-support"
-. "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-l10n-base=../../l10n
-. "$topsrcdir/build/mozconfig.no-compile"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
+. "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
ac_add_options --disable-stdcxx-compat
--- a/mail/config/mozconfigs/macosx64/l10n-mozconfig
+++ b/mail/config/mozconfigs/macosx64/l10n-mozconfig
@@ -1,14 +1,2 @@
. "$topsrcdir/build/mozconfig.comm-support"
-. "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-l10n-base=../../l10n
-. "$topsrcdir/build/mozconfig.no-compile"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
+. "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,17 +1,5 @@
. "$topsrcdir/build/mozconfig.comm-support"
-. "$commtopsrcdir/mail/config/mozconfigs/common"
-
-ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-l10n-base=../../l10n
-. "$topsrcdir/build/mozconfig.no-compile"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
+. "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
# Use the TOOLTOOL provided xz for mar generation.
mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -1,20 +1,8 @@
. "$topsrcdir/build/mozconfig.comm-support"
-. "$commtopsrcdir/mail/config/mozconfigs/common"
+. "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
ac_add_options --target=x86_64-pc-mingw32
ac_add_options --host=x86_64-pc-mingw32
-ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
-ac_add_options --with-l10n-base=../../l10n
-. "$topsrcdir/build/mozconfig.no-compile"
-
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=0
-# Disable enforcing that add-ons are signed by the trusted root
-MOZ_REQUIRE_ADDON_SIGNING=0
-
# Use the TOOLTOOL provided xz for mar generation.
mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"