diff options
| -rw-r--r-- | README.md | 6 | ||||
| -rw-r--r-- | python/servo/bootstrap.py | 69 | ||||
| -rw-r--r-- | python/servo/bootstrap_commands.py | 9 | ||||
| -rw-r--r-- | python/servo/command_base.py | 7 |
4 files changed, 79 insertions, 12 deletions
diff --git a/README.md b/README.md index db98506d280..54d8c8fc793 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,8 @@ If you've already partially compiled servo but forgot to do this step, run `./ma #### On Debian-based Linuxes +Simply running `./mach bootstrap` should be enough. If not, run the commands below: + ``` sh sudo apt install git curl autoconf libx11-dev \ libfreetype6-dev libgl1-mesa-dri libglib2.0-dev xorg-dev \ @@ -98,6 +100,8 @@ If `virtualenv` does not exist, try `python-virtualenv`. #### On Fedora +Simply running `./mach bootstrap` should be enough. If not, run the commands below: + ``` sh sudo dnf install curl libtool gcc-c++ libXi-devel \ freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \ @@ -108,6 +112,8 @@ sudo dnf install curl libtool gcc-c++ libXi-devel \ ``` #### On CentOS +Simply running `./mach bootstrap` should be enough. If not, run the commands below: + ``` sh sudo yum install curl libtool gcc-c++ libXi-devel \ freetype-devel mesa-libGL-devel mesa-libEGL-devel glib2-devel libX11-devel libXrandr-devel gperf \ diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index e20fda210a6..7bfa80bd8f4 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -17,22 +17,27 @@ import servo.packages as packages from servo.util import extract, download_file, host_triple +def check_gstreamer_lib(): + subprocess.call(["pkg-config", "gstreamer-1.0 >= 1.12"], + stdout=PIPE, stderr=PIPE) == 0 + def run_as_root(command): if os.geteuid() != 0: command.insert(0, 'sudo') return subprocess.call(command) -def install_salt_dependencies(context, force): +def install_linux_deps(context, pkgs_ubuntu, pkgs_fedora, force): install = False + pkgs = [] if context.distro == 'Ubuntu': - pkgs = ['build-essential', 'libssl-dev', 'libffi-dev', 'python-dev'] command = ['apt-get', 'install'] + pkgs = pkgs_ubuntu if subprocess.call(['dpkg', '-s'] + pkgs, stdout=PIPE, stderr=PIPE) != 0: install = True elif context.distro in ['CentOS', 'CentOS Linux', 'Fedora']: installed_pkgs = str(subprocess.check_output(['rpm', '-qa'])).replace('\n', '|') - pkgs = ['gcc', 'libffi-devel', 'python-devel', 'openssl-devel'] + pkgs = pkgs_fedora for p in pkgs: command = ['dnf', 'install'] if "|{}".format(p) not in installed_pkgs: @@ -42,9 +47,52 @@ def install_salt_dependencies(context, force): if install: if force: command.append('-y') - print("Installing missing Salt dependencies...") + print("Installing missing dependencies...") run_as_root(command + pkgs) +def install_salt_dependencies(context, force): + pkgs_apt = ['build-essential', 'libssl-dev', 'libffi-dev', 'python-dev'] + pkgs_dnf = ['gcc', 'libffi-devel', 'python-devel', 'openssl-devel'] + install_linux_deps(context, pkgs_apt, pkgs_dnf, force) + +def gstreamer(context, force=False): + pass + +def linux(context, force=False): + # Please keep these in sync with the packages in README.md + pkgs_apt = ['git', 'curl', 'autoconf', 'libx11-dev', 'libfreetype6-dev', + 'libgl1-mesa-dri', 'libglib2.0-dev', 'xorg-dev', 'gperf', 'g++', + 'build-essential', 'cmake', 'virtualenv', 'python-pip', + 'libbz2-dev', 'libosmesa6-dev', 'libxmu6', 'libxmu-dev', 'libglu1-mesa-dev', + 'libgles2-mesa-dev', 'libegl1-mesa-dev', 'libdbus-1-dev', 'libharfbuzz-dev', + 'ccache', 'clang', 'libgstreamer1.0-dev', 'libgstreamer-plugins-base1.0-dev', + 'libgstreamer-plugins-bad1.0-dev', 'autoconf2.13'] + pkgs_dnf = ['libtool', 'gcc-c++', 'libXi-devel', 'freetype-devel', + 'mesa-libGL-devel', 'mesa-libEGL-devel', 'glib2-devel', 'libX11-devel', + 'libXrandr-devel', 'gperf', 'fontconfig-devel', 'cabextract', 'ttmkfdir', + 'python2', 'python2-virtualenv', 'python2-pip', 'expat-devel', 'rpm-build', + 'openssl-devel', 'cmake', 'bzip2-devel', 'libXcursor-devel', 'libXmu-devel', + 'mesa-libOSMesa-devel', 'dbus-devel', 'ncurses-devel', 'harfbuzz-devel', + 'ccache', 'mesa-libGLU-devel', 'clang', 'clang-libs', 'gstreamer1-devel', + 'gstreamer1-plugins-base-devel', 'gstreamer1-plugins-bad-free-devel', 'autoconf213'] + if context.distro == "Ubuntu": + if context.distro_version == "17.04": + pkgs_apt += ["libssl-dev"] + elif int(context.distro_version.split(".")[0]) < 17: + pkgs_apt += ["libssl-dev"] + else: + pkgs_apt += ["libssl1.0-dev"] + elif context.distro == "Debian" and context.distro_version == "Sid": + pkgs_apt += ["libssl-dev"] + else: + pkgs_apt += ["libssl1.0-dev"] + + install_linux_deps(context, pkgs_apt, pkgs_dnf, force) + + if not check_gstreamer_lib(): + gstreamer(context, force) + + def salt(context, force=False): # Ensure Salt dependencies are installed @@ -226,11 +274,10 @@ def windows_msvc(context, force=False): return 0 -def bootstrap(context, force=False): +def bootstrap(context, force=False, specific=None): '''Dispatches to the right bootstrapping function for the OS.''' bootstrapper = None - if "windows-msvc" in host_triple(): bootstrapper = windows_msvc elif "linux-gnu" in host_triple(): @@ -243,7 +290,15 @@ def bootstrap(context, force=False): 'ubuntu', ]: context.distro = distro - bootstrapper = salt + context.distro_version = version + if specific == "salt": + bootstrapper = salt + elif specific == "gstreamer": + bootstrapper = gstreamer + else: + bootstrapper = linux + else: + raise Exception("mach bootstrap does not support %s, please file a bug" % distro) if bootstrapper is None: print('Bootstrap support is not yet available for your OS.') diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 28e39916f39..66508c5b959 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -55,6 +55,15 @@ class MachCommands(CommandBase): def bootstrap(self, force=False): return bootstrap.bootstrap(self.context, force=force) + @Command('bootstrap-salt', + description='Install and set up the salt environment.', + category='bootstrap') + @CommandArgument('--force', '-f', + action='store_true', + help='Boostrap without confirmation') + def bootstrap_salt(self, force=False): + return bootstrap.bootstrap(self.context, force=force, specific="salt") + @Command('bootstrap-android', description='Install the Android SDK and NDK.', category='bootstrap') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index e8c43b07595..c997b0bcc80 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -24,6 +24,7 @@ import tarfile from xml.etree.ElementTree import XML from servo.util import download_file import urllib2 +from bootstrap import check_gstreamer_lib from mach.registrar import Registrar import toml @@ -476,10 +477,6 @@ class CommandBase(object): bin_folder = path.join(destination_folder, "PFiles", "Mozilla research", "Servo Tech Demo") return path.join(bin_folder, "servo{}".format(BIN_SUFFIX)) - def check_gstreamer_lib(self): - return subprocess.call(["pkg-config", "gstreamer-1.0 >= 1.12"], - stdout=PIPE, stderr=PIPE) == 0 - def build_env(self, hosts_file_path=None, target=None, is_build=False, test_unit=False): """Return an extended environment dictionary.""" env = os.environ.copy() @@ -524,7 +521,7 @@ class CommandBase(object): gstpath = path.join(os.getcwd(), "support", "linux", "gstreamer", "gstreamer") if sys.platform == "linux2" and path.isdir(gstpath): - if True: + if not check_gstreamer_lib(): if "x86_64" not in (target or host_triple()): raise Exception("We don't currently support using local gstreamer builds \ for non-x86_64, please file a bug") |