Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #23504 - jdm:win-simpleservo, r=asajeffrey

Browse source 
Build simpleservo on Windows

The mozangle change means that we don't rebuild mozangle (and transitively script) because the requested features are different when building libsimpleservo.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23504)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-06-05 01:21:47 -04:00 • committed by GitHub
commit 4c234de927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.lock generated
View file

@ -2498,6 +2498,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",
@ -4025,7 +4026,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)",

3
components/servo/Cargo.toml
View file

@ -85,3 +85,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"] }

1
etc/taskcluster/decision_task.py
View file

@ -386,6 +386,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")

1
ports/glutin/Cargo.toml
View file

@ -68,7 +68,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]