Merge pull request #287 from thdox/fix-for-ubuntu-14.04

Fix for ubuntu 14.04
This commit is contained in:
Craig Earls 2014-05-11 09:11:01 -07:00
commit 942ad3ef08
3 changed files with 44 additions and 98 deletions

View file

@ -54,11 +54,12 @@ it's usually fairly obvious where things have gone astray.
GNU/Linux system (or Debian-based system such as Ubuntu), something
like this should work (as root):
sudo apt-get install build-essential cmake autopoint texinfo python-dev \
sudo apt-get install build-essential cmake texinfo python-dev \
zlib1g-dev libbz2-dev libgmp3-dev gettext libmpfr-dev \
libboost-date-time-dev libboost-filesystem-dev \
libboost-graph-dev libboost-iostreams-dev \
libboost-python-dev libboost-regex-dev libboost-test-dev
libboost-python-dev libboost-regex-dev libboost-test-dev \
doxygen libedit-dev libmpc-dev
----------------------------------------------------------------------

View file

@ -111,7 +111,17 @@ run:
### Ubuntu
If you're going to build on Ubuntu, `sudo apt-get install ...` the
following packages (current as of Ubuntu 12.04):
following packages (current as of Ubuntu 14.04):
sudo apt-get install build-essential cmake doxygen
libboost-system1.55-dev libboost1.55-dev python-dev
gettext git libboost-date-time1.55-dev
libboost-filesystem1.55-dev libboost-iostreams1.55-dev
libboost-python1.55-dev libboost-regex1.55-dev
libboost-test1.55-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
@ -119,13 +129,6 @@ following packages (current as of Ubuntu 12.04):
libboost-filesystem-dev libboost-python-dev texinfo lcov
sloccount libboost-iostreams-dev libboost-test-dev
Or, for Ubuntu Karmic:
sudo apt-get install build-essential cmake texinfo python-dev zlib1g-dev
libbz2-dev libgmp3-dev bjam gettext cvs libboost-dev
libboost-regex-dev libboost-date-time-dev
libboost-filesystem-dev libmpfr-dev
### Debian
Debian squeeze (6.0): the version of boost in squeeze is too old

118
acprep
View file

@ -71,6 +71,16 @@ class BoostInfo(object):
if system == 'centos':
return [ 'boost-devel' ]
elif system == 'ubuntu-trusty':
return [ 'libboost1.55-dev',
'libboost-date-time1.55-dev',
'libboost-filesystem1.55-dev',
'libboost-iostreams1.55-dev',
'libboost-python1.55-dev',
'libboost-regex1.55-dev',
'libboost-system1.55-dev',
'libboost-test1.55-dev' ]
elif system == 'ubuntu-saucy' or system == 'ubuntu-precise':
return [ 'autopoint',
'libboost-dev',
@ -90,22 +100,6 @@ class BoostInfo(object):
'libboost-iostreams-dev',
'libboost-python-dev' ]
elif system == 'ubuntu-karmic' or system == 'ubuntu-hardy':
return [ 'bjam', 'libboost-dev',
'libboost-regex-dev',
'libboost-date-time-dev',
'libboost-filesystem-dev',
'libboost-iostreams-dev',
'libboost-python-dev' ]
elif system == 'ubuntu-oneiric':
return [ 'libboost-dev',
'libboost-python-dev',
'libboost-regex-dev',
'libboost-date-time-dev',
'libboost-filesystem-dev',
'libboost-iostreams-dev' ]
class CommandLineApp(object):
"Base class for building command line applications."
@ -563,7 +557,26 @@ class PrepareBuild(CommandLineApp):
release = open('/etc/lsb-release')
info = release.read()
release.close()
if re.search('saucy', info):
if re.search('trusty', info):
self.log.info('Looks like you are using APT on Ubuntu Trusty')
packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'doxygen',
'cmake',
'ninja-build',
'zlib1g-dev',
'libbz2-dev',
'python-dev',
'libgmp3-dev',
'libmpfr-dev',
'gettext',
'libedit-dev',
'texinfo',
'lcov',
'sloccount'
] + BoostInfo().dependencies('ubuntu-trusty')
elif re.search('saucy', info):
self.log.info('Looks like you are using APT on Ubuntu Saucy')
packages = [
'sudo', 'apt-get', 'install',
@ -600,77 +613,6 @@ class PrepareBuild(CommandLineApp):
'lcov',
'sloccount'
] + BoostInfo().dependencies('ubuntu-precise')
elif re.search('karmic', info):
self.log.info('Looks like you are using APT on Ubuntu Karmic')
packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'libtool',
'autoconf',
'automake',
'zlib1g-dev',
'libbz2-dev',
'python-dev',
'libgmp3-dev',
'libmpfr-dev',
'gettext',
'cvs',
'libedit-dev',
#'texlive-full',
#'doxygen',
#'graphviz',
'texinfo',
'lcov',
'sloccount'
] + BoostInfo().dependencies('ubuntu-karmic')
elif re.search('hardy', info):
self.log.info('Looks like you are using APT on Ubuntu Hardy')
packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'libtool',
'autoconf',
'automake',
'autopoint',
'zlib1g-dev',
'libbz2-dev',
'python-dev',
'cvs',
'gettext',
'libgmp3-dev',
'libmpfr-dev',
'libedit-dev',
#'texlive-full',
#'doxygen',
#'graphviz',
'texinfo',
'lcov',
'sloccount'
] + self.boost_info.dependencies('ubuntu-hardy')
elif re.search('oneiric', info):
self.log.info('Looks like you are using APT on Ubuntu Oneiric')
packages = [
'sudo', 'apt-get', 'install',
'build-essential',
'libtool',
'autoconf',
'automake',
'autopoint',
'zlib1g-dev',
'libbz2-dev',
'python-dev',
'cvs',
'gettext',
'libgmp3-dev',
'libmpfr-dev',
'libedit-dev',
#'texlive-full',
#'doxygen',
#'graphviz',
'texinfo',
'lcov',
'sloccount'
] + self.boost_info.dependencies('ubuntu-oneiric')
else:
self.log.info('I do not recognize your version of Ubuntu!')
packages = None