diff options
author | Craig Earls <enderw88@gmail.com> | 2015-08-06 19:38:39 -0700 |
---|---|---|
committer | Craig Earls <enderw88@gmail.com> | 2015-08-06 19:38:39 -0700 |
commit | 0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c (patch) | |
tree | fea3628fe67824069641f517a659cd88287ffdfc /acprep | |
parent | 254d82e5eb123feaf87e3f7096a1f8389bac60b3 (diff) | |
parent | 3c2d228ddc74b75122b07a87bbd06263092a9661 (diff) | |
download | fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.tar.gz fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.tar.bz2 fork-ledger-0e82bd0d63bd0a6e9a9c77f0ef55e332b357368c.zip |
Merge commit '3c2d228ddc74b75122b07a87bbd06263092a9661' into next
Diffstat (limited to 'acprep')
-rwxr-xr-x | acprep | 10 |
1 files changed, 2 insertions, 8 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: @@ -885,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() |