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

Use resolver v2

Browse source
This commit is contained in:
sagudev 2023-05-07 13:57:20 +02:00
parent bee09efcc5
commit c2778b9bef
2 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -1,4 +1,5 @@
[workspace] [workspace]
resolver = "2"
members = [ members = [
"ports/winit", "ports/winit",
"ports/gstplugin", "ports/gstplugin",

50
python/servo/command_base.py
View file

@ -897,7 +897,7 @@ install them, let us know by filing a bug!")
target, android = self.pick_target_triple(target, android, magicleap) target, android = self.pick_target_triple(target, android, magicleap)
args = [] args = []
if "--manifest-path" not in args: if "--manifest-path" not in cargo_args:
if libsimpleservo or android: if libsimpleservo or android:
if android: if android:
api = "jniapi" api = "jniapi"
@ -915,29 +915,31 @@ install them, let us know by filing a bug!")
if features is None: # If we're passed a list, mutate it even if it's empty if features is None: # If we're passed a list, mutate it even if it's empty
features = [] features = []
if self.config["build"]["debug-mozjs"] or debug_mozjs:
features.append("debugmozjs") if "-p" not in cargo_args: # We're building specific package, that may not have features
if not magicleap: if self.config["build"]["debug-mozjs"] or debug_mozjs:
features.append("native-bluetooth") features.append("debugmozjs")
if uwp: if not magicleap:
features.append("no-wgl") features.append("native-bluetooth")
features.append("uwp") if uwp:
else: features.append("no-wgl")
# Non-UWP builds provide their own libEGL via mozangle. features.append("uwp")
features.append("egl") else:
if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013): # Non-UWP builds provide their own libEGL via mozangle.
features.append("layout-2020") features.append("egl")
elif "layout-2020" not in features: if with_layout_2020 or (self.config["build"]["layout-2020"] and not with_layout_2013):
features.append("layout-2013") features.append("layout-2020")
if with_frame_pointer: elif "layout-2020" not in features:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes" features.append("layout-2013")
features.append("profilemozjs") if with_frame_pointer:
if without_wgl: env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C force-frame-pointers=yes"
features.append("no-wgl") features.append("profilemozjs")
if self.config["build"]["webgl-backtrace"]: if without_wgl:
features.append("webgl-backtrace") features.append("no-wgl")
if self.config["build"]["dom-backtrace"]: if self.config["build"]["webgl-backtrace"]:
features.append("dom-backtrace") features.append("webgl-backtrace")
if self.config["build"]["dom-backtrace"]:
features.append("dom-backtrace")
if with_debug_assertions or self.config["build"]["debug-assertions"]: if with_debug_assertions or self.config["build"]["debug-assertions"]:
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions" env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C debug_assertions"