diff options
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 6 | ||||
| -rw-r--r-- | python/servo/command_base.py | 57 | ||||
| -rw-r--r-- | python/servo/package_commands.py | 25 | ||||
| -rw-r--r-- | python/servo/post_build_commands.py | 4 | ||||
| -rw-r--r-- | python/servo/testing_commands.py | 11 |
5 files changed, 90 insertions, 13 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index df727e2776f..275b2309f2e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -209,7 +209,7 @@ class MachCommands(CommandBase): opts += ["--features", "%s" % ' '.join(features)] build_start = time() - env = self.build_env(target=target) + env = self.build_env(target=target, is_build=True) if android: # Build OpenSSL for android @@ -299,7 +299,7 @@ class MachCommands(CommandBase): build_start = time() with cd(path.join("ports", "cef")): ret = call(["cargo", "build"] + opts, - env=self.build_env(), verbose=verbose) + env=self.build_env(is_build=True), verbose=verbose) elapsed = time() - build_start # Generate Desktop Notification if elapsed-time > some threshold value @@ -334,7 +334,7 @@ class MachCommands(CommandBase): if release: opts += ["--release"] - env = self.build_env() + env = self.build_env(is_build=True) env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target", "geckolib").encode("UTF-8") build_start = time() diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 328d0965b65..99dc78235ed 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -7,12 +7,16 @@ # option. This file may not be copied, modified, or distributed # except according to those terms. +import gzip +import itertools +import locale import os from os import path import contextlib import subprocess from subprocess import PIPE import sys +import tarfile import platform import toml @@ -33,6 +37,55 @@ def cd(new_path): os.chdir(previous_path) +@contextlib.contextmanager +def setlocale(name): + """Context manager for changing the current locale""" + saved_locale = locale.setlocale(locale.LC_ALL) + try: + yield locale.setlocale(locale.LC_ALL, name) + finally: + locale.setlocale(locale.LC_ALL, saved_locale) + + +def archive_deterministically(dir_to_archive, dest_archive, prepend_path=None): + """Create a .tar.gz archive in a deterministic (reproducible) manner. + + See https://reproducible-builds.org/docs/archives/ for more details.""" + + def reset(tarinfo): + """Helper to reset owner/group and modification time for tar entries""" + tarinfo.uid = tarinfo.gid = 0 + tarinfo.uname = tarinfo.gname = "root" + tarinfo.mtime = 0 + return tarinfo + + dest_archive = os.path.abspath(dest_archive) + with cd(dir_to_archive): + current_dir = "." + file_list = [current_dir] + for root, dirs, files in os.walk(current_dir): + for name in itertools.chain(dirs, files): + file_list.append(os.path.join(root, name)) + + # Sort file entries with the fixed locale + with setlocale('C'): + file_list.sort(cmp=locale.strcoll) + + # Use a temporary file and atomic rename to avoid partially-formed + # packaging (in case of exceptional situations like running out of disk space). + # TODO do this in a temporary folder after #11983 is fixed + temp_file = '{}.temp~'.format(dest_archive) + with os.fdopen(os.open(temp_file, os.O_WRONLY | os.O_CREAT, 0644), 'w') as out_file: + with gzip.GzipFile('wb', fileobj=out_file, mtime=0) as gzip_file: + with tarfile.open(fileobj=gzip_file, mode='w:') as tar_file: + for entry in file_list: + arcname = entry + if prepend_path is not None: + arcname = os.path.normpath(os.path.join(prepend_path, arcname)) + tar_file.add(entry, filter=reset, recursive=False, arcname=arcname) + os.rename(temp_file, dest_archive) + + def host_triple(): os_type = platform.system().lower() if os_type == "linux": @@ -295,7 +348,7 @@ class CommandBase(object): " --release" if release else "")) sys.exit() - def build_env(self, hosts_file_path=None, target=None): + def build_env(self, hosts_file_path=None, target=None, is_build=False): """Return an extended environment dictionary.""" env = os.environ.copy() if sys.platform == "win32" and type(env['PATH']) == unicode: @@ -392,7 +445,7 @@ class CommandBase(object): env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -W unused-extern-crates" git_info = [] - if os.path.isdir('.git'): + if os.path.isdir('.git') and is_build: git_sha = subprocess.check_output([ 'git', 'rev-parse', '--short', 'HEAD' ]).strip() diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py index 1bd91e6eae1..fd7520fb10b 100644 --- a/python/servo/package_commands.py +++ b/python/servo/package_commands.py @@ -16,7 +16,6 @@ sys.path.append(path.join(path.dirname(sys.argv[0]), "components", "style", "pro import os import shutil import subprocess -import tarfile from mach.registrar import Registrar from datetime import datetime @@ -29,7 +28,14 @@ from mach.decorators import ( from mako.template import Template -from servo.command_base import CommandBase, cd, BuildNotFound, is_macosx, is_windows +from servo.command_base import ( + archive_deterministically, + BuildNotFound, + cd, + CommandBase, + is_macosx, + is_windows, +) from servo.post_build_commands import find_dep_path_newest @@ -146,7 +152,7 @@ class PackageCommands(CommandBase): print("Writing run-servo") bhtml_path = path.join('${0%/*}/../Resources', browserhtml_path.split('/')[-1], 'out', 'index.html') runservo = os.open(dir_to_app + '/Contents/MacOS/run-servo', os.O_WRONLY | os.O_CREAT, int("0755", 8)) - os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo ' + bhtml_path) + os.write(runservo, '#!/bin/bash\nexec ${0%/*}/servo -M -S ' + bhtml_path) os.close(runservo) print("Creating dmg") @@ -205,7 +211,10 @@ class PackageCommands(CommandBase): else: dir_to_package = '/'.join(binary_path.split('/')[:-1]) dir_to_root = '/'.join(binary_path.split('/')[:-3]) - shutil.copytree(dir_to_root + '/resources', dir_to_package + '/resources') + resources_dir = dir_to_package + '/resources' + if os.path.exists(resources_dir): + delete(resources_dir) + shutil.copytree(dir_to_root + '/resources', resources_dir) browserhtml_path = find_dep_path_newest('browserhtml', binary_path) if browserhtml_path is None: print("Could not find browserhtml package; perhaps you haven't built Servo.") @@ -220,7 +229,7 @@ class PackageCommands(CommandBase): delete(dir_to_package + '/build/' + f) print("Writing runservo.sh") # TODO: deduplicate this arg list from post_build_commands - servo_args = ['-w', '-b', + servo_args = ['-w', '-b', '-M', '-S', '--pref', 'dom.mozbrowser.enabled', '--pref', 'dom.forcetouch.enabled', '--pref', 'shell.builtin-key-shortcuts.enabled=false', @@ -234,9 +243,9 @@ class PackageCommands(CommandBase): time = datetime.utcnow().replace(microsecond=0).isoformat() time = time.replace(':', "-") tar_path += time + "-servo-tech-demo.tar.gz" - with tarfile.open(tar_path, "w:gz") as tar: - # arcname is to add by relative rather than absolute path - tar.add(dir_to_package, arcname='servo/') + + archive_deterministically(dir_to_package, tar_path, prepend_path='servo/') + print("Packaged Servo into " + tar_path) @Command('install', diff --git a/python/servo/post_build_commands.py b/python/servo/post_build_commands.py index 733ec665cd6..0ce67a972cf 100644 --- a/python/servo/post_build_commands.py +++ b/python/servo/post_build_commands.py @@ -111,6 +111,10 @@ class PostBuildCommands(CommandBase): # Convert to a relative path to avoid mingw -> Windows path conversions browserhtml_path = path.relpath(browserhtml_path, os.getcwd()) + if not is_windows(): + # multiprocess + sandbox + args = args + ['-M', '-S'] + args = args + ['-w', '--pref', 'dom.mozbrowser.enabled', '--pref', 'dom.forcetouch.enabled', diff --git a/python/servo/testing_commands.py b/python/servo/testing_commands.py index 4776a9209d1..5eaad0ba7b9 100644 --- a/python/servo/testing_commands.py +++ b/python/servo/testing_commands.py @@ -158,6 +158,17 @@ class MachCommands(CommandBase): return suite return None + @Command('test-geckolib', + description='Test geckolib sanity checks', + category='testing') + def test_geckolib(self): + self.ensure_bootstrapped() + + env = self.build_env() + env["RUST_BACKTRACE"] = "1" + + return call(["cargo", "test"], env=env, cwd=path.join("ports", "geckolib")) + @Command('test-unit', description='Run unit tests', category='testing') |