Navigation Menu

Skip to content

Commit

Permalink
./mach clean: cwd is unnecessary when --manifest-path is used
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonSapin committed Jul 1, 2019
1 parent 9110b25 commit aa5e559
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
7 changes: 2 additions & 5 deletions python/servo/build_commands.py
Expand Up @@ -712,14 +712,11 @@ def clean(self, manifest_path=None, params=[], verbose=False):
print('Removing virtualenv directory: %s' % virtualenv_path)
shutil.rmtree(virtualenv_path)

opts = []
if manifest_path:
opts += ["--manifest-path", manifest_path]
opts = ["--manifest-path", manifest_path or self.ports_glutin_manifest()]
if verbose:
opts += ["-v"]
opts += params
return check_call(["cargo", "clean"] + opts,
env=self.build_env(), cwd=self.ports_glutin_crate(), verbose=verbose)
return check_call(["cargo", "clean"] + opts, env=self.build_env(), verbose=verbose)


def package_gstreamer_dlls(servo_exe_dir, target):
Expand Down
3 changes: 0 additions & 3 deletions python/servo/command_base.py
Expand Up @@ -731,9 +731,6 @@ def package_dir(package):

return env

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:
Expand Down

0 comments on commit aa5e559

Please sign in to comment.