Bug 1366607: Drop support for building with comm-central in automation mozconfigs; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Thu, 12 Apr 2018 21:25:40 -0600
changeset 31544 62692ad9f4e9dd81bba0d236acc479de4d798f29
parent 31543 8506fc6a3752248b251046d7df5ee42a4185ddfd
child 31545 d16f0f451f948e3f07a0751c2aeb208b9abc1c2c
push id21
push usermozilla@hocat.ca
push dateFri, 13 Jul 2018 19:54:19 +0000
treeherdercomm-esr60@3c593339cb1d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1366607
Bug 1366607: Drop support for building with comm-central in automation mozconfigs; r=Fallen Differential Revision: https://phabricator.services.mozilla.com/D930
build/mozconfig.sccache
mail/config/mozconfigs/common
mail/config/mozconfigs/linux32/debug
mail/config/mozconfigs/linux32/nightly
mail/config/mozconfigs/linux32/release
mail/config/mozconfigs/linux64/debug
mail/config/mozconfigs/linux64/nightly
mail/config/mozconfigs/linux64/release
mail/config/mozconfigs/macosx64/debug
mail/config/mozconfigs/macosx64/nightly
mail/config/mozconfigs/macosx64/release
mail/config/mozconfigs/win32/debug
mail/config/mozconfigs/win32/l10n-mozconfig
mail/config/mozconfigs/win32/nightly
mail/config/mozconfigs/win32/release
mail/config/mozconfigs/win64/debug
mail/config/mozconfigs/win64/l10n-mozconfig
mail/config/mozconfigs/win64/nightly
--- a/build/mozconfig.sccache
+++ b/build/mozconfig.sccache
@@ -1,16 +1,14 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # Setup for build cache
 
-if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
-
 # Avoid duplication if the file happens to be included twice.
 if test -z "$NO_CACHE" -a -z "$SCCACHE_DISABLE"; then
 
 # ${region} is set by m-c's build/mozconfig.cache
 if test -n "$region"; then
     # set S3 bucket according to tree (level)
     case "${COMM_HEAD_REPOSITORY}" in
     *hg.mozilla.org/try-comm-central*)
@@ -52,10 +50,8 @@ if test -n "$bucket"; then
         mk_add_options "export COMPILE_PDB_FLAG="
         mk_add_options "export HOST_PDB_FLAG="
         mk_add_options "export MOZ_DEBUG_FLAGS=-Z7"
         ;;
     esac
 fi
 
 fi # NO_CACHE && SCCACHE_DISABLE
-
-fi # MOZ_IS_COMM_TOPDIR
--- a/mail/config/mozconfigs/common
+++ b/mail/config/mozconfigs/common
@@ -1,16 +1,2 @@
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  ac_add_options --enable-application=mail
-else
-  ac_add_options --enable-application=comm/mail
-fi
+ac_add_options --enable-application=comm/mail
 ac_add_options --enable-calendar
-
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  mk_add_options CLIENT_PY_ARGS="$([ -f "$topsrcdir/build/client.py-args" ] && cat "$topsrcdir/build/client.py-args")"
-  mk_add_options ALWAYS_RUN_CLIENT_PY=1
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1424334
-  if [ "x$IS_NIGHTLY" = "xyes" ]; then
-    mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-1}"
-  fi
-fi
--- a/mail/config/mozconfigs/linux32/debug
+++ b/mail/config/mozconfigs/linux32/debug
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/linux32/nightly
+++ b/mail/config/mozconfigs/linux32/nightly
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
--- a/mail/config/mozconfigs/linux32/release
+++ b/mail/config/mozconfigs/linux32/release
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-official-branding
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mail/config/mozconfigs/linux64/debug
+++ b/mail/config/mozconfigs/linux64/debug
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-debug
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # For NSS symbols
 export MOZ_DEBUG_SYMBOLS=1
 
--- a/mail/config/mozconfigs/linux64/nightly
+++ b/mail/config/mozconfigs/linux64/nightly
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
 # For NSS symbols
--- a/mail/config/mozconfigs/linux64/release
+++ b/mail/config/mozconfigs/linux64/release
@@ -1,22 +1,13 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.stylo"
 . "$commtopsrcdir/mail/config/mozconfigs/common"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # Disable webrender on Linux buildbot builders to avoid the Rust requirement
-  # of libX11 version > 1.4.99.1 (see bug 1350011).
-  ac_add_options --disable-webrender
-
-  # Buildbot still uses gtk from tooltool
-  . "$commtopsrcdir/build/unix/mozconfig.gtk"
-fi
-
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-official-branding
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 export MOZ_TELEMETRY_REPORTING=1
 
--- a/mail/config/mozconfigs/macosx64/debug
+++ b/mail/config/mozconfigs/macosx64/debug
@@ -16,20 +16,10 @@ MOZ_ADDON_SIGNING=0
 # Disable enforcing that add-ons are signed by the trusted root
 MOZ_REQUIRE_ADDON_SIGNING=0
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 . "$commtopsrcdir/build/mozconfig.sccache"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-  ac_add_options RUSTFLAGS='-C debuginfo=1'
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1424825
-  mk_add_options "CLIENT_PY_ARGS += --fixup-rust-vendoring-bug-1424825"
-fi
-
-if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
-  ac_add_options --disable-clang-plugin
-fi
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+ac_add_options --disable-clang-plugin
--- a/mail/config/mozconfigs/macosx64/nightly
+++ b/mail/config/mozconfigs/macosx64/nightly
@@ -19,22 +19,12 @@ export MOZ_PACKAGE_JSSHELL=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/build/mozconfig.sccache"
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-  ac_add_options RUSTFLAGS='-C debuginfo=1'
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1424825
-  mk_add_options "CLIENT_PY_ARGS += --fixup-rust-vendoring-bug-1424825"
-fi
-
-if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
-  ac_add_options --disable-clang-plugin
-fi
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+ac_add_options --disable-clang-plugin
 
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/macosx64/release
+++ b/mail/config/mozconfigs/macosx64/release
@@ -17,22 +17,12 @@ export MOZ_TELEMETRY_REPORTING=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
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-  # XXX hack to work around dsymutil failing on OSX builds (bug 1380381, 1382262)
-  ac_add_options RUSTFLAGS='-C debuginfo=1'
-
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1424825
-  mk_add_options "CLIENT_PY_ARGS += --fixup-rust-vendoring-bug-1424825"
-fi
-
-if [ "$MOZ_IS_COMM_TOPDIR" != "1" ]; then
-  # https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
-  ac_add_options --disable-clang-plugin
-fi
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1419472
+ac_add_options --disable-clang-plugin
 
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win32/debug
+++ b/mail/config/mozconfigs/win32/debug
@@ -22,13 +22,8 @@ export MOZ_PACKAGE_JSSHELL=1
 
 . "$commtopsrcdir/build/mozconfig.sccache"
 
 . $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
 mk_export_correct_style INCLUDE
-
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
-  # Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
--- a/mail/config/mozconfigs/win32/l10n-mozconfig
+++ b/mail/config/mozconfigs/win32/l10n-mozconfig
@@ -1,7 +1,2 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
-
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-   Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
--- a/mail/config/mozconfigs/win32/nightly
+++ b/mail/config/mozconfigs/win32/nightly
@@ -26,14 +26,9 @@ export MOZ_PACKAGE_JSSHELL=1
 . "$commtopsrcdir/build/mozconfig.sccache"
 
 . $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
 mk_export_correct_style INCLUDE
 
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
-  # Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
-
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win32/release
+++ b/mail/config/mozconfigs/win32/release
@@ -25,14 +25,9 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 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
 mk_export_correct_style INCLUDE
 
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
-  # Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
-
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"
--- a/mail/config/mozconfigs/win64/debug
+++ b/mail/config/mozconfigs/win64/debug
@@ -20,13 +20,8 @@ MOZ_REQUIRE_ADDON_SIGNING=0
 
 . "$commtopsrcdir/build/mozconfig.sccache"
 
 . $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
 mk_export_correct_style INCLUDE
-
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
-  # Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
--- a/mail/config/mozconfigs/win64/l10n-mozconfig
+++ b/mail/config/mozconfigs/win64/l10n-mozconfig
@@ -1,8 +1,3 @@
 . "$topsrcdir/build/mozconfig.comm-support"
 . "$commtopsrcdir/mail/config/mozconfigs/l10n-common"
 . "$commtopsrcdir/mail/config/mozconfigs/win64/common-win64"
-
-if [ "$MOZ_IS_COMM_TOPDIR" = "1" ]; then
-   Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -24,14 +24,9 @@ export MOZ_PACKAGE_JSSHELL=1
 . "$commtopsrcdir/build/mozconfig.sccache"
 
 . $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
 mk_export_correct_style INCLUDE
 
-if [ "$MOZ_IS_COMM_TOPDIR" == "1" ]; then
-  # Use the TOOLTOOL provided xz for mar generation.
-  mk_add_options "export XZ=$TOOLTOOL_DIR/xz/xz.exe"
-fi
-
 mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=c:/builds/crash-stats-api.token"