From cc919b803942b102908fce07507ced7c888aaea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wi=C4=85cek?= Date: Sun, 5 May 2019 20:46:50 +0200 Subject: [PATCH 1/3] Changes for Ubuntu 19.04 --- python/servo/bootstrap.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 28292ea3510..ce959f48c7c 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -124,7 +124,7 @@ def linux(context, force=False): '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": + if context.distro_version == "17.04" or context.distro_version == "19.04": pkgs_apt += ["libssl-dev"] elif int(context.distro_version.split(".")[0]) < 17: pkgs_apt += ["libssl-dev"] @@ -384,14 +384,19 @@ def get_linux_distribution(): base_version = '10.10' else: raise Exception('unsupported version of %s: %s' % (distro, version)) - distro, version = 'Ubuntu', base_version + elif distro.lower() == 'ubuntu': + if version == '19.04': + base_version = '19.04' + else: + raise Exception('unsupported version of %s: %s' % (distro, version)) + distro, version = 'Ubuntu', base_version + #fixme: we should allow checked/supported versions only elif distro.lower() not in [ 'centos', 'centos linux', 'debian', 'fedora', - 'ubuntu', ]: raise Exception('mach bootstrap does not support %s, please file a bug' % distro) From d077fb7244646d486930cc3d702cb440ddd648f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wi=C4=85cek?= Date: Sun, 5 May 2019 21:16:32 +0200 Subject: [PATCH 2/3] Fix typo for last change in bootstrap.py --- python/servo/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index ce959f48c7c..9e5fcbc1440 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -391,7 +391,7 @@ def get_linux_distribution(): else: raise Exception('unsupported version of %s: %s' % (distro, version)) distro, version = 'Ubuntu', base_version - #fixme: we should allow checked/supported versions only + # Fixme: we should allow checked/supported versions only elif distro.lower() not in [ 'centos', 'centos linux', From fcbba1df6dba1f6d3fd4b250a398ee17b23c29d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wi=C4=85cek?= Date: Mon, 6 May 2019 20:21:12 +0200 Subject: [PATCH 3/3] Improvement inside bootstrap.py after review --- python/servo/bootstrap.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/python/servo/bootstrap.py b/python/servo/bootstrap.py index 9e5fcbc1440..0b5da09501d 100644 --- a/python/servo/bootstrap.py +++ b/python/servo/bootstrap.py @@ -124,7 +124,7 @@ def linux(context, force=False): '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" or context.distro_version == "19.04": + if context.distro_version in ["17.04", "19.04"]: pkgs_apt += ["libssl-dev"] elif int(context.distro_version.split(".")[0]) < 17: pkgs_apt += ["libssl-dev"] @@ -386,11 +386,8 @@ def get_linux_distribution(): raise Exception('unsupported version of %s: %s' % (distro, version)) distro, version = 'Ubuntu', base_version elif distro.lower() == 'ubuntu': - if version == '19.04': - base_version = '19.04' - else: + if version > '19.04': raise Exception('unsupported version of %s: %s' % (distro, version)) - distro, version = 'Ubuntu', base_version # Fixme: we should allow checked/supported versions only elif distro.lower() not in [ 'centos',