diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-11-16 16:40:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 16:40:18 -0600 |
| commit | f14e7339b5ff95fce0127dce4fe87ce082ab7259 (patch) | |
| tree | f4e840ff9baedb4add783a14ae00c3819aa38ab8 /python/servo | |
| parent | afc60bee2809059b8b754a1c6d6d10c1d36326fb (diff) | |
| parent | 9a5abab442168be589e15a4def0e2c8225b31de9 (diff) | |
| download | servo-f14e7339b5ff95fce0127dce4fe87ce082ab7259.tar.gz servo-f14e7339b5ff95fce0127dce4fe87ce082ab7259.zip | |
Auto merge of #14172 - servo:ports, r=jdm
Move the servo binary to ports.
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14172)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 4 | ||||
| -rw-r--r-- | python/servo/command_base.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index b78a286be61..514a8f87e69 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -214,7 +214,7 @@ class MachCommands(CommandBase): self.ensure_bootstrapped(target=target) if debug_mozjs: - features += ["script/debugmozjs"] + features += ["debugmozjs"] if features: opts += ["--features", "%s" % ' '.join(features)] @@ -360,7 +360,7 @@ class MachCommands(CommandBase): servo_features = self.servo_features() if servo_features: - opts += ["--features", "%s" % ' '.join("servo/" + x for x in servo_features)] + opts += ["--features", "%s" % ' '.join(servo_features)] build_start = time() env = self.build_env(is_build=True) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index a67ea0b208d..1a236bdf1fa 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -501,13 +501,13 @@ class CommandBase(object): return env def servo_crate(self): - return path.join(self.context.topdir, "components", "servo") + return path.join(self.context.topdir, "ports", "servo") def servo_features(self): """Return a list of optional features to enable for the Servo crate""" features = [] if self.config["build"]["debug-mozjs"]: - features += ["script/debugmozjs"] + features += ["debugmozjs"] return features def android_support_dir(self): |