eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-09 08:32:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only add --manifest-path if not already present

Browse Source
This commit is contained in:
Simon Sapin
2018-09-25 21:00:26 +02:00
parent 4e85f9c186
commit deeb79669f
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
python/servo/command_base.py
View File

@@ -670,11 +670,14 @@ install them, let us know by filing a bug!")
def ports_servo_crate(self):
return path.join(self.context.topdir, "ports", "servo")
def manifest_path(self, android=False, libsimpleservo=False):
if libsimpleservo or android:
return self.ports_libsimpleservo_manifest()
else:
return self.ports_servo_manifest()
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()
else:
manifest = self.ports_servo_manifest()
args.append("--manifest-path")
args.append(manifest)
def ports_servo_manifest(self):
return path.join(self.context.topdir, "ports", "servo", "Cargo.toml")