diff options
-rw-r--r-- | .cargo/config | 3 | ||||
-rw-r--r-- | Cargo.lock | 228 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | components/background_hang_monitor/background_hang_monitor.rs | 5 | ||||
-rw-r--r-- | components/canvas/Cargo.toml | 1 | ||||
-rw-r--r-- | components/constellation/Cargo.toml | 1 | ||||
-rw-r--r-- | components/constellation/pipeline.rs | 6 | ||||
-rw-r--r-- | components/script/Cargo.toml | 2 | ||||
-rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
-rw-r--r-- | etc/taskcluster/decision_task.py | 66 | ||||
-rw-r--r-- | etc/taskcluster/windows/first-boot.ps1 | 5 | ||||
-rw-r--r-- | ports/libsimpleservo/api/Cargo.toml | 1 | ||||
-rw-r--r-- | ports/libsimpleservo/capi/Cargo.toml | 1 | ||||
-rw-r--r-- | python/servo/build_commands.py | 251 | ||||
-rw-r--r-- | python/servo/command_base.py | 7 | ||||
-rw-r--r-- | python/servo/packages.py | 2 | ||||
-rw-r--r-- | tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini | 2 |
17 files changed, 338 insertions, 246 deletions
diff --git a/.cargo/config b/.cargo/config index 20bcd7a651b..4498011d9e3 100644 --- a/.cargo/config +++ b/.cargo/config @@ -27,3 +27,6 @@ linker = "lld-link.exe" [target.i686-pc-windows-msvc] linker = "lld-link.exe" + +[target.aarch64-pc-windows-msvc] +linker = "lld-link.exe" diff --git a/Cargo.lock b/Cargo.lock index 125b4aca8b8..2d843924a76 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -69,7 +69,7 @@ name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -132,7 +132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "termion 1.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -145,7 +145,7 @@ name = "azure" version = "0.36.0" source = "git+https://github.com/servo/rust-azure#ca9cc643808f6f63576c5c2cd098e973406cc7f3" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "servo-freetype-sys 4.0.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -156,10 +156,10 @@ dependencies = [ name = "background_hang_monitor" version = "0.0.1" dependencies = [ - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -173,14 +173,14 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.9" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -291,7 +291,7 @@ dependencies = [ "bluetooth_traits 0.0.1", "device 0.0.1 (git+https://github.com/servo/devices)", "embedder_traits 0.0.1", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", "servo_rand 0.0.1", @@ -303,7 +303,7 @@ name = "bluetooth_traits" version = "0.0.1" dependencies = [ "embedder_traits 0.0.1", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -428,10 +428,10 @@ dependencies = [ "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "half 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "offscreen_gl_context 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)", + "offscreen_gl_context 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)", "pixels 0.0.1", "raqote 0.4.1-alpha.0 (git+https://github.com/jrmuizel/raqote)", "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -447,7 +447,7 @@ dependencies = [ "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -566,7 +566,7 @@ name = "clipboard-win" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -579,8 +579,8 @@ dependencies = [ [[package]] name = "cmake" -version = "0.1.38" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "0.1.40" +source = "git+https://github.com/alexcrichton/cmake-rs#a1bc46e419be49fe3ed9eb1da8d26800a8e7c972" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -626,7 +626,7 @@ dependencies = [ "gfx_traits 0.0.1", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -652,7 +652,7 @@ name = "constellation" version = "0.0.1" dependencies = [ "background_hang_monitor 0.0.1", - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", "canvas 0.0.1", "canvas_traits 0.0.1", @@ -667,7 +667,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "layout_traits 0.0.1", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1000,7 +1000,7 @@ dependencies = [ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1015,7 +1015,7 @@ version = "0.0.1" dependencies = [ "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -1046,7 +1046,7 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1101,7 +1101,7 @@ dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1111,7 +1111,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1124,7 +1124,7 @@ name = "embedder_traits" version = "0.0.1" dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1165,7 +1165,7 @@ name = "energymon-builder" version = "0.3.0" source = "git+https://github.com/energymon/energymon-sys.git#f8d77ea2906b25f9c0fd358aa9d300a46dc3e97c" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1222,7 +1222,7 @@ name = "error-chain" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1250,7 +1250,7 @@ name = "expat-sys" version = "2.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1259,7 +1259,7 @@ name = "failure" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1321,7 +1321,7 @@ dependencies = [ "memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", "servo-fontconfig 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1329,7 +1329,7 @@ name = "fontsan" version = "0.4.0" source = "git+https://github.com/servo/fontsan#29e879c870348c4b3fd51086e42dbb6365171479" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "miniz-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1454,7 +1454,7 @@ dependencies = [ "freetype 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "harfbuzz-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1576,7 +1576,7 @@ dependencies = [ "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winit 0.19.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1586,7 +1586,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gl_generator 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1932,7 +1932,7 @@ name = "harfbuzz-sys" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "core-text 13.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2006,7 +2006,7 @@ name = "heartbeats-simple-sys" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2203,12 +2203,12 @@ version = "0.1.3" source = "git+https://github.com/servo/iovec.git?branch=servo#538decd188e46e74844c93c0cc987c2be38b3700" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ipc-channel" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bincode 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2217,7 +2217,7 @@ dependencies = [ "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "mio 0.6.18 (git+https://github.com/servo/mio.git?branch=servo)", - "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2312,7 +2312,7 @@ dependencies = [ "gfx 0.0.1", "gfx_traits 0.0.1", "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -2359,7 +2359,7 @@ dependencies = [ "gfx_traits 0.0.1", "histogram 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "layout_traits 0.0.1", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2397,7 +2397,7 @@ dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "gfx 0.0.1", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "metrics 0.0.1", "msg 0.0.1", "net_traits 0.0.1", @@ -2460,7 +2460,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2496,11 +2496,11 @@ dependencies = [ "gaol 0.2.0 (git+https://github.com/servo/gaol)", "gfx 0.0.1", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "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)", + "mozangle 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "net 0.0.1", "net_traits 0.0.1", @@ -2702,7 +2702,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2711,7 +2711,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2724,7 +2724,7 @@ name = "metrics" version = "0.0.1" dependencies = [ "gfx_traits 0.0.1", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2741,7 +2741,7 @@ name = "metrics_tests" version = "0.0.1" dependencies = [ "gfx_traits 0.0.1", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "layout 0.0.1", "metrics 0.0.1", "msg 0.0.1", @@ -2812,7 +2812,7 @@ dependencies = [ "miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2842,7 +2842,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "socket2 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2852,7 +2852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "mozangle" -version = "0.2.0" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2863,20 +2863,20 @@ dependencies = [ [[package]] name = "mozjs" version = "0.11.0" -source = "git+https://github.com/servo/rust-mozjs?rev=357d1db91e4e49c3f148fe05fdfae5f8f0834ca8#357d1db91e4e49c3f148fe05fdfae5f8f0834ca8" +source = "git+https://github.com/servo/rust-mozjs#be4e35a87c4fd71db584a392edd99f428c54ccc7" dependencies = [ "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs_sys 0.66.0 (git+https://github.com/servo/mozjs?rev=e21c05b415dfc246175ff8d5fc48b0e8c5b4e9e9)", + "mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a)", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mozjs_sys" -version = "0.66.0" -source = "git+https://github.com/servo/mozjs?rev=e21c05b415dfc246175ff8d5fc48b0e8c5b4e9e9#e21c05b415dfc246175ff8d5fc48b0e8c5b4e9e9" +version = "0.66.1" +source = "git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a#2e00bbc9e0cfd04be08356a79cfce41e4c7f165a" dependencies = [ "bindgen 0.49.0 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2890,7 +2890,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2929,7 +2929,7 @@ dependencies = [ "hyper-openssl 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "immeta 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libflate 0.1.19 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2969,7 +2969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2984,7 +2984,7 @@ dependencies = [ "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -3127,7 +3127,7 @@ dependencies = [ [[package]] name = "offscreen_gl_context" -version = "0.22.1" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3141,7 +3141,7 @@ dependencies = [ "objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "osmesa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3250,7 +3250,7 @@ dependencies = [ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3265,7 +3265,7 @@ dependencies = [ "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3388,7 +3388,7 @@ version = "0.0.1" dependencies = [ "heartbeats-simple 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "influent 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "profile_traits 0.0.1", @@ -3406,7 +3406,7 @@ dependencies = [ name = "profile_tests" version = "0.0.1" dependencies = [ - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "profile 0.0.1", "profile_traits 0.0.1", "servo_config 0.0.1", @@ -3420,7 +3420,7 @@ dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "energy-monitor 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "energymon 0.3.0 (git+https://github.com/energymon/energymon-rust.git)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "servo_config 0.0.1", @@ -3450,7 +3450,7 @@ dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3462,7 +3462,7 @@ dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3480,7 +3480,7 @@ dependencies = [ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3528,7 +3528,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3541,7 +3541,7 @@ dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3658,9 +3658,9 @@ dependencies = [ [[package]] name = "remove_dir_all" version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/XAMPPRocky/remove_dir_all#5e3f71bd30da66d64ed0c81278de0648c3d7d87b" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3696,7 +3696,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_injected_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3741,7 +3741,7 @@ name = "same-file" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -3764,7 +3764,7 @@ name = "script" version = "0.0.1" dependencies = [ "app_units 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "bluetooth_traits 0.0.1", @@ -3772,7 +3772,7 @@ dependencies = [ "canvas_traits 0.0.1", "caseless 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "cookie 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.25.5 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3794,7 +3794,7 @@ dependencies = [ "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "jstraceable_derive 0.0.1", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3807,8 +3807,8 @@ dependencies = [ "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.6 (registry+https://github.com/rust-lang/crates.io-index)", "mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mozangle 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "mozjs 0.11.0 (git+https://github.com/servo/rust-mozjs?rev=357d1db91e4e49c3f148fe05fdfae5f8f0834ca8)", + "mozangle 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "mozjs 0.11.0 (git+https://github.com/servo/rust-mozjs)", "msg 0.0.1", "net_traits 0.0.1", "num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3864,7 +3864,7 @@ dependencies = [ "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "gfx_traits 0.0.1", "html5ever 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3922,7 +3922,7 @@ dependencies = [ "http 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "hyper_serde 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of 0.0.1", @@ -4015,7 +4015,7 @@ dependencies = [ name = "servo" version = "0.0.1" dependencies = [ - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4033,7 +4033,7 @@ dependencies = [ "rust-webvr 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "sig 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "tinyfiledialogs 3.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winres 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "x11 2.17.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4070,7 +4070,7 @@ name = "servo-freetype-sys" version = "4.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -4107,7 +4107,7 @@ version = "0.1.0" source = "git+https://github.com/servo/media#2dabf1ab7e3b6d3b6764eebdf8855431367752c4" dependencies = [ "boxfnonce 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "servo-media 0.1.0 (git+https://github.com/servo/media)", "servo-media-audio 0.1.0 (git+https://github.com/servo/media)", "servo-media-player 0.1.0 (git+https://github.com/servo/media)", @@ -4134,7 +4134,7 @@ dependencies = [ "gstreamer-sys 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-video 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "gstreamer-webrtc 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4177,7 +4177,7 @@ name = "servo-media-player" version = "0.1.0" source = "git+https://github.com/servo/media#2dabf1ab7e3b6d3b6764eebdf8855431367752c4" dependencies = [ - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "servo-media-streams 0.1.0 (git+https://github.com/servo/media)", @@ -4208,7 +4208,7 @@ version = "0.30000021.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cgl 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", + "cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "expat-sys 2.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", @@ -4227,7 +4227,7 @@ name = "servo_allocator" version = "0.0.1" dependencies = [ "jemalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4398,7 +4398,7 @@ dependencies = [ "libloading 0.5.0 (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)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4476,7 +4476,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4703,8 +4703,8 @@ dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.1 (git+https://github.com/XAMPPRocky/remove_dir_all)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -4785,7 +4785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.53 (registry+https://github.com/rust-lang/crates.io-index)", "redox_syscall 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5164,7 +5164,7 @@ version = "2.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5261,7 +5261,7 @@ dependencies = [ "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.12.14 (registry+https://github.com/rust-lang/crates.io-index)", "image 0.21.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "keyboard-types 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", @@ -5331,7 +5331,7 @@ dependencies = [ "core-graphics 0.17.3 (registry+https://github.com/rust-lang/crates.io-index)", "derive_more 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "malloc_size_of_derive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", "serde_bytes 0.10.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5356,7 +5356,7 @@ dependencies = [ "crossbeam-channel 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", "gleam 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5369,7 +5369,7 @@ dependencies = [ name = "webvr_traits" version = "0.0.1" dependencies = [ - "ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)", + "ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", "msg 0.0.1", "rust-webvr-api 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.80 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5394,7 +5394,7 @@ dependencies = [ [[package]] name = "winapi" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5411,7 +5411,7 @@ name = "winapi-util" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -5424,7 +5424,7 @@ name = "wincolor" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5434,7 +5434,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "android_glue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", + "backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -5447,7 +5447,7 @@ dependencies = [ "percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smithay-client-toolkit 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", "wayland-client 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", "x11-dl 2.18.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -5582,7 +5582,7 @@ dependencies = [ "checksum atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "9a7d5b8723950951411ee34d271d99dddcc2035a16ab25310ea2c8cfd4369652" "checksum autocfg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a6d640bee2da49f60a4068a7fae53acde8982514ab7bae8b8cea9e88cbcfd799" "checksum azure 0.36.0 (git+https://github.com/servo/rust-azure)" = "<none>" -"checksum backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "89a47830402e9981c5c41223151efcced65a0510c13097c769cede7efb34782a" +"checksum backtrace 0.3.26 (registry+https://github.com/rust-lang/crates.io-index)" = "1a13fc43f04daf08ab4f71e3d27e1fc27fc437d3e95ac0063a796d92fb40f39b" "checksum backtrace-sys 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)" = "c66d56ac8dabd07f6aacdaf633f4b8262f5b3601a810a0dcddffd5c22c69daa0" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "85415d2594767338a74a30c1d370b2f3262ec1b4ed2d7bba5b3faf4de40467d9" @@ -5622,7 +5622,7 @@ dependencies = [ "checksum clipboard 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "25a904646c0340239dcf7c51677b33928bf24fdf424b79a57909c0109075b2e7" "checksum clipboard-win 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "14cc3e6c075926b96490d5f90d4a5af7be8012a4d8a8698e619655085a7641a3" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -"checksum cmake 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "96210eec534fc3fbfc0452a63769424eaa80205fda6cea98e5b61cb3d97bcec8" +"checksum cmake 0.1.40 (git+https://github.com/alexcrichton/cmake-rs)" = "<none>" "checksum cocoa 0.18.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cf79daa4e11e5def06e55306aa3601b87de6b5149671529318da048f67cdd77b" "checksum color_quant 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a475fc4af42d83d28adf72968d9bcfaf035a1a9381642d8e85d8a04957767b0d" "checksum combine 3.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "54cedd8056314afe0d844a37a207007edf8a45f2cc452fd77629cd63c221740e" @@ -5759,7 +5759,7 @@ dependencies = [ "checksum influent 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c75b206f14630274457146294c0e01297ed555176306fd074d5c34a30bb348" "checksum io-surface 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5f9a33981dff54baaff80f4decb487a65d148a3c00facc97820d0f09128f74dd" "checksum iovec 0.1.3 (git+https://github.com/servo/iovec.git?branch=servo)" = "<none>" -"checksum ipc-channel 0.11.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a3a369bb751cf24f18084aabb56995268ec1f68d2b69937aaf031d41690c1bef" +"checksum ipc-channel 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f82db24b0c53ee2d54b420bb9258f2b787611fe3e7a28d514b5ea54fe65cd365" "checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358" "checksum itoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c069bbec61e1ca5a596166e55dfe4773ff745c3d16b700013bcaff9a6df2c682" "checksum jemalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "479294d130502fada93c7a957e8d059b632b03d6204aca37af557dee947f30a9" @@ -5806,9 +5806,9 @@ dependencies = [ "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" "checksum mitochondria 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9de3eca27871df31c33b807f834b94ef7d000956f57aa25c5aed9c5f0aae8f6f" -"checksum mozangle 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c9ba1ce5212fd56a71cfbc463aedd4ece76090d98b96d5122f84dedffa0cc508" -"checksum mozjs 0.11.0 (git+https://github.com/servo/rust-mozjs?rev=357d1db91e4e49c3f148fe05fdfae5f8f0834ca8)" = "<none>" -"checksum mozjs_sys 0.66.0 (git+https://github.com/servo/mozjs?rev=e21c05b415dfc246175ff8d5fc48b0e8c5b4e9e9)" = "<none>" +"checksum mozangle 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1dc10080cc8b83bfb5580de720f00c768ec1b365c75fbc4c57324118a38a618d" +"checksum mozjs 0.11.0 (git+https://github.com/servo/rust-mozjs)" = "<none>" +"checksum mozjs_sys 0.66.1 (git+https://github.com/servo/mozjs?rev=2e00bbc9e0cfd04be08356a79cfce41e4c7f165a)" = "<none>" "checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729" "checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" @@ -5826,7 +5826,7 @@ dependencies = [ "checksum objc 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "31d20fd2b37e07cf5125be68357b588672e8cefe9a96f8c17a9d46053b3e590d" "checksum objc-foundation 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" "checksum objc_id 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e4730aa1c64d722db45f7ccc4113a3e2c465d018de6db4d3e7dfe031e8c8a297" -"checksum offscreen_gl_context 0.22.1 (registry+https://github.com/rust-lang/crates.io-index)" = "38859c15b777b90fcf28b5142da49575d9cb83c81b95f132e570841e35455ee6" +"checksum offscreen_gl_context 0.22.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac6904d3015b214944273ac55f9619a3c2884ce21108007fc6595db2b537886f" "checksum opaque-debug 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51ecbcb821e1bd256d456fe858aaa7f380b63863eab2eb86eee1bd9f33dd6682" "checksum openssl 0.10.11 (registry+https://github.com/rust-lang/crates.io-index)" = "6c24d3508b4fb6da175c10baac54c578b33f09c89ae90c6fe9788b3b4768efdc" "checksum openssl-sys 0.9.35 (registry+https://github.com/rust-lang/crates.io-index)" = "912f301a749394e1025d9dcddef6106ddee9252620e6d0a0e5f8d0681de9b129" @@ -5879,7 +5879,7 @@ dependencies = [ "checksum ref_slice 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "825740057197b7d43025e7faf6477eaabc03434e153233da02d1f44602f71527" "checksum regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "8f0a0bcab2fd7d1d7c54fa9eae6f43eddeb9ce2e7352f8518a814a4f65d60c58" "checksum regex-syntax 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfd8681eebe297b81d98498869d4aae052137651ad7b96822f09ceb690d0a96" -"checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" +"checksum remove_dir_all 0.5.1 (git+https://github.com/XAMPPRocky/remove_dir_all)" = "<none>" "checksum ron 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "da06feaa07f69125ab9ddc769b11de29090122170b402547f64b86fe16ebc399" "checksum rust-webvr 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7a171c39fdd52c5b461f2384a04e2d75555c7ed657c057c45ea9d69d68b5f9fb" "checksum rust-webvr-api 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c5611b60f8a26ad5af2b8d6ac072f9e1b396305e8eb19efd5a6df84c588b1429" @@ -6002,7 +6002,7 @@ dependencies = [ "checksum webrender_build 0.0.1 (git+https://github.com/servo/webrender)" = "<none>" "checksum weedle 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bcc44aa200daee8b1f3a004beaf16554369746f1b4486f0cf93b0caf8a3c2d1e" "checksum which 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" -"checksum winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "92c1eb33641e276cfa214a0522acad57be5c56b10cb348b3c5117db75f3ac4b0" +"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" "checksum winapi-util 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "afc5508759c5bf4285e61feb862b6083c8480aec864fa17a81fdec6f69b461ab" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/Cargo.toml b/Cargo.toml index 97e2f43df59..17df96033ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,3 +28,5 @@ opt-level = 3 # Those are here to dedupe winapi since mio is still using winapi 0.2. mio = { git = "https://github.com/servo/mio.git", branch = "servo" } iovec = { git = "https://github.com/servo/iovec.git", branch = "servo" } +remove_dir_all = { git = "https://github.com/XAMPPRocky/remove_dir_all" } +cmake = { git = "https://github.com/alexcrichton/cmake-rs" } diff --git a/components/background_hang_monitor/background_hang_monitor.rs b/components/background_hang_monitor/background_hang_monitor.rs index 5791401fcd7..f179681ba19 100644 --- a/components/background_hang_monitor/background_hang_monitor.rs +++ b/components/background_hang_monitor/background_hang_monitor.rs @@ -51,7 +51,10 @@ impl BackgroundHangMonitorRegister for HangMonitorRegister { ) -> Box<BackgroundHangMonitor> { let bhm_chan = BackgroundHangMonitorChan::new(self.sender.clone(), component_id); - #[cfg(target_os = "windows")] + #[cfg(all( + target_os = "windows", + any(target_arch = "x86_64", target_arch = "x86") + ))] let sampler = crate::sampler_windows::WindowsSampler::new(); #[cfg(target_os = "macos")] let sampler = crate::sampler_mac::MacOsSampler::new(); diff --git a/components/canvas/Cargo.toml b/components/canvas/Cargo.toml index 065ed01ca75..6e6fb2b0a76 100644 --- a/components/canvas/Cargo.toml +++ b/components/canvas/Cargo.toml @@ -15,6 +15,7 @@ azure_backend = ["azure"] default = ["azure_backend"] webgl_backtrace = ["canvas_traits/webgl_backtrace"] raqote_backend = ["raqote"] +no_wgl = ["offscreen_gl_context/no_wgl"] [dependencies] azure = {git = "https://github.com/servo/rust-azure", optional = true} diff --git a/components/constellation/Cargo.toml b/components/constellation/Cargo.toml index b01c6f0cd90..0831cd33b0c 100644 --- a/components/constellation/Cargo.toml +++ b/components/constellation/Cargo.toml @@ -13,6 +13,7 @@ path = "lib.rs" [features] azure_backend = ["canvas/azure_backend"] raqote_backend = ["canvas/raqote_backend"] +no_wgl = ["canvas/no_wgl"] [dependencies] background_hang_monitor = { path = "../background_hang_monitor"} diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs index 8c770a1c274..b89ce8a259c 100644 --- a/components/constellation/pipeline.rs +++ b/components/constellation/pipeline.rs @@ -599,7 +599,11 @@ impl UnprivilegedPipelineContent { } } - #[cfg(any(target_os = "android", target_arch = "arm", target_arch = "aarch64"))] + #[cfg(any( + target_os = "android", + target_arch = "arm", + all(target_arch = "aarch64", not(target_os = "windows")) + ))] pub fn spawn_multiprocess(self) -> Result<(), Error> { use ipc_channel::ipc::IpcOneShotServer; // Note that this function can panic, due to process creation, diff --git a/components/script/Cargo.toml b/components/script/Cargo.toml index 3bb49ce710c..28b508f5b60 100644 --- a/components/script/Cargo.toml +++ b/components/script/Cargo.toml @@ -65,7 +65,7 @@ indexmap = "1.0.2" ipc-channel = "0.11" itertools = "0.8" jstraceable_derive = {path = "../jstraceable_derive"} -js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs", rev = "357d1db91e4e49c3f148fe05fdfae5f8f0834ca8"} +js = {package = "mozjs", git = "https://github.com/servo/rust-mozjs"} keyboard-types = "0.4.4" lazy_static = "1" libc = "0.2" diff --git a/components/servo/Cargo.toml b/components/servo/Cargo.toml index 903fc0f9c5a..528e454e0c7 100644 --- a/components/servo/Cargo.toml +++ b/components/servo/Cargo.toml @@ -20,6 +20,7 @@ googlevr = ["webvr/googlevr"] js_backtrace = ["script/js_backtrace"] max_log_level = ["log/release_max_level_info"] native-bluetooth = ["bluetooth/native-bluetooth"] +no_wgl = ["canvas/no_wgl"] raqote_backend = ["canvas/raqote_backend"] webrender_debugger = ["webrender/debugger"] no_static_freetype = ["webrender/no_static_freetype"] diff --git a/etc/taskcluster/decision_task.py b/etc/taskcluster/decision_task.py index 96588247b46..475dd049407 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -32,6 +32,7 @@ def main(task_for): linux_tidy_unit_docs, windows_unit, windows_x86, + windows_arm64, macos_unit, magicleap_dev, android_arm32_dev, @@ -58,9 +59,9 @@ def main(task_for): "try-mac": [macos_unit], "try-linux": [linux_tidy_unit_docs], - "try-windows": [windows_unit, windows_x86], + "try-windows": [windows_unit, windows_x86, windows_arm64], "try-magicleap": [magicleap_dev], - "try-arm": [linux_arm32_dev, linux_arm64_dev], + "try-arm": [linux_arm32_dev, linux_arm64_dev, windows_arm64], "try-wpt": [linux_wpt], "try-wpt-mac": [macos_wpt], "try-wpt-android": [android_x86_wpt], @@ -134,6 +135,10 @@ windows_build_env = { "LIB": "%HOMEDRIVE%%HOMEPATH%\\gst\\gstreamer\\1.0\\x86_64\\lib;%LIB%", "GSTREAMER_1_0_ROOT_X86_64": "%HOMEDRIVE%%HOMEPATH%\\gst\\gstreamer\\1.0\\x86_64\\", }, + "arm64": { + "PKG_CONFIG_ALLOW_CROSS": "1", + # No GStreamer support for arm64 windows yet. + }, "all": { "PYTHON3": "%HOMEDRIVE%%HOMEPATH%\\python3\\python.exe", "LINKER": "lld-link.exe", @@ -359,11 +364,8 @@ 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_env(**{ - "VCVARSALL_PATH": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\BuildTools\\VC\\Auxiliary\\Build" - }) .with_script( "python mach build --dev --target i686-pc-windows-msvc", "python mach package --dev --target i686-pc-windows-msvc", @@ -374,6 +376,20 @@ def windows_x86(): ) +def windows_arm64(): + return ( + windows_cross_build_task("Dev build", arch="arm64", package=False) + .with_treeherder("Windows arm64") + .with_script( + "python mach build --dev --libsimpleservo \ + --target aarch64-pc-windows-msvc \ + --with-raqote \ + --without-wgl", + ) + .find_or_create("build.windows_arm64_dev." + CONFIG.task_id()) + ) + + def windows_unit(): return ( windows_build_task("Dev build + unit tests") @@ -703,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": { @@ -735,19 +762,22 @@ def windows_build_task(name, package=True, arch="x86_64"): path="python3", ) .with_rustup() - .with_repacked_msi( - url=("https://gstreamer.freedesktop.org/data/pkg/windows/" + - "%s/gstreamer-1.0-%s-%s-%s.msi" % (version, prefix[arch], arch, version)), - sha256=hashes["non-devel"][arch], - path="gst", - ) - .with_repacked_msi( - url=("https://gstreamer.freedesktop.org/data/pkg/windows/" + - "%s/gstreamer-1.0-devel-%s-%s-%s.msi" % (version, prefix[arch], arch, version)), - sha256=hashes["devel"][arch], - path="gst", - ) ) + if arch in hashes["non-devel"] and arch in hashes["devel"]: + task = ( + task.with_repacked_msi( + url=("https://gstreamer.freedesktop.org/data/pkg/windows/" + + "%s/gstreamer-1.0-%s-%s-%s.msi" % (version, prefix[arch], arch, version)), + sha256=hashes["non-devel"][arch], + path="gst", + ) + .with_repacked_msi( + url=("https://gstreamer.freedesktop.org/data/pkg/windows/" + + "%s/gstreamer-1.0-devel-%s-%s-%s.msi" % (version, prefix[arch], arch, version)), + sha256=hashes["devel"][arch], + path="gst", + ) + ) if package: task = ( task diff --git a/etc/taskcluster/windows/first-boot.ps1 b/etc/taskcluster/windows/first-boot.ps1 index 9da5091e99c..f77ed2a2fe3 100644 --- a/etc/taskcluster/windows/first-boot.ps1 +++ b/etc/taskcluster/windows/first-boot.ps1 @@ -77,8 +77,11 @@ $client.DownloadFile("https://aka.ms/vs/15/release/vs_buildtools.exe", "C:\vs_bu Start-Process C:\vs_buildtools.exe -ArgumentList (` "--passive --norestart --includeRecommended " + "--add Microsoft.VisualStudio.Workload.VCTools " + + "--add Microsoft.VisualStudio.Component.VC.Tools.ARM64 " + "--add Microsoft.VisualStudio.Component.VC.ATL " + - "--add Microsoft.VisualStudio.Component.VC.ATLMFC" + "--add Microsoft.VisualStudio.Component.VC.ATL.ARM64 " + + "--add Microsoft.VisualStudio.Component.VC.ATLMFC " + + "--add Microsoft.VisualStudio.Component.VC.MFC.ARM64" ) -Wait diff --git a/ports/libsimpleservo/api/Cargo.toml b/ports/libsimpleservo/api/Cargo.toml index 7c48fa4de21..c1f450e3b58 100644 --- a/ports/libsimpleservo/api/Cargo.toml +++ b/ports/libsimpleservo/api/Cargo.toml @@ -36,6 +36,7 @@ js_backtrace = ["libservo/js_backtrace"] max_log_level = ["log/release_max_level_info"] native-bluetooth = ["libservo/native-bluetooth"] no_static_freetype = ["libservo/no_static_freetype"] +no_wgl = ["libservo/no_wgl"] oculusvr = ["libservo/oculusvr"] raqote_backend = ["libservo/raqote_backend"] webdriver = ["libservo/webdriver"] diff --git a/ports/libsimpleservo/capi/Cargo.toml b/ports/libsimpleservo/capi/Cargo.toml index 7764f3fe71b..2833e367b5b 100644 --- a/ports/libsimpleservo/capi/Cargo.toml +++ b/ports/libsimpleservo/capi/Cargo.toml @@ -30,6 +30,7 @@ googlevr = ["simpleservo/googlevr"] js_backtrace = ["simpleservo/js_backtrace"] max_log_level = ["simpleservo/max_log_level"] native-bluetooth = ["simpleservo/native-bluetooth"] +no_wgl = ["simpleservo/no_wgl"] oculusvr = ["simpleservo/oculusvr"] raqote_backend = ["simpleservo/raqote_backend"] unstable = ["simpleservo/unstable"] diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 013889f2d15..f05bd9fdbcc 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -197,10 +197,12 @@ class MachCommands(CommandBase): default=None, action='store_true', help='Build with frame pointer enabled, used by the background hang monitor.') + @CommandArgument('--with-raqote', default=None, action='store_true') + @CommandArgument('--without-wgl', default=None, action='store_true') def build(self, target=None, release=False, dev=False, jobs=None, features=None, android=None, magicleap=None, no_package=False, verbose=False, very_verbose=False, debug_mozjs=False, params=None, with_debug_assertions=False, - libsimpleservo=False, with_frame_pointer=False): + libsimpleservo=False, with_frame_pointer=False, with_raqote=False, without_wgl=False): opts = params or [] @@ -291,6 +293,12 @@ class MachCommands(CommandBase): env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes" features += ["profilemozjs"] + if with_raqote: + features += ["raqote_backend"] + + if without_wgl: + features += ["no_wgl"] + if self.config["build"]["webgl-backtrace"]: features += ["webgl-backtrace"] if self.config["build"]["dom-backtrace"]: @@ -618,12 +626,14 @@ class MachCommands(CommandBase): return rv if sys.platform == "win32": - servo_exe_dir = os.path.dirname(self.get_binary_path(release, dev, target=target)) + servo_exe_dir = os.path.dirname( + self.get_binary_path(release, dev, target=target, simpleservo=libsimpleservo) + ) assert os.path.exists(servo_exe_dir) # on msvc builds, use editbin to change the subsystem to windows, but only # on release builds -- on debug builds, it hides log output - if not dev: + if not dev and not libsimpleservo: call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], verbose=verbose) # on msvc, we need to copy in some DLLs in to the servo.exe dir @@ -651,110 +661,14 @@ class MachCommands(CommandBase): package_generated_shared_libraries(["nspr4.dll", "libEGL.dll"], build_path, servo_exe_dir) # copy needed gstreamer DLLs in to servo.exe dir - msvc_x64 = "64" if "x86_64" in (target or host_triple()) else "" - gst_x64 = "X86_64" if msvc_x64 == "64" else "X86" - gst_root = "" - gst_default_path = path.join("C:\\gstreamer\\1.0", gst_x64) - gst_env = "GSTREAMER_1_0_ROOT_" + gst_x64 - if os.path.exists(path.join(gst_default_path, "bin", "libffi-7.dll")) or \ - os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): - gst_root = gst_default_path - elif os.environ.get(gst_env) is not None: - gst_root = os.environ.get(gst_env) - else: - print("Could not found GStreamer installation directory.") + target_triple = target or host_triple() + if "aarch64" not in target_triple: + print("Packaging gstreamer DLLs") + if not package_gstreamer_dlls(servo_exe_dir, target_triple): + status = 1 + print("Packaging MSVC DLLs") + if not package_msvc_dlls(servo_exe_dir, target_triple): status = 1 - gst_dlls = [ - ["libffi-7.dll", "ffi-7.dll"], - ["libgio-2.0-0.dll", "gio-2.0-0.dll"], - ["libglib-2.0-0.dll", "glib-2.0-0.dll"], - ["libgmodule-2.0-0.dll", "gmodule-2.0-0.dll"], - ["libgobject-2.0-0.dll", "gobject-2.0-0.dll"], - ["libgstapp-1.0-0.dll", "gstapp-1.0-0.dll"], - ["libgstaudio-1.0-0.dll", "gstaudio-1.0-0.dll"], - ["libgstbase-1.0-0.dll", "gstbase-1.0-0.dll"], - ["libgstgl-1.0-0.dll", "gstgl-1.0-0.dll"], - ["libgstpbutils-1.0-0.dll", "gstpbutils-1.0-0.dll"], - ["libgstplayer-1.0-0.dll", "gstplayer-1.0-0.dll"], - ["libgstreamer-1.0-0.dll", "gstreamer-1.0-0.dll"], - ["libgstrtp-1.0-0.dll", "gstrtp-1.0-0.dll"], - ["libgstsdp-1.0-0.dll", "gstsdp-1.0-0.dll"], - ["libgsttag-1.0-0.dll", "gsttag-1.0-0.dll"], - ["libgstvideo-1.0-0.dll", "gstvideo-1.0-0.dll"], - ["libgstwebrtc-1.0-0.dll", "gstwebrtc-1.0-0.dll"], - ["libintl-8.dll", "intl-8.dll"], - ["liborc-0.4-0.dll", "orc-0.4-0.dll"], - ["libwinpthread-1.dll", "winpthread-1.dll"], - ["libz.dll", "libz-1.dll", "z-1.dll"] - ] - if gst_root: - for gst_lib in gst_dlls: - if isinstance(gst_lib, str): - gst_lib = [gst_lib] - for lib in gst_lib: - try: - shutil.copy(path.join(gst_root, "bin", lib), - servo_exe_dir) - break - except: - pass - else: - print("ERROR: could not find required GStreamer DLL: " + str(gst_lib)) - sys.exit(1) - - # copy some MSVC DLLs to servo.exe dir - msvc_redist_dir = None - vs_platform = os.environ.get("PLATFORM", "").lower() - vc_dir = os.environ.get("VCINSTALLDIR", "") - vs_version = os.environ.get("VisualStudioVersion", "") - msvc_deps = [ - "api-ms-win-crt-runtime-l1-1-0.dll", - "msvcp140.dll", - "vcruntime140.dll", - ] - # Check if it's Visual C++ Build Tools or Visual Studio 2015 - vs14_vcvars = path.join(vc_dir, "vcvarsall.bat") - is_vs14 = True if os.path.isfile(vs14_vcvars) or vs_version == "14.0" else False - if is_vs14: - msvc_redist_dir = path.join(vc_dir, "redist", vs_platform, "Microsoft.VC140.CRT") - elif vs_version == "15.0": - redist_dir = path.join(os.environ.get("VCINSTALLDIR", ""), "Redist", "MSVC") - if os.path.isdir(redist_dir): - for p in os.listdir(redist_dir)[::-1]: - redist_path = path.join(redist_dir, p) - for v in ["VC141", "VC150"]: - # there are two possible paths - # `x64\Microsoft.VC*.CRT` or `onecore\x64\Microsoft.VC*.CRT` - redist1 = path.join(redist_path, vs_platform, "Microsoft.{}.CRT".format(v)) - redist2 = path.join(redist_path, "onecore", vs_platform, "Microsoft.{}.CRT".format(v)) - if os.path.isdir(redist1): - msvc_redist_dir = redist1 - break - elif os.path.isdir(redist2): - msvc_redist_dir = redist2 - break - if msvc_redist_dir: - break - if msvc_redist_dir: - redist_dirs = [ - msvc_redist_dir, - path.join(os.environ["WindowsSdkDir"], "Redist", "ucrt", "DLLs", vs_platform), - ] - for msvc_dll in msvc_deps: - dll_found = False - for dll_dir in redist_dirs: - dll = path.join(dll_dir, msvc_dll) - servo_dir_dll = path.join(servo_exe_dir, msvc_dll) - if os.path.isfile(dll): - if os.path.isfile(servo_dir_dll): - # avoid permission denied error when overwrite dll in servo build directory - os.chmod(servo_dir_dll, stat.S_IWUSR) - shutil.copy(dll, servo_exe_dir) - dll_found = True - break - if not dll_found: - print("DLL file `{}` not found!".format(msvc_dll)) - status = 1 elif sys.platform == "darwin": # On the Mac, set a lovely icon. This makes it easier to pick out the Servo binary in tools @@ -803,3 +717,128 @@ class MachCommands(CommandBase): opts += params return check_call(["cargo", "clean"] + opts, env=self.build_env(), cwd=self.ports_glutin_crate(), verbose=verbose) + + +def package_gstreamer_dlls(servo_exe_dir, target): + msvc_x64 = "64" if "x86_64" in target else "" + gst_x64 = "X86_64" if msvc_x64 == "64" else "X86" + gst_root = "" + gst_default_path = path.join("C:\\gstreamer\\1.0", gst_x64) + gst_env = "GSTREAMER_1_0_ROOT_" + gst_x64 + if os.path.exists(path.join(gst_default_path, "bin", "libffi-7.dll")) or \ + os.path.exists(path.join(gst_default_path, "bin", "ffi-7.dll")): + gst_root = gst_default_path + elif os.environ.get(gst_env) is not None: + gst_root = os.environ.get(gst_env) + else: + print("Could not found GStreamer installation directory.") + return False + + gst_dlls = [ + ["libffi-7.dll", "ffi-7.dll"], + ["libgio-2.0-0.dll", "gio-2.0-0.dll"], + ["libglib-2.0-0.dll", "glib-2.0-0.dll"], + ["libgmodule-2.0-0.dll", "gmodule-2.0-0.dll"], + ["libgobject-2.0-0.dll", "gobject-2.0-0.dll"], + ["libgstapp-1.0-0.dll", "gstapp-1.0-0.dll"], + ["libgstaudio-1.0-0.dll", "gstaudio-1.0-0.dll"], + ["libgstbase-1.0-0.dll", "gstbase-1.0-0.dll"], + ["libgstgl-1.0-0.dll", "gstgl-1.0-0.dll"], + ["libgstpbutils-1.0-0.dll", "gstpbutils-1.0-0.dll"], + ["libgstplayer-1.0-0.dll", "gstplayer-1.0-0.dll"], + ["libgstreamer-1.0-0.dll", "gstreamer-1.0-0.dll"], + ["libgstrtp-1.0-0.dll", "gstrtp-1.0-0.dll"], + ["libgstsdp-1.0-0.dll", "gstsdp-1.0-0.dll"], + ["libgsttag-1.0-0.dll", "gsttag-1.0-0.dll"], + ["libgstvideo-1.0-0.dll", "gstvideo-1.0-0.dll"], + ["libgstwebrtc-1.0-0.dll", "gstwebrtc-1.0-0.dll"], + ["libintl-8.dll", "intl-8.dll"], + ["liborc-0.4-0.dll", "orc-0.4-0.dll"], + ["libwinpthread-1.dll", "winpthread-1.dll"], + ["libz.dll", "libz-1.dll", "z-1.dll"] + ] + + missing = [] + for gst_lib in gst_dlls: + if isinstance(gst_lib, str): + gst_lib = [gst_lib] + for lib in gst_lib: + try: + shutil.copy(path.join(gst_root, "bin", lib), servo_exe_dir) + break + except: + pass + else: + missing += [str(gst_lib)] + + for gst_lib in missing: + print("ERROR: could not find required GStreamer DLL: " + gst_lib) + return not missing + + +def package_msvc_dlls(servo_exe_dir, target): + # copy some MSVC DLLs to servo.exe dir + msvc_redist_dir = None + vs_platforms = { + "x86_64": "x64", + "i686": "x86", + "aarch64": "arm64", + } + target_arch = target.split('-')[0] + vs_platform = vs_platforms[target_arch] + vc_dir = os.environ.get("VCINSTALLDIR", "") or os.environ.get("VCINSTALLDIR_SERVO") + vs_version = os.environ.get("VisualStudioVersion", "") + msvc_deps = [ + "msvcp140.dll", + "vcruntime140.dll", + ] + if target_arch != "aarch64": + msvc_deps += ["api-ms-win-crt-runtime-l1-1-0.dll"] + + # Check if it's Visual C++ Build Tools or Visual Studio 2015 + vs14_vcvars = path.join(vc_dir, "vcvarsall.bat") + is_vs14 = True if os.path.isfile(vs14_vcvars) or vs_version == "14.0" else False + if is_vs14: + msvc_redist_dir = path.join(vc_dir, "redist", vs_platform, "Microsoft.VC140.CRT") + elif vs_version == "15.0": + redist_dir = path.join(vc_dir, "Redist", "MSVC") + if os.path.isdir(redist_dir): + for p in os.listdir(redist_dir)[::-1]: + redist_path = path.join(redist_dir, p) + for v in ["VC141", "VC150"]: + # there are two possible paths + # `x64\Microsoft.VC*.CRT` or `onecore\x64\Microsoft.VC*.CRT` + redist1 = path.join(redist_path, vs_platform, "Microsoft.{}.CRT".format(v)) + redist2 = path.join(redist_path, "onecore", vs_platform, "Microsoft.{}.CRT".format(v)) + if os.path.isdir(redist1): + msvc_redist_dir = redist1 + break + elif os.path.isdir(redist2): + msvc_redist_dir = redist2 + break + if msvc_redist_dir: + break + if not msvc_redist_dir: + print("Couldn't locate MSVC redistributable directory") + return False + redist_dirs = [ + msvc_redist_dir, + path.join(os.environ["WindowsSdkDir"], "Redist", "ucrt", "DLLs", vs_platform), + ] + missing = [] + for msvc_dll in msvc_deps: + for dll_dir in redist_dirs: + dll = path.join(dll_dir, msvc_dll) + servo_dir_dll = path.join(servo_exe_dir, msvc_dll) + if os.path.isfile(dll): + if os.path.isfile(servo_dir_dll): + # avoid permission denied error when overwrite dll in servo build directory + os.chmod(servo_dir_dll, stat.S_IWUSR) + shutil.copy(dll, servo_exe_dir) + break + else: + missing += [msvc_dll] + + for msvc_dll in missing: + print("DLL file `{}` not found!".format(msvc_dll)) + return not missing diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 6313fff9bfe..d39576fe9c9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -367,7 +367,7 @@ class CommandBase(object): def get_gstreamer_path(self): return path.join(self.context.topdir, "support", "linux", "gstreamer", "gst") - def get_binary_path(self, release, dev, target=None, android=False, magicleap=False): + def get_binary_path(self, release, dev, target=None, android=False, magicleap=False, simpleservo=False): # TODO(autrilla): this function could still use work - it shouldn't # handle quitting, or printing. It should return the path, or an error. base_path = self.get_target_dir() @@ -379,10 +379,13 @@ class CommandBase(object): binary_name = "libmlservo.a" elif android: base_path = path.join(base_path, "android", self.config["android"]["target"]) - binary_name = "libsimpleservo.so" + simpleservo = True elif target: base_path = path.join(base_path, target) + if simpleservo: + binary_name = "simpleservo.dll" if sys.platform == "win32" else "libsimpleservo.so" + release_path = path.join(base_path, "release", binary_name) dev_path = path.join(base_path, "debug", binary_name) diff --git a/python/servo/packages.py b/python/servo/packages.py index a2038ad9e9b..3e7e3ccf67c 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -4,7 +4,7 @@ WINDOWS_MSVC = { "cmake": "3.14.3", - "llvm": "7.0.0", + "llvm": "8.0.0", "moztools": "3.2", "ninja": "1.7.1", "openssl": "1.0.2q-vs2017", diff --git a/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini b/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini index fa994fe46fe..648eef7b485 100644 --- a/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini +++ b/tests/wpt/webgl/meta/conformance/glsl/misc/fragcolor-fragdata-invariant.html.ini @@ -1,5 +1,5 @@ [fragcolor-fragdata-invariant.html] bug: https://github.com/servo/servo/issues/20601 - [WebGL test #0: [unexpected fragment shader compile status\] (expected: true) Declaring both gl_FragColor and gl_FragData invariant should succeed.] + [WebGL test #0: [unexpected link status\] Declaring both gl_FragColor and gl_FragData invariant should succeed.] expected: FAIL |