Bug 1620888 - Port bug 1619867: Use the nightly mozconfig for win64-cross builds. r=darktrojan
authorRob Lemley <rob@thunderbird.net>
Sun, 08 Mar 2020 20:13:57 -0400
changeset 38484 3ebf2b781988a46bf68ba2bcbf9824fab63b9f9b
parent 38483 c9fad40dfc94bb9eee4e8ef35847625ab29ce708
child 38485 ddcd1fc8457906467661f01fbf99548c16e208fb
push id400
push userclokep@gmail.com
push dateMon, 04 May 2020 18:56:09 +0000
reviewersdarktrojan
bugs1620888, 1619867
Bug 1620888 - Port bug 1619867: Use the nightly mozconfig for win64-cross builds. r=darktrojan
mail/config/mozconfigs/win64/cross
mail/config/mozconfigs/win64/nightly
taskcluster/ci/build/windows-cross.yml
--- a/mail/config/mozconfigs/win64/cross
+++ b/mail/config/mozconfigs/win64/cross
@@ -1,36 +1,9 @@
-. "$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
-
-# 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/build/win64/mozconfig.vs-latest
-
-# Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$TOOLTOOL_DIR/mapiheader
-
-
-ac_add_options --with-branding=comm/mail/branding/nightly
+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
@@ -49,8 +22,10 @@ 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/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -1,14 +1,15 @@
 . "$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"
+. "$topsrcdir/comm/mail/config/mozconfigs/win64/cross"
 
 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
--- a/taskcluster/ci/build/windows-cross.yml
+++ b/taskcluster/ci/build/windows-cross.yml
@@ -33,25 +33,23 @@ win64-cross/opt:
         options: [append-env-variables-from-configs]
         script: mozharness/scripts/fx_desktop_build.py
         config:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         extra-config:
             disable_package_metrics: true
             mozconfig_platform: win64
-            mozconfig_variant: cross
             env:
                 # Setting LD_PRELOAD at the worker level would set it during
                 # fetch-content, which can fail randomly when a tar/unzip subprocess
                 # of fetch-content starts while the library is being extracted by
                 # another.
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
                 LOWERCASE_DIRS: "/builds/worker/workspace/build/src/vs2017_15.8.4/:/builds/worker/workspace/build/src/mapiheader/"
-        mozconfig-variant: cross
     run-on-projects: ['try']
     dependencies:
         win64-clang-cl: toolchain-win64-clang-cl
     fetches:
         toolchain:
             - linux64-binutils
             - linux64-cbindgen
             - linux64-clang