Bug 1620888 - Port bug 1620164: Consolidate win32 mozconfigs. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Sun, 08 Mar 2020 20:47:45 -0400
changeset 38486 2936cdee7b1e0910643da1a867c1c9c10b31e211
parent 38485 ddcd1fc8457906467661f01fbf99548c16e208fb
child 38487 150de041c5e7b85741748536094a7cb89922cb68
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersdarktrojan
bugs1620888, 1620164
Bug 1620888 - Port bug 1620164: Consolidate win32 mozconfigs. r=darktrojan
mail/config/mozconfigs/win32/common-win32
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
new file mode 100644
--- /dev/null
+++ b/mail/config/mozconfigs/win32/common-win32
@@ -0,0 +1,8 @@
+# This file is used by all Win32 builds
+
+ac_add_options --target=i686-pc-mingw32
+
+. $topsrcdir/build/win32/mozconfig.vs-latest
+
+# Set up mapi includes (must be done after visual studio setup)
+export INCLUDE=$INCLUDE:${TOOLTOOL_DIR}/mapiheader
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -1,26 +1,22 @@
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
+. "$topsrcdir/comm/mail/config/mozconfigs/win32/common-win32"
 
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,13 +1,14 @@
 . "$topsrcdir/comm/build/mozconfig.comm-sccache"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
+. "$topsrcdir/comm/mail/config/mozconfigs/win32/common-win32"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc
 ac_add_options --enable-profiling
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
@@ -16,13 +17,8 @@ export MOZ_TELEMETRY_REPORTING=1
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -1,12 +1,13 @@
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/mozconfig.common"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
+. "$topsrcdir/comm/mail/config/mozconfigs/win32/common-win32"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-jemalloc
 ac_add_options --enable-official-branding
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
@@ -15,13 +16,8 @@ export MOZ_TELEMETRY_REPORTING=1
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
-
-. $topsrcdir/build/win32/mozconfig.vs-latest
-
-# Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader