mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1289641 - Replace uses of the vs2017-15.9 tooltool manifest. r=firefox-build-system-reviewers,mhentges 

Now that we have a toolchain artifact with the same function, we can use
that instead.

Differential Revision: https://phabricator.services.mozilla.com/D143127
This commit is contained in:
Mike Hommey 2022-04-12 22:52:54 +00:00
Родитель 7b07cf0b4c
Коммит 557b38098e
47 изменённых файлов: 140 добавлений и 299 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
browser/config/mozconfigs/win32/common-win32
Просмотреть файл

@ -8,14 +8,11 @@ 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/x86/cl.exe" ]; then
find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
fi
export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
if [ -f "${UPX}" ]; then
chmod +x "${UPX}"
fi
mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x86:${PATH}"
mk_add_options "export PATH=${VC_PATH}/bin/hostx64/x86:${PATH}"
unset VC_PATH

7
browser/config/mozconfigs/win64-aarch64/common-win64
Просмотреть файл

@ -8,15 +8,12 @@ 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/arm64/cl.exe" ]; then
find "${VSPATH}" -type f -name \*.exe -exec chmod +x {} \;
fi
export UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
if [ -f "${UPX}" ]; then
chmod +x "${UPX}"
fi
mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/arm64:${PATH}"
mk_add_options "export WINEPATH=${VSPATH}/VC/bin/Hostx64/x64"
mk_add_options "export PATH=${VC_PATH}/bin/hostx64/arm64:${PATH}"
mk_add_options "export WINEPATH=${VC_PATH}/bin/hostx64/x64"
unset VC_PATH

5
browser/config/mozconfigs/win64/common-win64
Просмотреть файл

@ -8,14 +8,11 @@ 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 UPX="${MOZ_FETCHES_DIR}/upx-3.95-win64/upx.exe"
if [ -f "${UPX}" ]; then
chmod +x "${UPX}"
fi
mk_add_options "export PATH=${VSPATH}/VC/bin/Hostx64/x64:${PATH}"
mk_add_options "export PATH=${VC_PATH}/bin/hostx64/x64:${PATH}"
unset VC_PATH

11
browser/config/tooltool-manifests/vs2017-15.9.manifest
Просмотреть файл

@ -1,11 +0,0 @@
[
{
"version": "Visual Studio 2017 15.9.6 / SDK 10.0.17134.0",
"size": 490015895,
"visibility": "internal",
"digest": "91d08703a8ce39f6f53ccecc7c7b6f57e1b571ddb5d1eb4dd9260e52580566c35a4bed39ad366fd60ca60ebf5c06f0f00561bba5cd631826511f2872a3d2dcd5",
"algorithm": "sha512",
"filename": "vs2017_15.9.6.zip",
"unpack": true
}
]

4
build/vs/pack_vs.py
Просмотреть файл

@ -61,5 +61,9 @@ if __name__ == "__main__":
info = tar.gettarinfo(path)
with open(path, "rb") as fh:
info.name = str(stem / dest / relpath / f).lower()
# Set executable flag on .exe files, the Firefox build
# system wants it.
if info.name.endswith(".exe"):
info.mode |= (info.mode & 0o444) >> 2
print("Adding", info.name)
tar.addfile(info, fh)

11
build/win32/mozconfig.vs2017
Просмотреть файл

@ -1,15 +1,14 @@
if [ -z "${VSPATH}" ]; then
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.9.6"
VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
fi
if [ -d "${VSPATH}" ]; then
VSWINPATH="$(cd ${VSPATH} && (pwd -W 2>/dev/null || pwd))"
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR="${VSPATH}/VC/redist/x86/Microsoft.VC141.CRT"
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x86"
export VC_PATH="${VSPATH}/VC"
export WINDOWSSDKDIR="${VSWINPATH}/windows kits/10"
export WIN32_REDIST_DIR="${VSPATH}/vc/redist/msvc/14.16.27012/x86/microsoft.vc141.crt"
export WIN_UCRT_REDIST_DIR="${VSPATH}/windows kits/10/redist/ucrt/dlls/x86"
export VC_PATH="${VSPATH}/vc/tools/msvc/14.16.27023"
fi
ac_add_options --target=i686-pc-mingw32

9
build/win64-aarch64/mozconfig.vs2017
Просмотреть файл

@ -1,12 +1,11 @@
if [ -z "${VSPATH}" ]; then
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.9.6"
VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
fi
if [ -d "${VSPATH}" ]; then
VSWINPATH="$(cd ${VSPATH} && (pwd -W 2>/dev/null || pwd))"
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR=${VSPATH}/VC/redist/arm64/Microsoft.VC141.CRT
export VC_PATH="${VSPATH}/VC"
export WINDOWSSDKDIR="${VSWINPATH}/windows kits/10"
export WIN32_REDIST_DIR="${VSPATH}/vc/redist/msvc/14.16.27012/arm64/microsoft.vc141.crt"
export VC_PATH="${VSPATH}/vc/tools/msvc/14.16.27023"
fi

11
build/win64/mozconfig.vs2017
Просмотреть файл

@ -1,13 +1,12 @@
if [ -z "${VSPATH}" ]; then
TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
VSPATH="$(cd ${TOOLTOOL_DIR} && pwd)/vs2017_15.9.6"
VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/vs"
fi
if [ -d "${VSPATH}" ]; then
VSWINPATH="$(cd ${VSPATH} && (pwd -W 2>/dev/null || pwd))"
export WINDOWSSDKDIR="${VSWINPATH}/SDK"
export WIN32_REDIST_DIR=${VSPATH}/VC/redist/x64/Microsoft.VC141.CRT
export WIN_UCRT_REDIST_DIR="${VSPATH}/SDK/Redist/ucrt/DLLs/x64"
export VC_PATH="${VSPATH}/VC"
export WINDOWSSDKDIR="${VSWINPATH}/windows kits/10"
export WIN32_REDIST_DIR=${VSPATH}/vc/redist/msvc/14.16.27012/x64/microsoft.vc141.crt
export WIN_UCRT_REDIST_DIR="${VSPATH}/windows kits/10/redist/ucrt/dlls/x64"
export VC_PATH="${VSPATH}/vc/tools/msvc/14.16.27023"
fi

107
taskcluster/ci/build/windows.yml
Просмотреть файл

@ -5,7 +5,6 @@
job-defaults:
run:
using: mozharness
tooltool-downloads: internal
fetches:
toolchain:
- win64-pdbstr
@ -27,7 +26,6 @@ win32/debug:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
options: [append-env-variables-from-configs]
@ -43,7 +41,7 @@ win32/debug:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
use-sccache: true
fetches:
toolchain:
@ -62,6 +60,7 @@ win32/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -82,7 +81,6 @@ win32/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
options: [append-env-variables-from-configs]
@ -97,7 +95,7 @@ win32/opt:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['integration']
use-sccache: true
fetches:
@ -117,6 +115,7 @@ win32/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -137,7 +136,6 @@ win64/debug:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
options: [append-env-variables-from-configs]
@ -153,7 +151,7 @@ win64/debug:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
use-sccache: true
fetches:
toolchain:
@ -172,6 +170,7 @@ win64/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -190,7 +189,6 @@ win64-hybrid/plain:
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: hybrid
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
options: [append-env-variables-from-configs]
actions: [get-secrets, build]
@ -204,7 +202,7 @@ win64-hybrid/plain:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
use-sccache: true
run-on-projects: ['integration']
fetches:
@ -224,6 +222,7 @@ win64-hybrid/plain:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -244,7 +243,6 @@ win64-fuzzing/debug:
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: fuzzing
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -258,7 +256,7 @@ win64-fuzzing/debug:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: debug-fuzzing
run-on-projects: ['trunk']
use-sccache: true
@ -279,6 +277,7 @@ win64-fuzzing/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -298,7 +297,6 @@ win64-plain/debug:
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: plain
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [build]
options: [append-env-variables-from-configs]
@ -322,6 +320,7 @@ win64-plain/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- nsis
- sysroot-wasm32-wasi
optimization:
@ -344,7 +343,6 @@ win64/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
options: [append-env-variables-from-configs]
@ -363,7 +361,7 @@ win64/opt:
# of fetch-content starts while the library is being extracted by
# another.
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['integration']
use-sccache: true
fetches:
@ -383,6 +381,7 @@ win64/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -400,7 +399,6 @@ win64-plain/opt:
max-run-time: 7200
env:
PERFHERDER_EXTRA_OPTIONS: plain
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [build]
options: [append-env-variables-from-configs]
@ -424,6 +422,7 @@ win64-plain/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- nsis
- sysroot-wasm32-wasi
optimization:
@ -462,7 +461,6 @@ win32-shippable/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
@ -478,7 +476,7 @@ win32-shippable/opt:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
fetches:
toolchain:
- linux64-binutils
@ -495,6 +493,7 @@ win32-shippable/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -520,7 +519,6 @@ win64-shippable/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
@ -536,7 +534,7 @@ win64-shippable/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
fetches:
toolchain:
- linux64-binutils
@ -553,6 +551,7 @@ win64-shippable/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -569,8 +568,6 @@ win32-add-on-devel/opt:
worker:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -584,7 +581,7 @@ win32-add-on-devel/opt:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: add-on-devel
run-on-projects: ['mozilla-beta', 'mozilla-release']
use-sccache: true
@ -605,6 +602,7 @@ win32-add-on-devel/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -621,8 +619,6 @@ win64-add-on-devel/opt:
worker:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -636,7 +632,7 @@ win64-add-on-devel/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: add-on-devel
run-on-projects: ['mozilla-beta', 'mozilla-release']
use-sccache: true
@ -657,6 +653,7 @@ win64-add-on-devel/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -673,8 +670,6 @@ win64-noopt/debug:
worker:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -689,7 +684,7 @@ win64-noopt/debug:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['mozilla-central']
use-sccache: true
fetches:
@ -709,6 +704,7 @@ win64-noopt/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -725,8 +721,6 @@ win32-noopt/debug:
worker:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -741,7 +735,7 @@ win32-noopt/debug:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['mozilla-central']
use-sccache: true
fetches:
@ -761,6 +755,7 @@ win32-noopt/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -778,7 +773,6 @@ win32-rusttests/opt:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -806,6 +800,7 @@ win32-rusttests/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -824,7 +819,6 @@ win32-rusttests/debug:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -852,6 +846,7 @@ win32-rusttests/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -870,7 +865,6 @@ win64-rusttests/opt:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -895,6 +889,7 @@ win64-rusttests/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -913,7 +908,6 @@ win64-rusttests/debug:
max-run-time: 5400
env:
PERFHERDER_EXTRA_OPTIONS: rusttests
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
actions: [get-secrets, build]
options: [append-env-variables-from-configs]
@ -938,6 +932,7 @@ win64-rusttests/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -961,7 +956,6 @@ win64-ccov/opt:
type: file
max-run-time: 9000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
RUSTC_BOOTSTRAP: '1'
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -989,6 +983,7 @@ win64-ccov/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- nsis
- sysroot-wasm32-wasi
@ -1006,7 +1001,6 @@ win64-asan/debug:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: "debug asan"
run:
actions: [get-secrets, build]
@ -1021,7 +1015,7 @@ win64-asan/debug:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: debug-asan
use-sccache: true
fetches:
@ -1042,6 +1036,7 @@ win64-asan/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -1061,7 +1056,6 @@ win64-asan/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: "opt asan"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -1077,7 +1071,7 @@ win64-asan/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: nightly-asan
use-sccache: true
fetches:
@ -1098,6 +1092,7 @@ win64-asan/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
fetch:
- upx-3.95-win
@ -1121,7 +1116,6 @@ win64-asan-reporter-shippable/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: "asan-reporter"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -1139,7 +1133,7 @@ win64-asan-reporter-shippable/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: nightly-asan-reporter
mar-channel-id:
firefox-mozilla-central-asan
@ -1163,6 +1157,7 @@ win64-asan-reporter-shippable/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
fetch:
- upx-3.95-win
@ -1179,7 +1174,6 @@ win64-asan-fuzzing/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: fuzzing-asan
run:
actions: [get-secrets, build]
@ -1194,7 +1188,7 @@ win64-asan-fuzzing/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: nightly-fuzzing-asan
use-sccache: true
fetches:
@ -1215,6 +1209,7 @@ win64-asan-fuzzing/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -1251,7 +1246,6 @@ win32-devedition/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
@ -1267,7 +1261,7 @@ win32-devedition/opt:
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: devedition
run-on-projects: ['mozilla-beta']
fetches:
@ -1286,6 +1280,7 @@ win32-devedition/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -1310,7 +1305,6 @@ win64-devedition/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 10800
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
actions: [get-secrets, build]
@ -1326,7 +1320,7 @@ win64-devedition/opt:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: devedition
run-on-projects: ['mozilla-beta']
fetches:
@ -1345,6 +1339,7 @@ win64-devedition/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -1364,7 +1359,6 @@ win64-aarch64/debug:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: aarch64
run:
actions: [get-secrets, build]
@ -1379,7 +1373,7 @@ win64-aarch64/debug:
mozconfig_platform: win64-aarch64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: debug
use-sccache: true
fetches:
@ -1399,6 +1393,7 @@ win64-aarch64/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -1425,7 +1420,6 @@ win64-aarch64/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: aarch64
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -1441,7 +1435,7 @@ win64-aarch64/opt:
mozconfig_platform: win64-aarch64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['integration']
use-sccache: true
fetches:
@ -1461,6 +1455,7 @@ win64-aarch64/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -1630,7 +1625,6 @@ win64-aarch64-shippable-no-eme/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -1647,7 +1641,7 @@ win64-aarch64-shippable-no-eme/opt:
mozconfig_platform: win64-aarch64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
run-on-projects: ['all']
fetches:
toolchain:
@ -1665,6 +1659,7 @@ win64-aarch64-shippable-no-eme/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
optimization:
@ -1791,7 +1786,6 @@ win64-aarch64-devedition-no-eme/opt:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme
MOZ_AUTOMATION_PACKAGE_TESTS: "1"
run:
@ -1808,7 +1802,7 @@ win64-aarch64-devedition-no-eme/opt:
mozconfig_platform: win64-aarch64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
mozconfig-variant: devedition
run-on-projects: ['mozilla-beta']
fetches:
@ -1827,5 +1821,6 @@ win64-aarch64-devedition-no-eme/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win

12
taskcluster/ci/instrumented-build/kind.yml
Просмотреть файл

@ -257,21 +257,18 @@ jobs:
worker-type: b-linux
worker:
docker-image: {in-tree: debian11-amd64-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
options: [append-env-variables-from-configs]
mozconfig-variant: profile-generate
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
tooltool-downloads: internal
extra-config:
stage_platform: win32
mozconfig_platform: win32
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
fetches:
toolchain:
- linux64-binutils
@ -288,6 +285,7 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win
@ -302,21 +300,18 @@ jobs:
worker-type: b-linux
worker:
docker-image: {in-tree: debian11-amd64-build}
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
options: [append-env-variables-from-configs]
mozconfig-variant: profile-generate
config:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
tooltool-downloads: internal
extra-config:
stage_platform: win64
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
fetches:
toolchain:
- linux64-binutils
@ -333,5 +328,6 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win

5
taskcluster/ci/searchfox/kind.yml
Просмотреть файл

@ -111,7 +111,6 @@ jobs:
docker-image: {in-tree: debian11-amd64-build}
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
PERFHERDER_EXTRA_OPTIONS: searchfox
RUSTC_BOOTSTRAP: "1"
MOZSEARCH_PLATFORM: "windows"
@ -125,12 +124,11 @@ jobs:
- builds/releng_base_firefox.py
- builds/releng_base_linux_64_builds.py
- builds/taskcluster_sub_win64/searchfox_debug.py
tooltool-downloads: internal
extra-config:
mozconfig_platform: win64
env:
LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.9.6"
LOWERCASE_DIRS: "/builds/worker/fetches/vs"
use-sccache: true
fetches:
toolchain:
@ -149,6 +147,7 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
fetch:
- upx-3.95-win

19
taskcluster/ci/spidermonkey/windows.yml
Просмотреть файл

@ -6,10 +6,8 @@ job-defaults:
worker-type: b-win2012
worker:
max-run-time: 36000
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
tooltool-downloads: internal
tooltool-downloads: public
sm-plain-win64/debug:
description: "Spidermonkey Plain win64 debug"
@ -26,6 +24,7 @@ sm-plain-win64/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
sm-plain-win32/debug:
description: "Spidermonkey Plain win32 debug"
@ -44,9 +43,7 @@ sm-plain-win32/debug:
- win64-clang
- win64-rust
- win64-mozmake
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
- win64-vs2017
sm-plain-win64/opt:
description: "Spidermonkey Plain win64 opt"
@ -63,6 +60,7 @@ sm-plain-win64/opt:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
sm-plain-win32/opt:
description: "Spidermonkey Plain win32 opt"
@ -81,9 +79,7 @@ sm-plain-win32/opt:
- win64-clang
- win64-rust
- win64-mozmake
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
- win64-vs2017
sm-compacting-win64/debug:
description: "Spidermonkey Compacting win64 debug"
@ -100,6 +96,7 @@ sm-compacting-win64/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
sm-compacting-win32/debug:
description: "Spidermonkey Compacting win32 debug"
@ -118,6 +115,4 @@ sm-compacting-win32/debug:
- win64-clang
- win64-rust
- win64-mozmake
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
- win64-vs2017

5
taskcluster/ci/static-analysis-autotest/kind.yml
Просмотреть файл

@ -75,16 +75,12 @@ jobs:
platform: windows2012-64/debug
tier: 2
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
config:
- builds/releng_base_firefox.py
- builds/taskcluster_base_windows.py
- builds/taskcluster_base_win64.py
- builds/taskcluster_sub_win64/debug.py
tooltool-downloads: internal
extra-config:
mozconfig_variant: debug
use-sccache: true
@ -99,4 +95,5 @@ jobs:
- win64-node
- win64-dump_syms
- win64-winchecksec
- win64-vs2017
- sysroot-wasm32-wasi

7
taskcluster/ci/toolchain/cbindgen.yml
Просмотреть файл

@ -60,14 +60,9 @@ win64-cbindgen:
treeherder:
symbol: TW64(cbindgen)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['x86_64-pc-windows-msvc']
resources:
- taskcluster/scripts/misc/tooltool-download.sh
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.57
- win64-vs2017

5
taskcluster/ci/toolchain/clang-tidy.yml
Просмотреть файл

@ -96,21 +96,20 @@ win64-clang-tidy:
worker-type: b-win2012
worker:
max-run-time: 7200
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
script: build-clang.sh
arguments:
- 'build/build-clang/clang-tidy-win64.json'
resources:
- 'build/build-clang/clang-tidy-win64.json'
tooltool-downloads: internal
run-on-projects:
- trunk
fetches:
fetch:
- cmake
- ninja
toolchain:
- win64-vs2017
linux64-clang-tidy-external:
attributes:

12
taskcluster/ci/toolchain/clang.yml
Просмотреть файл

@ -308,8 +308,6 @@ win64-clang-13-raw:
symbol: TW64(clang-13-raw)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
max-run-time: 9000
run:
script: build-clang.sh
@ -323,9 +321,7 @@ win64-clang-13-raw:
- 'build/build-clang/clang-13.json'
- 'build/build-clang/skip-stage-1-win64.json'
- 'build/build-clang/4stages-pgo.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-artifact: public/build/clang.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
@ -334,6 +330,7 @@ win64-clang-13-raw:
toolchain:
- win64-clang-13-stage1
- win64-compiler-rt-13
- win64-vs2017
win64-clang-13:
description: "Clang-cl 13 toolchain build"
@ -372,9 +369,6 @@ win64-clang-13-stage1:
treeherder:
symbol: TW64(clang-13-stage1)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
script: build-clang.sh
arguments:
@ -385,15 +379,15 @@ win64-clang-13-stage1:
- 'build/build-clang/win64.json'
- 'build/build-clang/clang-13.json'
- 'build/build-clang/1stage.json'
- 'taskcluster/scripts/misc/tooltool-download.sh'
toolchain-alias: win64-clang-toolchain
toolchain-artifact: public/build/clang.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
- cmake
- ninja
toolchain:
- win64-vs2017
linux64-clang-trunk-raw:
description: "Clang trunk toolchain build"

14
taskcluster/ci/toolchain/compiler-rt.yml
Просмотреть файл

@ -176,45 +176,39 @@ win32-compiler-rt-13:
description: "win32 x86 Compiler-rt for Clang 13 toolchain build"
treeherder:
symbol: TW32(crt-13)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments:
- build/build-clang/clang-13.json
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
- build/build-clang/clang-13.json
- taskcluster/scripts/misc/build-llvm-common.sh
toolchain-artifact: public/build/compiler-rt-i686-pc-windows-msvc.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
toolchain:
- linux64-clang-13-stage1
- linux64-liblowercase
- win64-vs2017
win64-compiler-rt-13:
description: "win64 x64 Compiler-rt for Clang 13 toolchain build"
treeherder:
symbol: TW64(crt-13)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments:
- build/build-clang/clang-13.json
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
- build/build-clang/clang-13.json
- taskcluster/scripts/misc/build-llvm-common.sh
toolchain-artifact: public/build/compiler-rt-x86_64-pc-windows-msvc.tar.zst
tooltool-downloads: internal
fetches:
fetch:
- clang-13
toolchain:
- linux64-clang-13-stage1
- linux64-liblowercase
- win64-vs2017
wasm32-wasi-compiler-rt-13:
description: "wasm32-wasi Compiler-rt for Clang 13 toolchain build"

7
taskcluster/ci/toolchain/dump-syms.yml
Просмотреть файл

@ -60,14 +60,9 @@ win64-dump_syms:
treeherder:
symbol: TW64(dump_syms)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
toolchain-artifact: public/build/dump_syms.tar.zst
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.57
- win64-vs2017

14
taskcluster/ci/toolchain/fix-stacks.yml
Просмотреть файл

@ -57,33 +57,23 @@ macosx64-aarch64-fix-stacks:
win32-fix-stacks:
treeherder:
symbol: TW32(fix-stacks)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['i686-pc-windows-msvc']
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- win64-vs2017
win64-fix-stacks:
treeherder:
symbol: TW64(fix-stacks)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['x86_64-pc-windows-msvc']
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- win64-vs2017

14
taskcluster/ci/toolchain/geckodriver.yml
Просмотреть файл

@ -84,15 +84,9 @@ win32-geckodriver:
treeherder:
symbol: TW32(gd)
platform: win32/opt
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['i686-pc-windows-msvc']
resources:
- taskcluster/scripts/misc/tooltool-download.sh
toolchain-artifact: public/build/geckodriver.zip
tooltool-downloads: internal
attributes:
build_platform: win32-geckodriver
fetches:
@ -100,20 +94,15 @@ win32-geckodriver:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows
- win64-vs2017
win64-geckodriver:
treeherder:
symbol: TW64(gd)
platform: win64/opt
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['x86_64-pc-windows-msvc']
resources:
- taskcluster/scripts/misc/tooltool-download.sh
toolchain-artifact: public/build/geckodriver.zip
tooltool-downloads: internal
attributes:
build_platform: win64-geckodriver
fetches:
@ -121,3 +110,4 @@ win64-geckodriver:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows
- win64-vs2017

7
taskcluster/ci/toolchain/gn.yml
Просмотреть файл

@ -40,13 +40,10 @@ win32-gn:
worker-type: b-win2012
worker:
max-run-time: 3600
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
script: build-gn-win32.sh
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
fetch:
- ninja
toolchain:
- win64-vs2017

8
taskcluster/ci/toolchain/grcov.yml
Просмотреть файл

@ -28,13 +28,7 @@ win64-grcov:
treeherder:
symbol: TW64(grcov)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.57
- win64-vs2017

9
taskcluster/ci/toolchain/llvm-symbolizer.yml
Просмотреть файл

@ -49,9 +49,6 @@ win64-llvm-symbolizer:
description: "llvm-symbolizer for Windows"
treeherder:
symbol: TW64(llvm-symbolizer)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments:
- x86_64-pc-windows-msvc
@ -59,5 +56,7 @@ win64-llvm-symbolizer:
resources:
- build/build-clang/clang-13.json
- taskcluster/scripts/misc/build-llvm-common.sh
- taskcluster/scripts/misc/tooltool-download.sh
tooltool-downloads: internal
fetches:
toolchain:
- linux64-liblowercase
- win64-vs2017

14
taskcluster/ci/toolchain/minidump-stackwalk.yml
Просмотреть файл

@ -57,36 +57,26 @@ macosx64-aarch64-minidump-stackwalk:
win32-minidump-stackwalk:
treeherder:
symbol: TW32(stackwalk)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['i686-pc-windows-msvc']
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- win64-vs2017
win64-minidump-stackwalk:
treeherder:
symbol: TW64(stackwalk)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
arguments: ['x86_64-pc-windows-msvc']
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- linux64-rust-windows-1.57
- win64-vs2017
# This is a totally different thing but it used to share common code with
# minidump-stackwalk, so it lives here for historical reasons.

9
taskcluster/ci/toolchain/misc.yml
Просмотреть файл

@ -267,9 +267,6 @@ win64-winchecksec:
local-toolchain: true
treeherder:
symbol: TW64(winchecksec)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run-on-projects: [trunk]
run:
script: build-winchecksec.sh
@ -282,6 +279,7 @@ win64-winchecksec:
toolchain:
- linux64-clang-toolchain
- linux64-liblowercase
- win64-vs2017
linux64-makecab:
description: "makecab toolchain build"
@ -302,9 +300,6 @@ win64-mozmake:
local-toolchain: true
treeherder:
symbol: TW64(mozmake)
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
worker-type: b-win2012
run-on-projects: [trunk]
run:
@ -314,6 +309,8 @@ win64-mozmake:
fetches:
fetch:
- gnumake
toolchain:
- win64-vs2017
nsis:
description: "NSIS for Linux and Windows"

7
taskcluster/ci/toolchain/rust-size.yml
Просмотреть файл

@ -26,14 +26,9 @@ win64-rust-size:
treeherder:
symbol: TW64(rust-size)
worker-type: b-win2012
worker:
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
toolchain-artifact: public/build/rust-size.tar.zst
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.57
- win64-vs2017

6
taskcluster/ci/toolchain/sccache.yml
Просмотреть файл

@ -69,13 +69,9 @@ win64-sccache:
worker-type: b-win2012
worker:
max-run-time: 3600
env:
TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/vs2017-15.9.manifest"
run:
toolchain-artifact: public/build/sccache.tar.zst
resources:
- 'taskcluster/scripts/misc/tooltool-download.sh'
tooltool-downloads: internal
fetches:
toolchain:
- win64-rust-1.57
- win64-vs2017

5
taskcluster/ci/webrender/kind.yml
Просмотреть файл

@ -219,26 +219,23 @@ jobs:
worker:
max-run-time: 5400
env:
TOOLTOOL_MANIFEST: 'browser/config/tooltool-manifests/vs2017-15.9.manifest'
NODE_OPTIONS: '--max_old_space_size=4096'
fetches:
toolchain:
- win64-rust
- win64-vs2017
- wrench-deps
run:
using: run-task
use-caches: false
command: '$GECKO_PATH/taskcluster/scripts/misc/wrench-windows-tests.sh'
tooltool-downloads: internal
treeherder:
platform: windows10-64-2004-qr/release
symbol: WR(wrench)
when:
files-changed:
- 'build/win64/mozconfig.vs2017'
- 'browser/config/tooltool-manifests/win64/webrender.manifest'
- 'gfx/wr/**'
- 'taskcluster/scripts/misc/tooltool-download.sh'
- 'taskcluster/scripts/misc/wrench-windows-tests.sh'
wrench-android-debug:

1
taskcluster/docker/toolchain-build/Dockerfile
Просмотреть файл

@ -32,6 +32,7 @@ RUN apt-get update && \
libtool \
libucl-dev \
libxml2-dev \
msitools \
ninja-build \
openssh-client \
p7zip-full \

5
taskcluster/scripts/builder/build-sm.sh
Просмотреть файл

@ -10,11 +10,6 @@ set -x
# Ensure upload dir exists
mkdir -p $UPLOAD_DIR
# Download via tooltool, if needed. (Currently only needed on Windows.)
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. "$GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh"
fi
# Run the script
export MOZ_UPLOAD_DIR="$(cd "$UPLOAD_DIR"; pwd)"
export OBJDIR=$WORK/obj-spider

4
taskcluster/scripts/misc/build-cbindgen.sh
Просмотреть файл

@ -17,10 +17,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
# OSX cross builds are a bit harder
case "$TARGET" in
*-apple-darwin)

4
taskcluster/scripts/misc/build-clang.sh
Просмотреть файл

@ -8,10 +8,6 @@ CONFIGS=$(for c; do echo -n " -c $GECKO_PATH/$c"; done)
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
if [ -d "$MOZ_FETCHES_DIR/binutils/bin" ]; then
export PATH="$MOZ_FETCHES_DIR/binutils/bin:$PATH"
fi

4
taskcluster/scripts/misc/build-dump-syms.sh
Просмотреть файл

@ -17,10 +17,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
cd $MOZ_FETCHES_DIR/$PROJECT

6
taskcluster/scripts/misc/build-fix-stacks.sh
Просмотреть файл

@ -41,7 +41,7 @@ x86_64-unknown-linux-gnu)
# Some magic that papers over differences in case-sensitivity/insensitivity on Linux
# and Windows file systems.
export LD_PRELOAD="/builds/worker/fetches/liblowercase/liblowercase.so"
export LOWERCASE_DIRS="/builds/worker/fetches/vs2017_15.9.6"
export LOWERCASE_DIRS="/builds/worker/fetches/vs"
# {CC,CXX} and TARGET_{CC,CXX} must be set because a build.rs file builds
# some C and C++ code.
export CC=$MOZ_FETCHES_DIR/clang/bin/clang-cl
@ -63,10 +63,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
cd $MOZ_FETCHES_DIR/$PROJECT

6
taskcluster/scripts/misc/build-geckodriver.sh
Просмотреть файл

@ -26,7 +26,7 @@ case "$TARGET" in
# Bug 1584530: don't require the Microsoft MSVC runtime to be installed.
export RUSTFLAGS="-Ctarget-feature=+crt-static"
export LD_PRELOAD=$MOZ_FETCHES_DIR/liblowercase/liblowercase.so
export LOWERCASE_DIRS=$MOZ_FETCHES_DIR/vs2017_15.9.6
export LOWERCASE_DIRS=$MOZ_FETCHES_DIR/vs
;;
# OSX cross builds are a bit harder
*-apple-darwin)
@ -41,10 +41,6 @@ case "$TARGET" in
;;
esac
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
export PATH="$MOZ_FETCHES_DIR/rustc/bin:$PATH"
cd $GECKO_PATH/testing/geckodriver

1
taskcluster/scripts/misc/build-gn-win32.sh
Просмотреть файл

@ -12,7 +12,6 @@ export PATH="$(cd $MOZ_FETCHES_DIR && pwd)/ninja/bin:$PATH"
export PATH="$(cd $MOZ_FETCHES_DIR && pwd)/mingw64/bin:$PATH"
. taskcluster/scripts/misc/vs-setup.sh
. taskcluster/scripts/misc/tooltool-download.sh
. taskcluster/scripts/misc/build-gn-common.sh
. $GECKO_PATH/taskcluster/scripts/misc/vs-cleanup.sh

4
taskcluster/scripts/misc/build-grcov.sh
Просмотреть файл

@ -25,10 +25,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
pushd $MOZ_FETCHES_DIR/$PROJECT

13
taskcluster/scripts/misc/build-llvm-common.sh
Просмотреть файл

@ -120,12 +120,17 @@ case "$target" in
"
;;
*-pc-windows-msvc)
export LD_PRELOAD="/builds/worker/fetches/liblowercase/liblowercase.so"
export LOWERCASE_DIRS="/builds/worker/fetches/vs"
# WinMsvc.cmake before LLVM 15 doesn't support spaces in WINDSK_BASE. LLVM 15+ uses
# different input variables.
ln -s "windows kits/10" $MOZ_FETCHES_DIR/vs/sdk
EXTRA_CMAKE_FLAGS="
$EXTRA_CMAKE_FLAGS
-DCMAKE_TOOLCHAIN_FILE=$MOZ_FETCHES_DIR/llvm-project/llvm/cmake/platforms/WinMsvc.cmake
-DLLVM_NATIVE_TOOLCHAIN=$MOZ_FETCHES_DIR/clang
-DMSVC_BASE=$MOZ_FETCHES_DIR/vs2017_15.9.6/VC
-DWINSDK_BASE=$MOZ_FETCHES_DIR/vs2017_15.9.6/SDK
-DMSVC_BASE=$MOZ_FETCHES_DIR/vs/vc/tools/msvc/14.16.27023
-DWINSDK_BASE=$MOZ_FETCHES_DIR/vs/sdk
-DWINSDK_VER=10.0.17134.0
-DHOST_ARCH=${target%-pc-windows-msvc}
"
@ -150,10 +155,6 @@ case "$target" in
;;
esac
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. $GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh
fi
mkdir build
cd build

4
taskcluster/scripts/misc/build-minidump-stackwalk.sh
Просмотреть файл

@ -72,10 +72,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
cd $MOZ_FETCHES_DIR/$FETCH

1
taskcluster/scripts/misc/build-mozmake.sh
Просмотреть файл

@ -1,7 +1,6 @@
#!/bin/bash
set -x -e -v
. $GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
cd $MOZ_FETCHES_DIR/make

4
taskcluster/scripts/misc/build-nasm.sh
Просмотреть файл

@ -3,10 +3,6 @@ set -x -e -v
COMPRESS_EXT=zst
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. $GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh
fi
cd $MOZ_FETCHES_DIR/nasm-*
case $(cat version) in

4
taskcluster/scripts/misc/build-rust-size.sh
Просмотреть файл

@ -17,10 +17,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
cd $MOZ_FETCHES_DIR/$PROJECT

4
taskcluster/scripts/misc/build-sccache.sh
Просмотреть файл

@ -20,10 +20,6 @@ esac
cd $GECKO_PATH
if [ -n "$TOOLTOOL_MANIFEST" ]; then
. taskcluster/scripts/misc/tooltool-download.sh
fi
PATH="$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin:$PATH"
cd $MOZ_FETCHES_DIR/sccache

3
taskcluster/scripts/misc/build-winchecksec.sh
Просмотреть файл

@ -13,10 +13,9 @@ x86_64-pc-windows-msvc)
export PATH="$MOZ_FETCHES_DIR/clang/bin:$PATH"
export LD_PRELOAD=$MOZ_FETCHES_DIR/liblowercase/liblowercase.so
export LOWERCASE_DIRS=$MOZ_FETCHES_DIR/vs2017_15.9.6
export LOWERCASE_DIRS=$MOZ_FETCHES_DIR/vs
. $GECKO_PATH/taskcluster/scripts/misc/vs-setup.sh
. $GECKO_PATH/taskcluster/scripts/misc/tooltool-download.sh
# Patch pe-parse because clang-cl doesn't support /analyze.
patch -p1 <<'EOF'

10
taskcluster/scripts/misc/vs-setup.sh
Просмотреть файл

@ -1,8 +1,10 @@
VSDIR=vs2017_15.9.6
VSDIR=vs
VSPATH="${MOZ_FETCHES_DIR}/${VSDIR}"
UNIX_VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/${VSDIR}"
VCDIR=vc/tools/msvc/14.16.27023
SDKDIR="windows kits/10"
SDK_VERSION=10.0.17134.0
export INCLUDE="${VSPATH}/VC/include;${VSPATH}/VC/atlmfc/include;${VSPATH}/SDK/Include/${SDK_VERSION}/ucrt;${VSPATH}/SDK/Include/${SDK_VERSION}/shared;${VSPATH}/SDK/Include/${SDK_VERSION}/um;${VSPATH}/SDK/Include/${SDK_VERSION}/winrt;${VSPATH}/DIA SDK/include"
export LIB="${VSPATH}/VC/lib/x64;${VSPATH}/VC/atlmfc/lib/x64;${VSPATH}/SDK/Lib/${SDK_VERSION}/um/x64;${VSPATH}/SDK/Lib/${SDK_VERSION}/ucrt/x64;${VSPATH}/DIA SDK/lib/amd64"
export PATH="${UNIX_VSPATH}/VC/bin/Hostx64/x64:${UNIX_VSPATH}/VC/bin/Hostx86/x86:${UNIX_VSPATH}/SDK/bin/${SDK_VERSION}/x64:${UNIX_VSPATH}/redist/x64/Microsoft.VC141.CRT:${UNIX_VSPATH}/SDK/Redist/ucrt/DLLs/x64:${UNIX_VSPATH}/DIA SDK/bin/amd64:$PATH"
export INCLUDE="${VSPATH}/${VCDIR}/include;${VSPATH}/${VCDIR}/atlmfc/include;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/ucrt;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/shared;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/um;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/winrt;${VSPATH}/dia sdk/include"
export LIB="${VSPATH}/${VCDIR}/lib/x64;${VSPATH}/${VCDIR}/atlmfc/lib/x64;${VSPATH}/${SDKDIR}/lib/${SDK_VERSION}/um/x64;${VSPATH}/${SDKDIR}/lib/${SDK_VERSION}/ucrt/x64;${VSPATH}/dia sdk/lib/amd64"
export PATH="${UNIX_VSPATH}/${VCDIR}/bin/hostx64/x64:${UNIX_VSPATH}/${VCDIR}/bin/hostx86/x86:${UNIX_VSPATH}/${SDKDIR}/bin/${SDK_VERSION}/x64:${UNIX_VSPATH}/redist/x64/microsoft.vc141.crt:${UNIX_VSPATH}/${SDKDIR}/redist/ucrt/dlls/x64:${UNIX_VSPATH}/dia sdk/bin/amd64:$PATH"

10
taskcluster/scripts/misc/vs-setup32.sh
Просмотреть файл

@ -1,8 +1,10 @@
VSDIR=vs2017_15.9.6
VSDIR=vs
VSPATH="${MOZ_FETCHES_DIR}/${VSDIR}"
UNIX_VSPATH="$(cd ${MOZ_FETCHES_DIR} && pwd)/${VSDIR}"
VCDIR=vc/tools/msvc/14.16.27023
SDKDIR="windows kits/10"
SDK_VERSION=10.0.17134.0
export INCLUDE="${VSPATH}/VC/include;${VSPATH}/VC/atlmfc/include;${VSPATH}/SDK/Include/${SDK_VERSION}/ucrt;${VSPATH}/SDK/Include/${SDK_VERSION}/shared;${VSPATH}/SDK/Include/${SDK_VERSION}/um;${VSPATH}/SDK/Include/${SDK_VERSION}/winrt;${VSPATH}/DIA SDK/include"
export LIB="${VSPATH}/VC/lib/x86;${VSPATH}/VC/atlmfc/lib/x86;${VSPATH}/SDK/Lib/${SDK_VERSION}/um/x86;${VSPATH}/SDK/Lib/${SDK_VERSION}/ucrt/x86;${VSPATH}/DIA SDK/lib"
export PATH="${UNIX_VSPATH}/VC/bin/Hostx64/x86:${UNIX_VSPATH}/VC/bin/Hostx64/x64:${UNIX_VSPATH}/VC/bin/Hostx86/x86:${UNIX_VSPATH}/SDK/bin/${SDK_VERSION}/x86:${UNIX_VSPATH}/VC/redist/x86/Microsoft.VC141.CRT:${UNIX_VSPATH}/SDK/Redist/ucrt/DLLs/x86:${UNIX_VSPATH}/DIA SDK/bin:$PATH"
export INCLUDE="${VSPATH}/${VCDIR}/include;${VSPATH}/${VCDIR}/atlmfc/include;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/ucrt;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/shared;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/um;${VSPATH}/${SDKDIR}/include/${SDK_VERSION}/winrt;${VSPATH}/dia sdk/include"
export LIB="${VSPATH}/${VCDIR}/lib/x86;${VSPATH}/${VCDIR}/atlmfc/lib/x86;${VSPATH}/${SDKDIR}/lib/${SDK_VERSION}/um/x86;${VSPATH}/${SDKDIR}/lib/${SDK_VERSION}/ucrt/x86;${VSPATH}/dia sdk/lib"
export PATH="${UNIX_VSPATH}/${VCDIR}/bin/hostx64/x86:${UNIX_VSPATH}/${VCDIR}/bin/hostx64/x64:${UNIX_VSPATH}/${VCDIR}/bin/hostx86/x86:${UNIX_VSPATH}/${SDKDIR}/bin/${SDK_VERSION}/x86:${UNIX_VSPATH}/${VCDIR}/redist/x86/microsoft.vc141.crt:${UNIX_VSPATH}/${SDKDIR}/redist/ucrt/dlls/x86:${UNIX_VSPATH}/dia sdk/bin:$PATH"

2
taskcluster/scripts/misc/wrench-windows-tests.sh
Просмотреть файл

@ -10,8 +10,6 @@ set -x -e -v
cd $GECKO_PATH
# This will download the rustc, MSVC, and wrench-deps artifacts.
. taskcluster/scripts/misc/tooltool-download.sh
export PATH=$PATH:$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin
. taskcluster/scripts/misc/vs-setup.sh