mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Share windows cross building setup.
This commit is contained in:
parent
d9fdf42bfe
commit
38230d3047
1 changed files with 13 additions and 7 deletions
|
@ -364,7 +364,7 @@ def android_x86_wpt():
|
||||||
|
|
||||||
def windows_x86():
|
def windows_x86():
|
||||||
return (
|
return (
|
||||||
windows_build_task("Dev build", arch="x86")
|
windows_cross_build_task("Dev build", arch="x86", package=True)
|
||||||
.with_treeherder("Windows x86")
|
.with_treeherder("Windows x86")
|
||||||
.with_script(
|
.with_script(
|
||||||
"python mach build --dev --target i686-pc-windows-msvc",
|
"python mach build --dev --target i686-pc-windows-msvc",
|
||||||
|
@ -378,13 +378,8 @@ def windows_x86():
|
||||||
|
|
||||||
def windows_arm64():
|
def windows_arm64():
|
||||||
return (
|
return (
|
||||||
windows_build_task("Dev build", package=False, arch="arm64")
|
windows_cross_build_task("Dev build", arch="arm64", package=False)
|
||||||
.with_treeherder("Windows arm64")
|
.with_treeherder("Windows arm64")
|
||||||
.with_env(**{
|
|
||||||
"VCINSTALLDIR_SERVO": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\",
|
|
||||||
"VisualStudioVersion": "15.0",
|
|
||||||
"WindowsSdkDir": "C:\\Program Files (x86)\\Windows Kits\\10\\",
|
|
||||||
})
|
|
||||||
.with_script(
|
.with_script(
|
||||||
"python mach build --dev --libsimpleservo \
|
"python mach build --dev --libsimpleservo \
|
||||||
--target aarch64-pc-windows-msvc \
|
--target aarch64-pc-windows-msvc \
|
||||||
|
@ -724,6 +719,17 @@ def android_build_task(name):
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def windows_cross_build_task(name, arch, package):
|
||||||
|
return (
|
||||||
|
windows_build_task(name, package, arch)
|
||||||
|
.with_env(**{
|
||||||
|
"VCINSTALLDIR_SERVO": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\",
|
||||||
|
"VisualStudioVersion": "15.0",
|
||||||
|
"WindowsSdkDir": "C:\\Program Files (x86)\\Windows Kits\\10\\",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def windows_build_task(name, package=True, arch="x86_64"):
|
def windows_build_task(name, package=True, arch="x86_64"):
|
||||||
hashes = {
|
hashes = {
|
||||||
"devel": {
|
"devel": {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue