mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
Always dummy (#30240)
This commit is contained in:
parent
9aa3f74878
commit
5e60088276
7 changed files with 7 additions and 12 deletions
|
@ -17,7 +17,6 @@ googlevr = ["webxr/googlevr"]
|
||||||
jitspew = ["script/jitspew"]
|
jitspew = ["script/jitspew"]
|
||||||
js_backtrace = ["script/js_backtrace"]
|
js_backtrace = ["script/js_backtrace"]
|
||||||
max_log_level = ["log/release_max_level_info"]
|
max_log_level = ["log/release_max_level_info"]
|
||||||
media-dummy = ["servo-media-dummy"]
|
|
||||||
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
|
media-gstreamer = ["servo-media-gstreamer", "gstreamer"]
|
||||||
native-bluetooth = ["bluetooth/native-bluetooth"]
|
native-bluetooth = ["bluetooth/native-bluetooth"]
|
||||||
no-wgl = ["canvas/no-wgl"]
|
no-wgl = ["canvas/no-wgl"]
|
||||||
|
@ -67,7 +66,7 @@ script = { path = "../script" }
|
||||||
script_layout_interface = { path = "../script_layout_interface" }
|
script_layout_interface = { path = "../script_layout_interface" }
|
||||||
script_traits = { path = "../script_traits" }
|
script_traits = { path = "../script_traits" }
|
||||||
servo-media = { git = "https://github.com/servo/media" }
|
servo-media = { git = "https://github.com/servo/media" }
|
||||||
servo-media-dummy = { git = "https://github.com/servo/media", optional = true }
|
servo-media-dummy = { git = "https://github.com/servo/media" }
|
||||||
servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
|
servo-media-gstreamer = { git = "https://github.com/servo/media", optional = true }
|
||||||
servo_config = { path = "../config" }
|
servo_config = { path = "../config" }
|
||||||
servo_geometry = { path = "../geometry" }
|
servo_geometry = { path = "../geometry" }
|
||||||
|
|
|
@ -171,7 +171,7 @@ mod media_platform {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "media-dummy")]
|
#[cfg(not(feature = "media-gstreamer"))]
|
||||||
mod media_platform {
|
mod media_platform {
|
||||||
use super::ServoMedia;
|
use super::ServoMedia;
|
||||||
pub fn init() {
|
pub fn init() {
|
||||||
|
|
|
@ -40,7 +40,6 @@ googlevr = ["libservo/googlevr"]
|
||||||
jitspew = ["libservo/jitspew"]
|
jitspew = ["libservo/jitspew"]
|
||||||
js_backtrace = ["libservo/js_backtrace"]
|
js_backtrace = ["libservo/js_backtrace"]
|
||||||
max_log_level = ["log/release_max_level_info"]
|
max_log_level = ["log/release_max_level_info"]
|
||||||
media-dummy = ["libservo/media-dummy"]
|
|
||||||
media-gstreamer = ["libservo/media-gstreamer"]
|
media-gstreamer = ["libservo/media-gstreamer"]
|
||||||
native-bluetooth = ["libservo/native-bluetooth"]
|
native-bluetooth = ["libservo/native-bluetooth"]
|
||||||
no_static_freetype = ["libservo/no_static_freetype"]
|
no_static_freetype = ["libservo/no_static_freetype"]
|
||||||
|
|
|
@ -35,7 +35,6 @@ googlevr = ["simpleservo/googlevr"]
|
||||||
jitspew = ["simpleservo/jitspew"]
|
jitspew = ["simpleservo/jitspew"]
|
||||||
js_backtrace = ["simpleservo/js_backtrace"]
|
js_backtrace = ["simpleservo/js_backtrace"]
|
||||||
max_log_level = ["simpleservo/max_log_level"]
|
max_log_level = ["simpleservo/max_log_level"]
|
||||||
media-dummy = ["simpleservo/media-dummy"]
|
|
||||||
media-gstreamer = ["simpleservo/media-gstreamer"]
|
media-gstreamer = ["simpleservo/media-gstreamer"]
|
||||||
native-bluetooth = ["simpleservo/native-bluetooth"]
|
native-bluetooth = ["simpleservo/native-bluetooth"]
|
||||||
no-wgl = ["simpleservo/no-wgl"]
|
no-wgl = ["simpleservo/no-wgl"]
|
||||||
|
|
|
@ -32,7 +32,6 @@ default = ["max_log_level", "native-bluetooth", "webdriver"]
|
||||||
googlevr = ["simpleservo/googlevr"]
|
googlevr = ["simpleservo/googlevr"]
|
||||||
js_backtrace = ["simpleservo/js_backtrace"]
|
js_backtrace = ["simpleservo/js_backtrace"]
|
||||||
max_log_level = ["simpleservo/max_log_level"]
|
max_log_level = ["simpleservo/max_log_level"]
|
||||||
media-dummy = ["simpleservo/media-dummy"]
|
|
||||||
media-gstreamer = ["simpleservo/media-gstreamer"]
|
media-gstreamer = ["simpleservo/media-gstreamer"]
|
||||||
native-bluetooth = ["simpleservo/native-bluetooth"]
|
native-bluetooth = ["simpleservo/native-bluetooth"]
|
||||||
webdriver = ["simpleservo/webdriver"]
|
webdriver = ["simpleservo/webdriver"]
|
||||||
|
|
|
@ -34,7 +34,6 @@ default = ["max_log_level", "native-bluetooth", "webdriver"]
|
||||||
jitspew = ["libservo/jitspew"]
|
jitspew = ["libservo/jitspew"]
|
||||||
js_backtrace = ["libservo/js_backtrace"]
|
js_backtrace = ["libservo/js_backtrace"]
|
||||||
max_log_level = ["log/release_max_level_info"]
|
max_log_level = ["log/release_max_level_info"]
|
||||||
media-dummy = ["libservo/media-dummy"]
|
|
||||||
media-gstreamer = ["libservo/media-gstreamer"]
|
media-gstreamer = ["libservo/media-gstreamer"]
|
||||||
native-bluetooth = ["libservo/native-bluetooth"]
|
native-bluetooth = ["libservo/native-bluetooth"]
|
||||||
no-wgl = ["libservo/no-wgl"]
|
no-wgl = ["libservo/no-wgl"]
|
||||||
|
|
|
@ -461,10 +461,9 @@ class CommandBase(object):
|
||||||
"""Return an extended environment dictionary."""
|
"""Return an extended environment dictionary."""
|
||||||
env = os.environ.copy()
|
env = os.environ.copy()
|
||||||
|
|
||||||
if "media-dummy" not in self.features:
|
servo.platform.get().set_gstreamer_environment_variables_if_necessary(
|
||||||
servo.platform.get().set_gstreamer_environment_variables_if_necessary(
|
env, cross_compilation_target=self.cross_compile_target,
|
||||||
env, cross_compilation_target=self.cross_compile_target,
|
check_installation=is_build)
|
||||||
check_installation=is_build)
|
|
||||||
|
|
||||||
effective_target = self.cross_compile_target or servo.platform.host_triple()
|
effective_target = self.cross_compile_target or servo.platform.host_triple()
|
||||||
if "msvc" in effective_target:
|
if "msvc" in effective_target:
|
||||||
|
@ -850,7 +849,8 @@ class CommandBase(object):
|
||||||
media_stack = "gstreamer"
|
media_stack = "gstreamer"
|
||||||
else:
|
else:
|
||||||
media_stack = "dummy"
|
media_stack = "dummy"
|
||||||
self.features += ["media-" + media_stack]
|
if media_stack != "dummy":
|
||||||
|
self.features += ["media-" + media_stack]
|
||||||
|
|
||||||
def run_cargo_build_like_command(
|
def run_cargo_build_like_command(
|
||||||
self, command: str, cargo_args: List[str],
|
self, command: str, cargo_args: List[str],
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue