diff options
| author | John Wiegley <johnw@newartisans.com> | 2012-05-20 15:23:52 -0500 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2012-05-20 15:23:52 -0500 |
| commit | 1b1c7cd4ac9efe9f44b31513a33dc68bf6ee1924 (patch) | |
| tree | c36e4190510474bececa37e657f659caed5aa7ae | |
| parent | f579e6ddacb08ffeb124a9ec87b7faf7e9683a3c (diff) | |
| download | fork-ledger-1b1c7cd4ac9efe9f44b31513a33dc68bf6ee1924.tar.gz fork-ledger-1b1c7cd4ac9efe9f44b31513a33dc68bf6ee1924.tar.bz2 fork-ledger-1b1c7cd4ac9efe9f44b31513a33dc68bf6ee1924.zip | |
A few more CMake-related fixes
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/system.hh.in | 2 | ||||
| -rw-r--r-- | src/utils.h | 5 | ||||
| -rwxr-xr-x | tools/build.sh | 11 | ||||
| -rwxr-xr-x | tools/proof | 26 |
5 files changed, 21 insertions, 29 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 046e9b05..6e845b01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,15 +24,9 @@ option(BUILD_EMACSLISP "Build and install ledger-mode for Emacs" OFF) if(BUILD_DEBUG) set(CMAKE_BUILD_TYPE Debug) set(DEBUG_MODE 1) - set(NDEBUG 0) -elseif(NO_ASSERTS) - set(CMAKE_BUILD_TYPE Release) - set(DEBUG_MODE 0) - set(NDEBUG 1) else() set(CMAKE_BUILD_TYPE Release) set(DEBUG_MODE 0) - set(NDEBUG 0) endif() ######################################################################## diff --git a/src/system.hh.in b/src/system.hh.in index 1b870d55..c84ded63 100644 --- a/src/system.hh.in +++ b/src/system.hh.in @@ -75,7 +75,7 @@ #define HAVE_BOOST_SERIALIZATION 0 #define DEBUG_MODE @DEBUG_MODE@ -#define NDEBUG @NDEBUG@ +#define NO_ASSERTS @NO_ASSERTS@ #define DOCUMENT_MODEL 0 #define REDUCE_TO_INTEGER 0 diff --git a/src/utils.h b/src/utils.h index 893b3d70..0a3afc4d 100644 --- a/src/utils.h +++ b/src/utils.h @@ -52,18 +52,15 @@ #define TIMERS_ON 1 #if DEBUG_MODE -#define NO_ASSERTS 0 #define VERIFY_ON 1 #define TRACING_ON 1 #define DEBUG_ON 1 -#elif NDEBUG -#define NO_ASSERTS 1 +#elif NO_ASSERTS //#define NO_LOGGING 1 #define VERIFY_ON 0 #define TRACING_ON 0 #define DEBUG_ON 0 #else -#define NO_ASSERTS 0 #define TRACING_ON 1 // use --trace X to enable #define VERIFY_ON 0 #define TRACING_ON 0 diff --git a/tools/build.sh b/tools/build.sh index 8be7335a..f0522451 100755 --- a/tools/build.sh +++ b/tools/build.sh @@ -1,8 +1,9 @@ #!/bin/sh -time ( \ - cd ~/src/ledger ; \ - PATH=/usr/local/bin:/opt/local/bin:$PATH \ - nice -n 20 \ - ./acprep --debug --python --doxygen --cache --clang -j20 make -- check \ +time ( \ + cd ~/src/ledger ; \ + PATH=/usr/local/bin:/opt/local/bin:$PATH \ + nice -n 20 ./acprep --debug --python --doxygen make -j20 && \ + PATH=/usr/local/bin:/opt/local/bin:$PATH \ + nice -n 20 ./acprep --debug --python --doxygen check -j20 \ )
\ No newline at end of file diff --git a/tools/proof b/tools/proof index 33f825de..2c0fa836 100755 --- a/tools/proof +++ b/tools/proof @@ -19,20 +19,20 @@ ledger_proof() { date > $LOGDIR/ledger-proof.log time nice -n 20 \ - ./acprep --debug --enable-doxygen --universal --gcc47 -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof-gcc47.log + ./acprep --debug --doxygen --compiler=g++-4.7 proof -j16 2>&1 | \ + tee -a $LOGDIR/ledger-proof-g++-4.7.log time nice -n 20 \ - ./acprep --debug --enable-doxygen --universal --python --gcc47 -j16 proof 2>&1 | \ - tee -a $LOGDIR/ledger-proof-gcc47-python.log + ./acprep --debug --doxygen --python --compiler=g++-4.7 proof -j16 2>&1 | \ + tee -a $LOGDIR/ledger-proof-g++-4.7-python.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 + time nice -n 20 \ + ./acprep --debug --doxygen --compiler=clang-3.1 proof -j16 2>&1 | \ + tee -a $LOGDIR/ledger-proof-clang-3.1.log + + time nice -n 20 \ + ./acprep --debug --doxygen --python --compiler=clang-3.1 proof -j16 2>&1 | \ + tee -a $LOGDIR/ledger-proof-clang-3.1-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-python-gcc47/debug; make docs - cd $DEST/ledger-proof-python-gcc47/gcov; make report + cd $DEST/ledger-proof-python-g++-4.7/debug; make docs + cd $DEST/ledger-proof-python-g++-4.7/gcov; make report mutt -s '[ledger] Proof build succeeded' johnw@newartisans.com <<EOF Ledger proof build succeeded! at commit $VERSION. |