Bug 1574409 - Use Firefox's mozconfig.cache for Thunderbird. r=darktrojan
This goes with a change to Firefox's build/mozconfig.cache to use a prefix variable when setting up Sccache buckets on AWS. This will eliminate code duplication which has caused broken builds in the past. Thunderbird builds only run on AWS currently so GCP configuration is not needed. --HG-- extra : rebase_source : 0b5c334763d196ff3ede0e8edbe1b9b9e3dbcaf4
This commit is contained in:
Rob Lemley
Родитель
15772c7ac2
Коммит
f7eebc78a4
|
|
@ -0,0 +1,8 @@
|
|||
# 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/.
|
||||
|
||||
# Must be included before M-C:build/mozconfig.cache
|
||||
if test -z "$aws_prefix" -a -z "$bucket" -a -z "$SCCACHE_DISABLE"; then
|
||||
aws_prefix="comm-central"
|
||||
fi
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
# 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/.
|
||||
|
||||
# Used in mail/config/mozconfigs by various mozconfigs.
|
||||
|
||||
# Setup for build cache
|
||||
|
||||
# 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*)
|
||||
bucket=comm-central-level-1-sccache-${region}
|
||||
;;
|
||||
*hg.mozilla.org/comm-central*)
|
||||
bucket=comm-central-level-3-sccache-${region}
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test -n "$bucket"; then
|
||||
mk_add_options "export SCCACHE_BUCKET=$bucket"
|
||||
mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
|
||||
case "${SYSTEMROOT}" in
|
||||
*Windows)
|
||||
platform=win
|
||||
;;
|
||||
*)
|
||||
mk_add_options "export AWS_IAM_CREDENTIALS_URL=http://taskcluster/auth/v1/aws/s3/read-write/${bucket}/?format=iam-role-compat"
|
||||
;;
|
||||
esac
|
||||
|
||||
export CCACHE="$MOZ_FETCHES_DIR/sccache/sccache${suffix}"
|
||||
export SCCACHE_VERBOSE_STATS=1
|
||||
mk_add_options "MOZBUILD_MANAGE_SCCACHE_DAEMON=$MOZ_FETCHES_DIR/sccache/sccache"
|
||||
mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
|
||||
|
||||
case "$platform" in
|
||||
win)
|
||||
# sccache supports a special flag to create depfiles.
|
||||
#TODO: bug 1318370 - move this all into toolchain.configure
|
||||
export _DEPEND_CFLAGS='-deps$(MDDEPDIR)/$(@F).pp'
|
||||
# Windows builds have a default wrapper that needs to be overridden
|
||||
mk_add_options "export CC_WRAPPER="
|
||||
mk_add_options "export CXX_WRAPPER="
|
||||
# For now, sccache doesn't support separate PDBs so force debug info to be
|
||||
# in object files.
|
||||
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
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/unix/mozconfig.linux32"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -17,5 +18,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
|
||||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/unix/mozconfig.linux32"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -20,5 +21,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/unix/mozconfig.linux"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -17,5 +18,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
|
||||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/unix/mozconfig.linux"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -20,5 +21,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/macosx/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -15,5 +16,3 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
|
||||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/macosx/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
. "$topsrcdir/comm/mail/config/mozconfigs/common"
|
||||
|
|
@ -20,6 +21,4 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
# Disable enforcing that add-ons are signed by the trusted root
|
||||
MOZ_REQUIRE_ADDON_SIGNING=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
||||
mk_add_options "export SOCORRO_SYMBOL_UPLOAD_TOKEN_FILE=/builds/crash-stats-api.token"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
|
|
@ -19,8 +20,6 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
||||
. $topsrcdir/build/win32/mozconfig.vs-latest
|
||||
|
||||
# Set up mapi includes (must be done after visual studio setup)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
|
|
@ -21,8 +22,6 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
||||
. $topsrcdir/build/win32/mozconfig.vs-latest
|
||||
|
||||
# Set up mapi includes (must be done after visual studio setup)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
|
|
@ -20,8 +21,6 @@ export MOZ_PACKAGE_JSSHELL=1
|
|||
# Disable enforcing that add-ons are signed by the trusted root
|
||||
MOZ_REQUIRE_ADDON_SIGNING=0
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
||||
if test -z "$USE_ARTIFACT"; then
|
||||
. $topsrcdir/build/win64/mozconfig.vs-latest
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
. "$topsrcdir/comm/build/mozconfig.comm-sccache"
|
||||
. "$topsrcdir/build/mozconfig.win-common"
|
||||
. "$topsrcdir/build/mozconfig.common"
|
||||
. "$topsrcdir/build/mozconfig.stylo"
|
||||
|
|
@ -24,8 +25,6 @@ MOZ_REQUIRE_ADDON_SIGNING=0
|
|||
# Package js shell
|
||||
export MOZ_PACKAGE_JSSHELL=1
|
||||
|
||||
. "$topsrcdir/comm/build/mozconfig.sccache"
|
||||
|
||||
if test -z "$USE_ARTIFACT"; then
|
||||
. $topsrcdir/build/win64/mozconfig.vs-latest
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче