diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | acprep | 24 | ||||
| -rwxr-xr-x | tools/proof | 10 |
3 files changed, 18 insertions, 17 deletions
@@ -1,3 +1,4 @@ +*.backup *.elc *.pyc *~ @@ -459,11 +459,10 @@ class PrepareBuild(CommandLineApp): join('po', 'Makevars')) POTFILES_in = open('po/POTFILES.in', 'w') - for filename in self.get_stdout('git', 'ls-files', '-z', - '*.cc', '*.h').split('\0'): - if not re.match('(src|python)/', filename): - POTFILES_in.write(filename) - POTFILES_in.write('\n') + for filename in (f for f in os.listdir(join(self.source_dir, 'src')) + if re.search('\.(cc|h)', f)): + POTFILES_in.write(join('src', filename)) + POTFILES_in.write('\n') POTFILES_in.close() def phase_version(self, *args): @@ -1330,10 +1329,11 @@ class PrepareBuild(CommandLineApp): def phase_proof(self, *args): self.log.info('Executing phase: proof') + self.phase_makeall(reset=False, *args) + self.log.info('=== Copying source tree ===') self.phase_rsync() - - self.phase_makeall(*args) + self.phase_makeall(reset=True, *args) self.configure_flavor('opt') self.log.info('=== Testing opt ===') @@ -1354,10 +1354,10 @@ class PrepareBuild(CommandLineApp): self.log.info('=== Building final distcheck ===') self.phase_distcheck() - def phase_makeall(self, *args): + def phase_makeall(self, reset=False, *args): self.log.info('Executing phase: makeall') - self.configure_flavor('opt', False) + self.configure_flavor('opt', reset) system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch') if exists(system_hh_gch): @@ -1366,7 +1366,7 @@ class PrepareBuild(CommandLineApp): self.log.info('=== Building opt ===') self.phase_make(*args) - self.configure_flavor('gcov', False) + self.configure_flavor('gcov', reset) system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch') if exists(system_hh_gch): @@ -1382,7 +1382,7 @@ class PrepareBuild(CommandLineApp): self.log.info('=== Building default ===') self.phase_make(*args) - self.configure_flavor('debug', False) + self.configure_flavor('debug', reset) system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch') if exists(system_hh_gch): @@ -1391,7 +1391,7 @@ class PrepareBuild(CommandLineApp): self.log.info('=== Building debug ===') self.phase_make(*args) - self.configure_flavor('default', False) + self.configure_flavor('default', reset) ######################################################################### # Help # diff --git a/tools/proof b/tools/proof index 72104dfb..04afc097 100755 --- a/tools/proof +++ b/tools/proof @@ -2,10 +2,10 @@ set -e -git stash -git checkout master - rm -fr ~/Products/ledger* -(./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log) \ - || notify "Ledger proof build failed" +if ./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log; then + echo "Ledger proof build succeeded" +else + notify "Ledger proof build failed" +fi |