Bug 1625067 - Fix windows artifact builds. r=darktrojan DONTBUILD
authorRob Lemley <rob@thunderbird.net>
Thu, 26 Mar 2020 12:31:03 +0200
changeset 29072 be7c4bca57c84abee6e314b3f47be2561c0d66bb
parent 29071 e512016183acb92a2ab689709f9779e36dff526d
child 29073 f9c529b84eaece0e6302701bf5c95ff599f15f83
push id17189
push usermkmelin@iki.fi
push dateThu, 26 Mar 2020 10:31:52 +0000
treeherdercomm-central@be7c4bca57c8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1625067
Bug 1625067 - Fix windows artifact builds. r=darktrojan DONTBUILD mozconfigs/common needs to be after the compiler setup in common-win32 and common-win64 as that's where the artifact build setup gets included.
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win64/common-win64
mail/config/mozconfigs/win64/nightly
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -1,24 +1,32 @@
 . "$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
 
-export MOZ_TELEMETRY_REPORTING=1
-
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
+export MOZ_TELEMETRY_REPORTING=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/comm/mail/config/mozconfigs/common"
+
+if test -z "$USE_ARTIFACT"; then
+ac_add_options --enable-jemalloc
+fi
+
+if test -n "$USE_ARTIFACT"; then
+ac_add_options --disable-mapi
+fi
--- a/mail/config/mozconfigs/win64/common-win64
+++ b/mail/config/mozconfigs/win64/common-win64
@@ -1,18 +1,16 @@
 # This file is used by all Win64 builds
 
 ac_add_options --target=x86_64-pc-mingw32
 
-if test -z "$USE_ARTIFACT"; then
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
 export INCLUDE=${TOOLTOOL_DIR}/mapiheader
-fi
 
 if test `uname -s` = Linux; then
 
 # Configure expects executables for check_prog, so set the relevant files
 # as executable on the first evaluation of the mozconfig where they exist.
 if [ -d "${VSPATH}" -a ! -x "${VSPATH}/VC/bin/Hostx64/x64/cl.exe" ]; then
     find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
 fi
@@ -23,17 +21,14 @@ fi
 export MAKECAB="${TOOLTOOL_DIR}/makecab.exe"
 if [ -f "${MAKECAB}" ]; then
     chmod +x "${MAKECAB}"
 fi
 export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
 if [ -f "${UPX}" ]; then
     chmod +x "${UPX}"
 fi
-
 export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
-export RC=rc.exe
-export MIDL=midl.exe
 mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x64:${MOZ_FETCHES_DIR}/nsis-3.01:${PATH}"
 
 unset VC_PATH
 
 fi
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,26 +1,29 @@
 . "$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/win64/common-win64"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-profiling
-if test -z "$USE_ARTIFACT"; then
-ac_add_options --enable-jemalloc
-fi
-if test -n "$USE_ARTIFACT"; then
-ac_add_options --disable-mapi
-fi
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=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/comm/mail/config/mozconfigs/common"
+
+if test -z "$USE_ARTIFACT"; then
+ac_add_options --enable-jemalloc
+fi
+
+if test -n "$USE_ARTIFACT"; then
+ac_add_options --disable-mapi
+fi