From 685cf24358833b1b6533ada0915eb6c4c7d59aee Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 3 Jun 2019 11:49:17 -0400 Subject: [PATCH 1/2] Build libEGL.dll on all Windows targets. --- components/servo/Cargo.toml | 3 +++ ports/glutin/Cargo.toml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index a81954f885f..a47ec1ce3b2 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -83,3 +83,6 @@ git = "https://github.com/servo/media" [target.'cfg(not(any(all(target_os = "android", target_arch = "arm"), target_arch = "x86_64")))'.dependencies.servo-media-dummy] git = "https://github.com/servo/media" + +[target.'cfg(target_os = "windows")'.dependencies] +mozangle = { version = "0.2", features = ["egl"] } diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml index 41fbf47d734..c9e9c277b28 100644 --- a/ports/glutin/Cargo.toml +++ b/ports/glutin/Cargo.toml @@ -66,7 +66,6 @@ sig = "1.0" x11 = "2.0.0" [target.'cfg(target_os = "windows")'.dependencies] -mozangle = { version = "0.2", features = ["egl"] } winapi = { version = "0.3", features = ["wingdi", "winuser"] } [target.'cfg(any(target_os = "macos", all(target_arch = "x86_64", target_os = "linux")))'.dependencies] From 2743015505e86a4e5f6aa323389625c86865c0af Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Mon, 3 Jun 2019 11:49:43 -0400 Subject: [PATCH 2/2] Build libsimpleservo on Windows CI. --- Cargo.lock | 2 +- etc/taskcluster/decision_task.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index ce4e3ce8b6f..b2805f26015 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2458,6 +2458,7 @@ dependencies = [ "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "layout_thread 0.0.1", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "mozangle 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -3945,7 +3946,6 @@ dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "libservo 0.0.1", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mozangle 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-src 0.1.0 (git+https://github.com/servo/osmesa-src)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rust-webvr 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index bbe797bc4f0..554783ef065 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -382,6 +382,7 @@ def windows_unit(): "mach build --dev", "mach test-unit", "mach package --dev", + "mach build --dev --libsimpleservo", ) .with_artifacts("repo/target/debug/msi/Servo.exe", "repo/target/debug/msi/Servo.zip")