Skip to content
Permalink
Browse files

Share windows cross building setup.

  • Loading branch information...
jdm committed Jun 6, 2019
1 parent d9fdf42 commit 38230d304727765feddb693b535513f8017f2f77
Showing with 13 additions and 7 deletions.
  1. +13 −7 etc/taskcluster/decision_task.py
@@ -364,7 +364,7 @@ def android_x86_wpt():

def windows_x86():
return (
windows_build_task("Dev build", arch="x86")
windows_cross_build_task("Dev build", arch="x86", package=True)
.with_treeherder("Windows x86")
.with_script(
"python mach build --dev --target i686-pc-windows-msvc",
@@ -378,13 +378,8 @@ def windows_x86():

def windows_arm64():
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_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(
"python mach build --dev --libsimpleservo \
--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"):
hashes = {
"devel": {

0 comments on commit 38230d3

Please sign in to comment.
You can’t perform that action at this time.