nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1832467 - Switch builds to VS 2019. r=firefox-build-system-reviewers,andi

Browse source 
While here, we switch to using an alias to make such changes easier in
the future. This will also ensure that CI builds and bootstrap use the
same one.

Differential Revision: https://phabricator.services.mozilla.com/D177717
This commit is contained in:
Mike Hommey 2023-05-11 21:46:43 +00:00
parent 01e5cb5949
commit c179c1f5c7
13 changed files with 55 additions and 54 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
build/win32/mozconfig.vs-latest
View file

@ -1,3 +1,3 @@
. $topsrcdir/build/win32/mozconfig.vs2017
. $topsrcdir/build/win32/mozconfig.vs2019
. "$topsrcdir/build/mozconfig.clang-cl"
. "$topsrcdir/build/mozconfig.lld-link"

4
build/win32/mozconfig.vs2017 → build/win32/mozconfig.vs2019
View file

@ -3,8 +3,8 @@ if [ -z "${VSPATH}" ]; then
fi
if [ -d "${VSPATH}" ]; then
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 WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT"
export WIN_UCRT_REDIST_DIR="${VSPATH}/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x86"
export WINSYSROOT="${VSPATH}"
fi

2
build/win64-aarch64/mozconfig.vs-latest
View file

@ -1,3 +1,3 @@
. $topsrcdir/build/win64-aarch64/mozconfig.vs2017
. $topsrcdir/build/win64-aarch64/mozconfig.vs2019
. "$topsrcdir/build/mozconfig.clang-cl"
. "$topsrcdir/build/mozconfig.lld-link"

2
build/win64-aarch64/mozconfig.vs2017 → build/win64-aarch64/mozconfig.vs2019
View file

@ -3,6 +3,6 @@ if [ -z "${VSPATH}" ]; then
fi
if [ -d "${VSPATH}" ]; then
export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.16.27012/arm64/Microsoft.VC141.CRT"
export WIN32_REDIST_DIR="${VSPATH}/VC/Redist/MSVC/14.29.30133/arm64/Microsoft.VC142.CRT"
export WINSYSROOT="${VSPATH}"
fi

2
build/win64/mozconfig.vs-latest
View file

@ -1,3 +1,3 @@
. $topsrcdir/build/win64/mozconfig.vs2017
. $topsrcdir/build/win64/mozconfig.vs2019
. "$topsrcdir/build/mozconfig.clang-cl"
. "$topsrcdir/build/mozconfig.lld-link"

4
build/win64/mozconfig.vs2017 → build/win64/mozconfig.vs2019
View file

@ -3,7 +3,7 @@ if [ -z "${VSPATH}" ]; then
fi
if [ -d "${VSPATH}" ]; then
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 WIN32_REDIST_DIR=${VSPATH}/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT
export WIN_UCRT_REDIST_DIR="${VSPATH}/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x64"
export WINSYSROOT="${VSPATH}"
fi

64
taskcluster/ci/build/windows.yml
View file

@ -51,7 +51,7 @@ win32/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -100,7 +100,7 @@ win32/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -150,7 +150,7 @@ win32-fuzzing/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -201,7 +201,7 @@ win64/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -247,7 +247,7 @@ win64-non-unified/plain:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -296,7 +296,7 @@ win64-fuzzing/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -339,7 +339,7 @@ win64-plain/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
- nsis
- sysroot-wasm32-wasi
optimization:
@ -390,7 +390,7 @@ win64/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -431,7 +431,7 @@ win64-plain/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
- nsis
- sysroot-wasm32-wasi
optimization:
@ -496,7 +496,7 @@ win32-shippable/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -548,7 +548,7 @@ win64-shippable/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -597,7 +597,7 @@ win64-nightlyasrelease/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -642,7 +642,7 @@ win32-add-on-devel/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -687,7 +687,7 @@ win64-add-on-devel/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -732,7 +732,7 @@ win64-noopt/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -777,7 +777,7 @@ win32-noopt/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -822,7 +822,7 @@ win32-rusttests/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
optimization:
test-inclusive: [rusttests]
@ -867,7 +867,7 @@ win32-rusttests/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
optimization:
test-inclusive: [rusttests]
@ -909,7 +909,7 @@ win64-rusttests/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
optimization:
test-inclusive: [rusttests]
@ -951,7 +951,7 @@ win64-rusttests/debug:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
optimization:
test-inclusive: [rusttests]
@ -1001,7 +1001,7 @@ win64-ccov/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
- nsis
- sysroot-wasm32-wasi
@ -1051,7 +1051,7 @@ win64-fuzzing-ccov/opt:
- win64-winchecksec
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- vs
- nsis
- sysroot-wasm32-wasi
@ -1098,7 +1098,7 @@ win64-asan/debug:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -1148,7 +1148,7 @@ win64-asan/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -1207,7 +1207,7 @@ win64-asan-reporter-shippable/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -1253,7 +1253,7 @@ win64-asan-fuzzing/opt:
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-llvm-symbolizer
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -1318,7 +1318,7 @@ win32-devedition/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -1371,7 +1371,7 @@ win64-devedition/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -1419,7 +1419,7 @@ win64-aarch64/debug:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -1475,7 +1475,7 @@ win64-aarch64/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -1671,7 +1671,7 @@ win64-aarch64-shippable-no-eme/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
optimization:
@ -1826,6 +1826,6 @@ win64-aarch64-devedition-no-eme/opt:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win

4
taskcluster/ci/instrumented-build/kind.yml
View file

@ -277,7 +277,7 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win
@ -313,6 +313,6 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win

2
taskcluster/ci/searchfox/kind.yml
View file

@ -137,7 +137,7 @@ jobs:
- nsis
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
- win64-vs2017
- vs
fetch:
- upx-3.95-win

12
taskcluster/ci/spidermonkey/windows.yml
View file

@ -24,7 +24,7 @@ sm-plain-win64/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs
sm-plain-win32/debug:
description: "Spidermonkey Plain win32 debug"
@ -43,7 +43,7 @@ sm-plain-win32/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs
sm-plain-win64/opt:
description: "Spidermonkey Plain win64 opt"
@ -60,7 +60,7 @@ sm-plain-win64/opt:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs
sm-plain-win32/opt:
description: "Spidermonkey Plain win32 opt"
@ -79,7 +79,7 @@ sm-plain-win32/opt:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs
sm-compacting-win64/debug:
description: "Spidermonkey Compacting win64 debug"
@ -96,7 +96,7 @@ sm-compacting-win64/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs
sm-compacting-win32/debug:
description: "Spidermonkey Compacting win32 debug"
@ -115,4 +115,4 @@ sm-compacting-win32/debug:
- win64-clang
- win64-rust
- win64-mozmake
- win64-vs2017
- vs

2
taskcluster/ci/static-analysis-autotest/kind.yml
View file

@ -96,5 +96,5 @@ jobs:
- win64-node
- win64-dump_syms
- win64-winchecksec
- win64-vs2017
- vs
- sysroot-wasm32-wasi

5
taskcluster/ci/toolchain/misc.yml
View file

@ -393,7 +393,6 @@ win64-vs2017:
resources:
- build/vs/vs2017.yaml
toolchain-artifact: project/gecko/vs/vs.tar.zst
toolchain-alias: vs
win64-vs2019:
description: "VS 2019"
@ -411,7 +410,9 @@ win64-vs2019:
resources:
- build/vs/vs2019.yaml
toolchain-artifact: project/gecko/vs/vs.tar.zst
toolchain-alias: vs-toolchain
toolchain-alias:
- vs
- vs-toolchain
win64-vs2022:
description: "VS 2022"

4
taskcluster/ci/webrender/kind.yml
View file

@ -223,7 +223,7 @@ jobs:
fetches:
toolchain:
- win64-rust
- win64-vs2017
- vs
- wrench-deps
run:
using: run-task
@ -234,7 +234,7 @@ jobs:
symbol: WR(wrench)
when:
files-changed:
- 'build/win64/mozconfig.vs2017'
- 'build/win64/mozconfig.vs2019'
- 'gfx/wr/**'
- 'taskcluster/scripts/misc/wrench-windows-tests.sh'