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

Auto merge of #7734 - nerith:headless, r=metajack

Browse source 
Allow `./mach build` to enable Servo's headless mode

As mentioned in #7512 and #7637, the environment variable SERVO_HEADLESS
enables building the OSMesa version of Servo when it is set to 1.

Instead, this should be a command line option to mach's build command.

Fixes #7637.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7734)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-04 09:49:05 +05:30
commit 3c0cd5eb06
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
python/servo/build_commands.py
View file

@ -29,6 +29,16 @@ def is_headless_build():
return int(os.getenv('SERVO_HEADLESS', 0)) == 1 return int(os.getenv('SERVO_HEADLESS', 0)) == 1
def headless_supported():
supported = sys.platform.startswith("linux")
if not supported:
print("Headless mode (OSMesa) is not supported on your platform.")
print("Building without headless mode.")
return supported
def notify_linux(title, text): def notify_linux(title, text):
try: try:
import dbus import dbus
@ -134,6 +144,10 @@ class MachCommands(CommandBase):
@CommandArgument('--dev', '-d', @CommandArgument('--dev', '-d',
action='store_true', action='store_true',
help='Build in development mode') help='Build in development mode')
@CommandArgument('--headless',
default=None,
action='store_true',
help='Enable headless mode (OSMesa)')
@CommandArgument('--jobs', '-j', @CommandArgument('--jobs', '-j',
default=None, default=None,
help='Number of jobs to run in parallel') help='Number of jobs to run in parallel')
@ -155,7 +169,7 @@ class MachCommands(CommandBase):
@CommandArgument('params', nargs='...', @CommandArgument('params', nargs='...',
help="Command-line arguments to be passed through to Cargo") help="Command-line arguments to be passed through to Cargo")
def build(self, target=None, release=False, dev=False, jobs=None, def build(self, target=None, release=False, dev=False, jobs=None,
features=None, android=None, verbose=False, debug_mozjs=False, params=None): features=None, headless=False, android=None, verbose=False, debug_mozjs=False, params=None):
if android is None: if android is None:
android = self.config["build"]["android"] android = self.config["build"]["android"]
features = features or [] features = features or []
@ -203,7 +217,7 @@ class MachCommands(CommandBase):
if debug_mozjs or self.config["build"]["debug-mozjs"]: if debug_mozjs or self.config["build"]["debug-mozjs"]:
features += ["script/debugmozjs"] features += ["script/debugmozjs"]
if is_headless_build(): if (headless or is_headless_build()) and headless_supported():
opts += ["--no-default-features"] opts += ["--no-default-features"]
features += ["headless"] features += ["headless"]
@ -323,15 +337,19 @@ class MachCommands(CommandBase):
@Command('build-tests', @Command('build-tests',
description='Build the Servo test suites', description='Build the Servo test suites',
category='build') category='build')
@CommandArgument('--headless',
default=None,
action='store_true',
help='Enable headless mode (OSMesa)')
@CommandArgument('--jobs', '-j', @CommandArgument('--jobs', '-j',
default=None, default=None,
help='Number of jobs to run in parallel') help='Number of jobs to run in parallel')
@CommandArgument('--release', default=False, action="store_true", @CommandArgument('--release', default=False, action="store_true",
help="Build tests with release mode") help="Build tests with release mode")
def build_tests(self, jobs=None, verbose=False, release=False): def build_tests(self, headless=False, jobs=None, verbose=False, release=False):
self.ensure_bootstrapped() self.ensure_bootstrapped()
args = ["cargo", "test", "--no-run"] args = ["cargo", "test", "--no-run"]
if is_headless_build(): if (headless or is_headless_build()) and headless_supported():
args += ["--no-default-features", "--features", "headless"] args += ["--no-default-features", "--features", "headless"]
if release: if release:
args += ["--release"] args += ["--release"]