From 8a98bd83b90df24ad780419a4acd9e14f61c4d7c Mon Sep 17 00:00:00 2001 From: thdox Date: Mon, 22 Dec 2014 10:21:20 +0100 Subject: Add instructions for Fedora 20. [ci skip] --- acprep | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) (limited to 'acprep') diff --git a/acprep b/acprep index 9e661aad..1165c2b9 100755 --- a/acprep +++ b/acprep @@ -616,8 +616,8 @@ class PrepareBuild(CommandLineApp): self.execute(*packages) if exists('/etc/redhat-release'): - release = open('/etc/redhat-release') - if release.readline().startswith('CentOS'): + release = open('/etc/redhat-release').readline() + if release.startswith('CentOS'): self.log.info('Looks like you are using YUM on CentOS') packages = [ 'sudo', 'yum', 'install', @@ -648,6 +648,31 @@ class PrepareBuild(CommandLineApp): self.log.info('Looks like you are using Cygwin') self.log.info('Please install the dependencies manually.') + elif release.startswith('Fedora release 20'): + self.log.info('Looks like you are using YUM on Fedora 20') + packages = [ + 'sudo', 'yum', 'install', + 'boost-devel', + 'bzip2-devel', + 'cmake', + 'doxygen', + 'gcc', + 'gcc-c++', + 'gettext', + 'gettext-devel', + 'gmp-devel', + 'lcov', + 'libedit-devel', + 'mpfr-devel', + 'ninja-build', + 'python-devel', + 'sloccount', + 'texinfo', + 'zlib-devel' + ] + self.log.info('Executing: ' + ' '.join(packages)) + self.execute(*packages) + ######################################################################### # Determine the system's basic configuration # ######################################################################### -- cgit v1.2.3 From 69e692dbc54ab6e72d1baad6dcecca55ac2d6077 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Mon, 23 Feb 2015 15:53:20 -0700 Subject: Fix indentation and position of Fedora test. The blame for this section was a bit of a cluster, but, as someone who's not using Fedora, this makes the most logical sense. (Fedora is a version of RH, right?) --- acprep | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'acprep') diff --git a/acprep b/acprep index 1165c2b9..275f2c84 100755 --- a/acprep +++ b/acprep @@ -644,10 +644,6 @@ class PrepareBuild(CommandLineApp): ] self.log.info('Executing: ' + ' '.join(packages)) self.execute(*packages) - elif system.startswith('CYGWIN'): - self.log.info('Looks like you are using Cygwin') - self.log.info('Please install the dependencies manually.') - elif release.startswith('Fedora release 20'): self.log.info('Looks like you are using YUM on Fedora 20') packages = [ @@ -673,6 +669,10 @@ class PrepareBuild(CommandLineApp): self.log.info('Executing: ' + ' '.join(packages)) self.execute(*packages) + elif system.startswith('CYGWIN'): + self.log.info('Looks like you are using Cygwin') + self.log.info('Please install the dependencies manually.') + ######################################################################### # Determine the system's basic configuration # ######################################################################### -- cgit v1.2.3