diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-06-06 13:29:20 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-06-11 15:53:35 -0400 |
| commit | 38230d304727765feddb693b535513f8017f2f77 (patch) | |
| tree | 7c77be82d8995c44a784c05ec2e4097764289687 /etc/taskcluster/decision_task.py | |
| parent | d9fdf42bfe53dab08ba38fcdb349e84355f4cb3e (diff) | |
| download | servo-38230d304727765feddb693b535513f8017f2f77.tar.gz servo-38230d304727765feddb693b535513f8017f2f77.zip | |
Share windows cross building setup.
Diffstat (limited to 'etc/taskcluster/decision_task.py')
| -rw-r--r-- | etc/taskcluster/decision_task.py | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index e8f1106e47d..475dd049407 100644 --- a/etc/taskcluster/decision_task.py +++ b/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": { |