Bug 1620888 - Port bug 1620164: Consolidate win64 mozconfigs. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Sun, 08 Mar 2020 20:47:07 -0400
changeset 37600 ddcd1fc8457906467661f01fbf99548c16e208fb
parent 37599 3ebf2b781988a46bf68ba2bcbf9824fab63b9f9b
child 37601 2936cdee7b1e0910643da1a867c1c9c10b31e211
push id2582
push userclokep@gmail.com
push dateMon, 06 Apr 2020 18:49:52 +0000
treeherdercomm-beta@294fedccf739 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan
bugs1620888, 1620164
Bug 1620888 - Port bug 1620164: Consolidate win64 mozconfigs. r=darktrojan
mail/config/mozconfigs/win64/common-win64
mail/config/mozconfigs/win64/cross
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/nightly
mail/config/mozconfigs/win64/release
--- a/mail/config/mozconfigs/win64/common-win64
+++ b/mail/config/mozconfigs/win64/common-win64
@@ -1,3 +1,42 @@
 # 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=$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
+export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
+if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
+    chmod +x "${MAKENSISU}"
+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
+CLANG_CL_EXE_DIR="${MOZ_FETCHES_DIR}/clang-cl/clang/bin"
+if [ -d "${CLANG_CL_EXE_DIR}" ]; then
+    chmod +x "${CLANG_CL_EXE_DIR}/clang-cl.exe"
+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:${CLANG_CL_EXE_DIR}:${PATH}"
+
+unset VC_PATH
+
+fi
deleted file mode 100644
--- a/mail/config/mozconfigs/win64/cross
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-export MAKENSISU="${MOZ_FETCHES_DIR}/nsis-3.01/makensis.exe"
-if [ -d "${MAKENSISU%/*}" -a ! -x "${MAKENSISU}" ]; then
-    chmod +x "${MAKENSISU}"
-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
-CLANG_CL_EXE_DIR="${MOZ_FETCHES_DIR}/clang-cl/clang/bin"
-if [ -d "${CLANG_CL_EXE_DIR}" ]; then
-    chmod +x "${CLANG_CL_EXE_DIR}/clang-cl.exe"
-fi
-export WINE=${MOZ_FETCHES_DIR}/wine/bin/wine64
-export RC=rc.exe
-export MIDL=midl.exe
-mk_add_options "export PATH=${TOOLTOOL_DIR}/vs2017_15.8.4/VC/bin/Hostx64/x64:${MOZ_FETCHES_DIR}/nsis-3.01:${CLANG_CL_EXE_DIR}:${PATH}"
-
-unset VC_PATH
-
-fi
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -15,15 +15,8 @@ fi
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
-
-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=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader
-fi
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -20,15 +20,8 @@ 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
-
-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=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader
-fi
--- a/mail/config/mozconfigs/win64/release
+++ b/mail/config/mozconfigs/win64/release
@@ -13,13 +13,8 @@ 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/build/win64/mozconfig.vs-latest
-
-# Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:$(cd "$TOOLTOOL_DIR" && pwd)/mapiheader