Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 19:13:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactoring of the Glutin port in preparation of the compositor refactoring.

Browse source
This commit is contained in:
Paul Rouget 2019-04-17 10:18:14 +02:00
parent d58ea974ba
commit 21ed7653f4
30 changed files with 1287 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -761,4 +761,4 @@ class MachCommands(CommandBase):
opts += ["-v"]
opts += params
return check_call(["cargo", "clean"] + opts,
env=self.build_env(), cwd=self.ports_servo_crate(), verbose=verbose)
env=self.build_env(), cwd=self.ports_glutin_crate(), verbose=verbose)

10
python/servo/command_base.py
View file

@ -723,20 +723,20 @@ install them, let us know by filing a bug!")
return env
def ports_servo_crate(self):
return path.join(self.context.topdir, "ports", "servo")
def ports_glutin_crate(self):
return path.join(self.context.topdir, "ports", "glutin")
def add_manifest_path(self, args, android=False, libsimpleservo=False):
if "--manifest-path" not in args:
if libsimpleservo or android:
manifest = self.ports_libsimpleservo_manifest(android)
else:
manifest = self.ports_servo_manifest()
manifest = self.ports_glutin_manifest()
args.append("--manifest-path")
args.append(manifest)
def ports_servo_manifest(self):
return path.join(self.context.topdir, "ports", "servo", "Cargo.toml")
def ports_glutin_manifest(self):
return path.join(self.context.topdir, "ports", "glutin", "Cargo.toml")
def ports_libsimpleservo_manifest(self, android=False):
if android:

2
python/servo/post_build_commands.py
View file

@ -265,7 +265,7 @@ class PostBuildCommands(CommandBase):
copy2(full_name, destination)
returncode = self.call_rustup_run(
["cargo", "doc", "--manifest-path", self.ports_servo_manifest()] + params,
["cargo", "doc", "--manifest-path", self.ports_glutin_manifest()] + params,
env=self.build_env())
if returncode:
return returncode

2
python/servo/testing_commands.py
View file

@ -279,7 +279,7 @@ class MachCommands(CommandBase):
features = self.servo_features()
if len(packages) > 0 or len(in_crate_packages) > 0:
args = ["cargo", "bench" if bench else "test", "--manifest-path", self.ports_servo_manifest()]
args = ["cargo", "bench" if bench else "test", "--manifest-path", self.ports_glutin_manifest()]
for crate in packages:
args += ["-p", "%s_tests" % crate]
for crate in in_crate_packages: