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 2011-03-30 14:50:36 -04:00
commit 3896214336
4 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
acprep
View file

@ -816,24 +816,16 @@ class PrepareBuild(CommandLineApp):
self.log.info('Looks like you are using MacPorts on OS X') self.log.info('Looks like you are using MacPorts on OS X')
packages = [ packages = [
'sudo', 'port', 'install', '-f', 'sudo', 'port', 'install', '-f',
'automake', 'automake', 'autoconf', 'libtool',
'autoconf',
'libtool',
'python26', '+universal', 'python26', '+universal',
'libiconv', '+universal', 'libiconv', '+universal',
'zlib', '+universal', 'zlib', '+universal',
'gmp' ,'+universal', 'gmp' ,'+universal', 'mpfr', '+universal',
'mpfr', '+universal', 'ncurses', '+universal', 'ncursesw', '+universal',
'ncurses', '+universal',
'ncursesw', '+universal',
'gettext' ,'+universal', 'gettext' ,'+universal',
'libedit' ,'+universal', 'libedit' ,'+universal',
#'texlive', 'texlive-xetex', 'doxygen', 'graphviz', 'texinfo',
#'doxygen', 'lcov', 'sloccount'
#'graphviz',
'texinfo',
'lcov',
'sloccount'
] + self.boost_info.dependencies('darwin') ] + self.boost_info.dependencies('darwin')
self.log.info('Executing: ' + string.join(packages, ' ')) self.log.info('Executing: ' + string.join(packages, ' '))
self.execute(*packages) self.execute(*packages)

2
lib/Makefile
View file

@ -33,7 +33,7 @@ ifeq ($(CC),clang)
BOOST_TOOLSET = clang BOOST_TOOLSET = clang
else else
BOOST_TOOLSET = darwin BOOST_TOOLSET = darwin
BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 BOOST_DEFINES += define=_GLIBCXX_DEBUG=1
endif endif
#BOOST_FLAGS = --architecture=x86 --address_model=32_64 #BOOST_FLAGS = --architecture=x86 --address_model=32_64
BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \

8
tools/Makefile.am
View file

@ -413,10 +413,10 @@ unittests: check
2>&1 | grep -v '^GuardMalloc:' 2>&1 | grep -v '^GuardMalloc:'
@sh $(FULLCHECK) $(top_builddir)/ExprTests$(EXEEXT) --verify \ @sh $(FULLCHECK) $(top_builddir)/ExprTests$(EXEEXT) --verify \
2>&1 | grep -v '^GuardMalloc:' 2>&1 | grep -v '^GuardMalloc:'
@sh $(FULLCHECK) $(top_builddir)/DataTests$(EXEEXT) --verify \ # @sh $(FULLCHECK) $(top_builddir)/DataTests$(EXEEXT) --verify \
2>&1 | grep -v '^GuardMalloc:' # 2>&1 | grep -v '^GuardMalloc:'
@sh $(FULLCHECK) $(top_builddir)/ReportTests$(EXEEXT) --verify \ # @sh $(FULLCHECK) $(top_builddir)/ReportTests$(EXEEXT) --verify \
2>&1 | grep -v '^GuardMalloc:' # 2>&1 | grep -v '^GuardMalloc:'
else else
unittests: check unittests: check
@test 1 -eq 1 @test 1 -eq 1

3
tools/proof
View file

@ -14,7 +14,8 @@ fi
rm -fr ~/Products/ledger-proof rm -fr ~/Products/ledger-proof
time ./acprep --enable-doxygen --universal -j16 --gcc46 --warn proof 2>&1 | \ time nice -n 20 \
./acprep --enable-doxygen --universal -j16 --gcc45 --warn proof 2>&1 | \
tee ~/Desktop/proof.log tee ~/Desktop/proof.log
if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then