mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #24344 - saschanaz:vslatest, r=jdm
Support `--features vslatestinstalled` <!-- Please describe your changes on the following line: --> Matches https://github.com/servo/rust-mozjs/pull/477. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24331 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- 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/24344) <!-- Reviewable:end -->
This commit is contained in:
commit
84693d8117
4 changed files with 7 additions and 4 deletions
8
Cargo.lock
generated
8
Cargo.lock
generated
|
@ -2852,20 +2852,20 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mozjs"
|
name = "mozjs"
|
||||||
version = "0.12.1"
|
version = "0.12.1"
|
||||||
source = "git+https://github.com/servo/rust-mozjs#8e99da18185a92a5c10bc7e4bd5249bb9f9c3d84"
|
source = "git+https://github.com/servo/rust-mozjs#2ef1de9a549ac5e1b88aad893567e5f3a6579a99"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
"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)",
|
"lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
"libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"log 0.4.6 (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.67.1 (git+https://github.com/servo/mozjs?rev=8e3ac9b0228f9cd92ac2ce718cf1436860f18a8f)",
|
"mozjs_sys 0.67.1 (git+https://github.com/servo/mozjs?rev=dd175ee73a179ce218286c4be4ab80e1a75348be)",
|
||||||
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
"num-traits 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "mozjs_sys"
|
name = "mozjs_sys"
|
||||||
version = "0.67.1"
|
version = "0.67.1"
|
||||||
source = "git+https://github.com/servo/mozjs?rev=8e3ac9b0228f9cd92ac2ce718cf1436860f18a8f#8e3ac9b0228f9cd92ac2ce718cf1436860f18a8f"
|
source = "git+https://github.com/servo/mozjs?rev=dd175ee73a179ce218286c4be4ab80e1a75348be#dd175ee73a179ce218286c4be4ab80e1a75348be"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
"bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
"cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||||
|
@ -5969,7 +5969,7 @@ dependencies = [
|
||||||
"checksum moite_moite 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb5a94c61e12e2cfc16ee3e2b6eca8f126a43c888586626337544a7e824a1af"
|
"checksum moite_moite 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb5a94c61e12e2cfc16ee3e2b6eca8f126a43c888586626337544a7e824a1af"
|
||||||
"checksum mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "75a61b5a06b6f362eb45590ddf2643c255768a7039bcde1dc70320b97e7f9651"
|
"checksum mozangle 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "75a61b5a06b6f362eb45590ddf2643c255768a7039bcde1dc70320b97e7f9651"
|
||||||
"checksum mozjs 0.12.1 (git+https://github.com/servo/rust-mozjs)" = "<none>"
|
"checksum mozjs 0.12.1 (git+https://github.com/servo/rust-mozjs)" = "<none>"
|
||||||
"checksum mozjs_sys 0.67.1 (git+https://github.com/servo/mozjs?rev=8e3ac9b0228f9cd92ac2ce718cf1436860f18a8f)" = "<none>"
|
"checksum mozjs_sys 0.67.1 (git+https://github.com/servo/mozjs?rev=dd175ee73a179ce218286c4be4ab80e1a75348be)" = "<none>"
|
||||||
"checksum msdos_time 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "aad9dfe950c057b1bfe9c1f2aa51583a8468ef2a5baba2ebbe06d775efeb7729"
|
"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 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"
|
"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
|
||||||
|
|
|
@ -20,6 +20,7 @@ default = ["unrooted_must_root_lint"]
|
||||||
webgl_backtrace = ["backtrace", "canvas_traits/webgl_backtrace"]
|
webgl_backtrace = ["backtrace", "canvas_traits/webgl_backtrace"]
|
||||||
js_backtrace = ["backtrace"]
|
js_backtrace = ["backtrace"]
|
||||||
uwp = ["js/uwp"]
|
uwp = ["js/uwp"]
|
||||||
|
vslatestinstalled = ["js/vslatestinstalled"]
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
phf_codegen = "0.7"
|
phf_codegen = "0.7"
|
||||||
|
|
|
@ -35,6 +35,7 @@ webgl_backtrace = [
|
||||||
"canvas/webgl_backtrace",
|
"canvas/webgl_backtrace",
|
||||||
"canvas_traits/webgl_backtrace",
|
"canvas_traits/webgl_backtrace",
|
||||||
]
|
]
|
||||||
|
vslatestinstalled = ["script/vslatestinstalled"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
background_hang_monitor = {path = "../background_hang_monitor"}
|
background_hang_monitor = {path = "../background_hang_monitor"}
|
||||||
|
|
|
@ -43,6 +43,7 @@ profilemozjs = ["libservo/profilemozjs"]
|
||||||
webdriver = ["libservo/webdriver"]
|
webdriver = ["libservo/webdriver"]
|
||||||
webgl_backtrace = ["libservo/webgl_backtrace"]
|
webgl_backtrace = ["libservo/webgl_backtrace"]
|
||||||
webrender_debugger = ["libservo/webrender_debugger"]
|
webrender_debugger = ["libservo/webrender_debugger"]
|
||||||
|
vslatestinstalled = ["libservo/vslatestinstalled"]
|
||||||
|
|
||||||
[target.'cfg(not(target_os = "android"))'.dependencies]
|
[target.'cfg(not(target_os = "android"))'.dependencies]
|
||||||
backtrace = "0.3"
|
backtrace = "0.3"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue