From 1b1c7cd4ac9efe9f44b31513a33dc68bf6ee1924 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Sun, 20 May 2012 15:23:52 -0500
Subject: A few more CMake-related fixes

---
 tools/build.sh | 11 ++++++-----
 tools/proof    | 26 +++++++++++++-------------
 2 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'tools')

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.
-- 
cgit v1.2.3