Merge pull request #1733 from pascalfleury/ubuntu_deps_update

Ubuntu deps update

2 files changed, 44 insertions, 49 deletions

diff --git a/README.md b/README.md
index 0ddec293..1b0c3ba9 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ run:
 ### Ubuntu
 
 If you're going to build on Ubuntu, `sudo apt-get install ...` the
-following packages (current as of Ubuntu 14.04):
+following packages (current as of Ubuntu 18.04):
 
     $ sudo apt-get install build-essential cmake doxygen \
          libboost-system-dev libboost-dev python-dev gettext git \
@@ -122,14 +122,6 @@ following packages (current as of Ubuntu 14.04):
          libboost-iostreams-dev libboost-python-dev libboost-regex-dev \
          libboost-test-dev libedit-dev libgmp3-dev libmpfr-dev texinfo
 
-Or, for Ubuntu 12.04:
-
-    $ sudo apt-get install build-essential cmake zlib1g-dev libbz2-dev \
-         python-dev gettext libgmp3-dev libmpfr-dev libboost-dev \
-         libboost-regex-dev libboost-date-time-dev \
-         libboost-filesystem-dev libboost-python-dev texinfo lcov \
-         sloccount libboost-iostreams-dev libboost-test-dev
-
 ### Debian
 
 Debian 9 (stretch), Debian 10 (buster), Debian testing and Debian unstable
diff --git a/acprep b/acprep
index bcbf1308..a6f34cad 100755
--- a/acprep
+++ b/acprep
@@ -62,17 +62,7 @@ class BoostInfo(object):
         if system == 'centos':
             return [ 'boost-devel' ]
 
-        elif system == 'ubuntu-xenial':
-            return [ 'libboost-dev',
-                     'libboost-date-time-dev',
-                     'libboost-filesystem-dev',
-                     'libboost-iostreams-dev',
-                     'libboost-python-dev',
-                     'libboost-regex-dev',
-                     'libboost-system-dev',
-                     'libboost-test-dev' ]
-
-        elif system == 'ubuntu-trusty':
+        elif system == 'ubuntu-bionic' or system == 'ubuntu-xenial' or system == 'ubuntu-trusty':
             return [ 'libboost-dev',
                      'libboost-date-time-dev',
                      'libboost-filesystem-dev',
@@ -510,7 +500,7 @@ class PrepareBuild(CommandLineApp):
 
         self.log.info("Installing Ledger's build dependencies ...")
 
-        system = self.get_stdout('uname', '-s')
+        system = self.get_stdout('uname', '-s').decode('utf8')
 
         if system == 'Darwin':
             if exists('/opt/local/bin/port'):
@@ -548,14 +538,17 @@ class PrepareBuild(CommandLineApp):
             if exists('/etc/issue'):
                 issue = open('/etc/issue')
                 if issue.readline().startswith('Ubuntu'):
-                    release = open('/etc/lsb-release')
-                    info = release.read()
-                    release.close()
-                    if re.search('trusty', info):
-                        self.log.info('Looks like you are using APT on Ubuntu Trusty')
-                        packages = [
-                            'sudo', 'apt-get', 'install',
-                            'build-essential',
+                    info = dict([line.strip().split('=', 1)
+                                 for line in open('/etc/lsb-release')])
+                    release = info['DISTRIB_CODENAME']
+                    self.log.info('Looks like you are using APT on Ubuntu ' + release)
+                    packages = [
+                        'sudo', 'apt-get', 'install',
+                        'build-essential',
+                    ]
+
+                    if release == 'bionic':
+                        packages.extend([
                             'doxygen',
                             'cmake',
                             'ninja-build',
@@ -570,12 +563,9 @@ class PrepareBuild(CommandLineApp):
                             'lcov',
                             'libutfcpp-dev',
                             'sloccount'
-                        ] + BoostInfo().dependencies('ubuntu-trusty')
-                    elif re.search('xenial', info):
-                        self.log.info('Looks like you are using APT on Ubuntu Xenial')
-                        packages = [
-                            'sudo', 'apt-get', 'install',
-                            'build-essential',
+                        ])
+                    elif release == 'trusty':
+                        packages.extend([
                             'doxygen',
                             'cmake',
                             'ninja-build',
@@ -590,13 +580,27 @@ class PrepareBuild(CommandLineApp):
                             'lcov',
                             'libutfcpp-dev',
                             'sloccount'
-                        ] + BoostInfo().dependencies('ubuntu-xenial')
-                    elif re.search('saucy', info):
-                        self.log.info('Looks like you are using APT on Ubuntu Saucy')
-                        packages = [
-                            'sudo', 'apt-get', 'install',
-                            'build-essential',
-                            'libtool',
+                        ])
+                    elif release == 'xenial':
+                        packages.extend([
+                            'doxygen',
+                            'cmake',
+                            'ninja-build',
+                            'zlib1g-dev',
+                            'libbz2-dev',
+                            'python-dev',
+                            'libgmp3-dev',
+                            'libmpfr-dev',
+                            'gettext',
+                            'libedit-dev',
+                            'texinfo',
+                            'lcov',
+                            'libutfcpp-dev',
+                            'sloccount'
+                        ])
+                    elif release == 'saucy':
+                        packages.extend([
+                            'doxygen',
                             'cmake',
                             'ninja-build',
                             'zlib1g-dev',
@@ -609,12 +613,9 @@ class PrepareBuild(CommandLineApp):
                             'texinfo',
                             'lcov',
                             'sloccount'
-                        ] + BoostInfo().dependencies('ubuntu-saucy')
-                    elif re.search('precise', info):
-                        self.log.info('Looks like you are using APT on Ubuntu Precise')
-                        packages = [
-                            'sudo', 'apt-get', 'install',
-                            'build-essential',
+                        ])
+                    elif release == 'precise':
+                        packages.extend([
                             'libtool',
                             'cmake',
                             'zlib1g-dev',
@@ -628,11 +629,13 @@ class PrepareBuild(CommandLineApp):
                             'lcov',
                             'libutfcpp-dev',
                             'sloccount'
-                        ] + BoostInfo().dependencies('ubuntu-precise')
+                        ])
                     else:
                         self.log.info('I do not recognize your version of Ubuntu!')
                         packages = None
                     if packages:
+                        packages.extend(
+                            BoostInfo().dependencies('ubuntu-' + release))
                         self.log.info('Executing: ' + ' '.join(packages))
                         self.execute(*packages)