diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 581bbaf6821..ad8025dacdf 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -25,20 +25,6 @@ from mach.decorators import ( from servo.command_base import CommandBase, cd, call -def is_headless_build(): - 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): try: import dbus @@ -136,10 +122,6 @@ class MachCommands(CommandBase): @CommandArgument('--dev', '-d', action='store_true', help='Build in development mode') - @CommandArgument('--headless', - default=None, - action='store_true', - help='Enable headless mode (OSMesa)') @CommandArgument('--jobs', '-j', default=None, help='Number of jobs to run in parallel') @@ -161,7 +143,7 @@ class MachCommands(CommandBase): @CommandArgument('params', nargs='...', help="Command-line arguments to be passed through to Cargo") def build(self, target=None, release=False, dev=False, jobs=None, - features=None, headless=False, android=None, verbose=False, debug_mozjs=False, params=None): + features=None, android=None, verbose=False, debug_mozjs=False, params=None): if android is None: android = self.config["build"]["android"] features = features or [] @@ -212,10 +194,6 @@ class MachCommands(CommandBase): if debug_mozjs or self.config["build"]["debug-mozjs"]: features += ["script/debugmozjs"] - if (headless or is_headless_build()) and headless_supported(): - opts += ["--no-default-features"] - features += ["headless"] - if android: features += ["android_glue"] @@ -378,20 +356,14 @@ class MachCommands(CommandBase): @Command('build-tests', description='Build the Servo test suites', category='build') - @CommandArgument('--headless', - default=None, - action='store_true', - help='Enable headless mode (OSMesa)') @CommandArgument('--jobs', '-j', default=None, help='Number of jobs to run in parallel') @CommandArgument('--release', default=False, action="store_true", help="Build tests with release mode") - def build_tests(self, headless=False, jobs=None, verbose=False, release=False): + def build_tests(self, jobs=None, verbose=False, release=False): self.ensure_bootstrapped() args = ["cargo", "test", "--no-run"] - if (headless or is_headless_build()) and headless_supported(): - args += ["--no-default-features", "--features", "headless"] if release: args += ["--release"] return call( |