diff options
| author | Paul Rouget <me@paulrouget.com> | 2019-04-17 10:18:14 +0200 |
|---|---|---|
| committer | Paul Rouget <me@paulrouget.com> | 2019-04-29 10:04:51 +0200 |
| commit | 21ed7653f491d9e378aa7a334b40e7327f4bfc90 (patch) | |
| tree | 28ef0394a720aa569d25dd2f6989a16ea11a3708 /python/servo | |
| parent | d58ea974baff1b51a43d2e2bf4b287ff11991a8d (diff) | |
| download | servo-21ed7653f491d9e378aa7a334b40e7327f4bfc90.tar.gz servo-21ed7653f491d9e378aa7a334b40e7327f4bfc90.zip | |
Refactoring of the Glutin port in preparation of the compositor refactoring.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 10 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index d516f1639dc..512fdfe4977 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2d159df3773..ac9789ca389 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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: diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 4050f33f932..4d27475f74b 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -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 diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index c8bb5e7511c..f4b324d4c62 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -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: |