diff options
| -rw-r--r-- | components/canvas/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/constellation/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/servo/Cargo.toml | 1 | ||||
| -rw-r--r-- | etc/taskcluster/decision_task.py | 4 | ||||
| -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 | 10 |
7 files changed, 17 insertions, 2 deletions
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/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 c36bc4039c6..22c3b70eef4 100644 --- a/etc/taskcluster/decision_task.py +++ b/etc/taskcluster/decision_task.py @@ -382,7 +382,9 @@ def windows_arm64(): .with_treeherder("Windows arm64") .with_script( "python mach build --dev --libsimpleservo \ - --target aarch64-pc-windows-msvc --features raqote_backend", + --target aarch64-pc-windows-msvc \ + --with-raqote \ + --without-wgl", ) .find_or_create("build.windows_arm64_dev." + CONFIG.task_id()) ) 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..e6868cc6419 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"]: |