Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #14172 - servo:ports, r=jdm

Browse source 
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 -->
This commit is contained in:
bors-servo 2016-11-16 16:40:18 -06:00 • committed by GitHub
commit f14e7339b5
13 changed files with 155 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

4
python/servo/build_commands.py
View file

@ -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)

4
python/servo/command_base.py
View file

@ -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):