Bug 1366607: Drop support for building with comm-central in automation mozconfigs; r=Fallen
Differential Revision: https://phabricator.services.mozilla.com/D930 --HG-- extra : rebase_source : f1ab070dc59479676674e5e32967a73a201ceb50
This commit is contained in:
Tom Prince
Родитель
79bfa0d34d
Коммит
6f242c1cc1
|
|
@ -4,8 +4,6 @@
|
|||
|
||||
# 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
|
||||
|
||||
|
|
@ -57,5 +55,3 @@ if test -n "$bucket"; then
|
|||
fi
|
||||
|
||||
fi # NO_CACHE && SCCACHE_DISABLE
|
||||
|
||||
fi # MOZ_IS_COMM_TOPDIR
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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-profiling
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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-profiling
|
||||
|
||||
|
|
|
|||
|
|
@ -3,15 +3,6 @@
|
|||
. "$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
|
||||
|
||||
|
|
|
|||
|
|
@ -21,15 +21,5 @@ 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
|
||||
|
|
|
|||
|
|
@ -25,17 +25,7 @@ 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"
|
||||
|
|
|
|||
|
|
@ -22,17 +22,7 @@ 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"
|
||||
|
|
|
|||
|
|
@ -27,8 +27,3 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -32,9 +32,4 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -30,9 +30,4 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -25,8 +25,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
# 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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -30,9 +30,4 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
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"
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче