sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next'

Browse source
This commit is contained in:
John Wiegley 2009-10-31 06:12:43 -04:00
commit cebc9f6e86
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
*.backup
*.elc *.elc
*.pyc *.pyc
*~ *~

24
acprep
View file

@ -459,11 +459,10 @@ class PrepareBuild(CommandLineApp):
join('po', 'Makevars')) join('po', 'Makevars'))
POTFILES_in = open('po/POTFILES.in', 'w') POTFILES_in = open('po/POTFILES.in', 'w')
for filename in self.get_stdout('git', 'ls-files', '-z', for filename in (f for f in os.listdir(join(self.source_dir, 'src'))
'*.cc', '*.h').split('\0'): if re.search('\.(cc|h)', f)):
if not re.match('(src|python)/', filename): POTFILES_in.write(join('src', filename))
POTFILES_in.write(filename) POTFILES_in.write('\n')
POTFILES_in.write('\n')
POTFILES_in.close() POTFILES_in.close()
def phase_version(self, *args): def phase_version(self, *args):
@ -1330,10 +1329,11 @@ class PrepareBuild(CommandLineApp):
def phase_proof(self, *args): def phase_proof(self, *args):
self.log.info('Executing phase: proof') self.log.info('Executing phase: proof')
self.phase_makeall(reset=False, *args)
self.log.info('=== Copying source tree ===') self.log.info('=== Copying source tree ===')
self.phase_rsync() self.phase_rsync()
self.phase_makeall(reset=True, *args)
self.phase_makeall(*args)
self.configure_flavor('opt') self.configure_flavor('opt')
self.log.info('=== Testing opt ===') self.log.info('=== Testing opt ===')
@ -1354,10 +1354,10 @@ class PrepareBuild(CommandLineApp):
self.log.info('=== Building final distcheck ===') self.log.info('=== Building final distcheck ===')
self.phase_distcheck() self.phase_distcheck()
def phase_makeall(self, *args): def phase_makeall(self, reset=False, *args):
self.log.info('Executing phase: makeall') 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') system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch')
if exists(system_hh_gch): if exists(system_hh_gch):
@ -1366,7 +1366,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('=== Building opt ===') self.log.info('=== Building opt ===')
self.phase_make(*args) 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') system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch')
if exists(system_hh_gch): if exists(system_hh_gch):
@ -1382,7 +1382,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('=== Building default ===') self.log.info('=== Building default ===')
self.phase_make(*args) 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') system_hh_gch = join(self.source_dir, 'src', 'system.hh.gch')
if exists(system_hh_gch): if exists(system_hh_gch):
@ -1391,7 +1391,7 @@ class PrepareBuild(CommandLineApp):
self.log.info('=== Building debug ===') self.log.info('=== Building debug ===')
self.phase_make(*args) self.phase_make(*args)
self.configure_flavor('default', False) self.configure_flavor('default', reset)
######################################################################### #########################################################################
# Help # # Help #

10
tools/proof
View file

@ -2,10 +2,10 @@
set -e set -e
git stash
git checkout master
rm -fr ~/Products/ledger* rm -fr ~/Products/ledger*
(./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log) \ if ./acprep -j16 --warn proof 2>&1 | tee ~/Desktop/proof.log; then
|| notify "Ledger proof build failed" echo "Ledger proof build succeeded"
else
notify "Ledger proof build failed"
fi