diff options
Diffstat (limited to 'acprep')
| -rwxr-xr-x | acprep | 39 |
1 files changed, 29 insertions, 10 deletions
@@ -490,17 +490,10 @@ class PrepareBuild(CommandLineApp): # Update local files with the latest information # ######################################################################### - def phase_submodule(self, *args): - self.log.info('Executing phase: submodule') - if self.git_working_tree(): - self.execute('git', 'submodule', 'init') - self.execute('git', 'submodule', 'update') - def phase_pull(self, *args): self.log.info('Executing phase: pull') if self.git_working_tree(): self.execute('git', 'pull') - self.phase_submodule() ######################################################################### # Automatic installation of build dependencies # @@ -569,6 +562,7 @@ class PrepareBuild(CommandLineApp): 'libedit-dev', 'texinfo', 'lcov', + 'libutfcpp-dev', 'sloccount' ] + BoostInfo().dependencies('ubuntu-trusty') elif re.search('saucy', info): @@ -606,6 +600,7 @@ class PrepareBuild(CommandLineApp): 'libedit-dev', 'texinfo', 'lcov', + 'libutfcpp-dev', 'sloccount' ] + BoostInfo().dependencies('ubuntu-precise') else: @@ -616,8 +611,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', @@ -644,6 +639,31 @@ class PrepareBuild(CommandLineApp): ] self.log.info('Executing: ' + ' '.join(packages)) self.execute(*packages) + 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) + elif system.startswith('CYGWIN'): self.log.info('Looks like you are using Cygwin') self.log.info('Please install the dependencies manually.') @@ -860,7 +880,6 @@ class PrepareBuild(CommandLineApp): def phase_config(self, *args): self.log.info('Executing phase: config') - self.phase_submodule() self.phase_configure(*args) if self.should_clean: self.phase_clean() |