diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-05-15 00:22:00 -0600 |
| commit | 72dd4d85bdd1f6da79dee405366311e6da96776b (patch) | |
| tree | e3e0a0d6bb7bec06505965da4e845e12bbc63971 /tools | |
| parent | 64a9b42381c26baf24e58b40f50f0b253e551811 (diff) | |
| parent | 96172669053bbba7263a370f109f70615049a0c6 (diff) | |
| download | fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.gz fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.tar.bz2 fork-ledger-72dd4d85bdd1f6da79dee405366311e6da96776b.zip | |
Merge branch 'release/v3.0.0-20120510'
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure.ac | 28 | ||||
| -rwxr-xr-x | tools/proof | 22 |
2 files changed, 39 insertions, 11 deletions
diff --git a/tools/configure.ac b/tools/configure.ac index f7623f62..418ffd7d 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -527,6 +527,34 @@ AC_CACHE_CHECK( AM_CONDITIONAL(HAVE_BOOST_TEST, test x$boost_test_avail_cv_ = xtrue) +# check for C++11 and libc++ +#AC_CACHE_CHECK( +# [if C++11 and libc++ are available], +# [cpp11_avail_cv_], +# [cpp11_save_cxxflags=$CXXFLAGS +# cpp11_save_ldflags=$LDFLAGS +# CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS" +# LDFLAGS="-stdlib=libc++ $LDFLAGS" +# AC_LANG_PUSH(C++) +# AC_LINK_IFELSE( +# [AC_LANG_PROGRAM( +# [[#include <boost/regex.hpp> +# #include <iostream>]], +# [[boost::regex foo_regexp("Hello, world!"); +# for (auto i : "Hello, world") +# std::cout << i << std::endl;]])], +# [cpp11_avail_cv_=true], +# [cpp11_avail_cv_=false]) +# AC_LANG_POP +# CXXFLAGS="$cpp11_save_cxxflags" +# LDFLAGS="$cpp11_save_ldflags"]) +# +#if [test x$cpp11_avail_cv_ = xtrue]; then +# AC_DEFINE([HAVE_CPP11], [1], [Whether C++11 and libc++ are available]) +# CXXFLAGS="-std=c++11 -stdlib=libc++ $CXXFLAGS" +# LDFLAGS="-stdlib=libc++ $LDFLAGS" +#fi + # Checks for header files. AC_HEADER_STDC AC_HEADER_STAT diff --git a/tools/proof b/tools/proof index 00c7f7d1..33f825de 100755 --- a/tools/proof +++ b/tools/proof @@ -20,19 +20,19 @@ ledger_proof() { time nice -n 20 \ ./acprep --debug --enable-doxygen --universal --gcc47 -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof.log + tee -a $LOGDIR/ledger-proof-gcc47.log time nice -n 20 \ ./acprep --debug --enable-doxygen --universal --python --gcc47 -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof.log + tee -a $LOGDIR/ledger-proof-gcc47-python.log - time nice -n 20 \ - ./acprep --debug --enable-doxygen --universal --clang -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof.log - - time nice -n 20 \ - ./acprep --debug --enable-doxygen --universal --python --clang -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof.log + #time nice -n 20 \ + # ./acprep --debug --enable-doxygen --universal --clang -j16 proof 2>&1 | \ + # tee -a $LOGDIR/ledger-proof-clang.log + # + #time nice -n 20 \ + # ./acprep --debug --enable-doxygen --universal --python --clang -j16 proof 2>&1 | \ + # tee -a $LOGDIR/ledger-proof-clang-python.log if egrep -q '(ERROR|CRITICAL)' $LOGDIR/ledger-proof.log; then mutt -a $LOGDIR/ledger-proof.log \ @@ -48,8 +48,8 @@ EOF else echo $VERSION > $DEST/last-proofed - cd $DEST/ledger-proof/debug; make docs - cd $DEST/ledger-proof/gcov; make report + cd $DEST/ledger-proof-python-gcc47/debug; make docs + cd $DEST/ledger-proof-python-gcc47/gcov; make report mutt -s '[ledger] Proof build succeeded' johnw@newartisans.com <<EOF Ledger proof build succeeded! at commit $VERSION. |