diff options
| -rwxr-xr-x | acprep | 12 | ||||
| -rw-r--r-- | tools/configure.ac | 72 | ||||
| -rwxr-xr-x | tools/proof | 3 | ||||
| -rwxr-xr-x | tools/push | 4 |
4 files changed, 57 insertions, 34 deletions
@@ -480,6 +480,12 @@ class PrepareBuild(CommandLineApp): op.add_option('', '--no-python', action='store_true', dest='no_python', default=False, help='Do not enable Python support by default') + op.add_option('', '--enable-cache', action='store_true', + dest='enable_cache', default=False, + help='Enable use of Boost.Serialization (--cache)') + op.add_option('', '--enable-doxygen', action='store_true', + dest='enable_doxygen', default=False, + help='Enable use of Doxygen to build ref manual ("make docs")') op.add_option('', '--universal', action='store_true', dest='universal', default=False, help='Attempt to build universal binaries') @@ -1015,6 +1021,11 @@ class PrepareBuild(CommandLineApp): # g++ 4.0.1 cannot use PCH headers on OS X 10.5 self.option_no_pch() + if self.options.enable_doxygen: + self.configure_args.append('--enable-doxygen') + if self.options.enable_cache: + self.configure_args.append('--enable-cache') + if exists('/Users/johnw/Projects/ledger/plan/TODO'): self.setup_for_johnw() self.setup_system_directories() @@ -1562,6 +1573,7 @@ class PrepareBuild(CommandLineApp): self.configure_flavor('default', reset=False) self.log.info('=== Testing default ===') self.phase_make('fullcheck') + self.phase_make('docs') self.log.info('=== Building final distcheck ===') self.phase_distcheck() diff --git a/tools/configure.ac b/tools/configure.ac index 7762b5ba..e3149a18 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -65,6 +65,16 @@ AC_ARG_ENABLE(doxygen, AM_CONDITIONAL(USE_DOXYGEN, test x$doxygen = xtrue) +AC_ARG_ENABLE(cache, + [ --enable-cache Enable use of the --cache option], + [case "${enableval}" in + yes) cache=true ;; + no) cache=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-cache) ;; + esac],[cache=false]) + +AM_CONDITIONAL(USE_CACHE_OPTION, test x$cache = xtrue) + AC_ARG_ENABLE(python, [ --enable-python Turn on Python support (experimental)], [case "${enableval}" in @@ -315,38 +325,36 @@ else fi # check for boost_serialization -# AC_CACHE_CHECK( -# [if boost_serialization is available], -# [boost_serialization_cpplib_avail_cv_], -# [boost_serialization_save_libs=$LIBS -# LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS" -# AC_LANG_PUSH(C++) -# AC_LINK_IFELSE( -# [AC_LANG_PROGRAM( -# [[#include <boost/archive/binary_oarchive.hpp> -# #include <iostream> -# struct foo { -# int a; -# template<class Archive> -# void serialize(Archive & ar, const unsigned int) { -# ar & a; -# } -# };]], -# [[boost::archive::binary_oarchive oa(std::cout); -# foo x; -# oa << x;]])], -# [boost_serialization_cpplib_avail_cv_=true], -# [boost_serialization_cpplib_avail_cv_=false]) -# AC_LANG_POP -# LIBS=$boost_serialization_save_libs]) -# -# if [test x$boost_serialization_cpplib_avail_cv_ = xtrue ]; then -# AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available]) -# LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS" -# fi -# AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue) - -AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, false) +AC_CACHE_CHECK( + [if boost_serialization is available], + [boost_serialization_cpplib_avail_cv_], + [boost_serialization_save_libs=$LIBS + LIBS="-lboost_serialization$BOOST_SUFFIX -lboost_system$BOOST_SUFFIX $LIBS" + AC_LANG_PUSH(C++) + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include <boost/archive/binary_oarchive.hpp> + #include <iostream> + struct foo { + int a; + template<class Archive> + void serialize(Archive & ar, const unsigned int) { + ar & a; + } + };]], + [[boost::archive::binary_oarchive oa(std::cout); + foo x; + oa << x;]])], + [boost_serialization_cpplib_avail_cv_=true], + [boost_serialization_cpplib_avail_cv_=false]) + AC_LANG_POP + LIBS=$boost_serialization_save_libs]) + +if [test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue]; then + AC_DEFINE([HAVE_BOOST_SERIALIZATION], [1], [Whether Boost.Serialization is available]) + LIBS="-lboost_serialization$BOOST_SUFFIX $LIBS" +fi +AM_CONDITIONAL(HAVE_BOOST_SERIALIZATION, test x$boost_serialization_cpplib_avail_cv_ = xtrue -a x$cache = xtrue) # check for Python if [ test x$python = xtrue ]; then diff --git a/tools/proof b/tools/proof index 7e345234..daebc68c 100755 --- a/tools/proof +++ b/tools/proof @@ -14,7 +14,8 @@ fi rm -fr ~/Products/ledger* -time ./acprep --universal -j16 --warn proof 2>&1 | \ +time ./acprep --enable-cache --enable-doxygen \ + --universal -j16 --warn proof 2>&1 | \ tee ~/Desktop/proof.log if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then @@ -10,6 +10,8 @@ git checkout next git rebase master git push git checkout master -./acprep --universal -j16 --warn opt upload +./acprep --enable-cache --universal -j16 --warn opt upload +./acprep --enable-cache --universal -j16 --warn opt make speedtest | \ + tee build/last-speed.txt mv *.dmg* build git checkout next |