Merge branch 'next'

4 files changed, 48 insertions, 15 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 0dd4962c..ad096896 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -247,7 +247,8 @@ endif
 
 ######################################################################
 
-TESTS = RegressTests BaselineTests ManualTests ConfirmTests GenerateTests
+TESTS = RegressTests BaselineTests ManualTests ConfirmTests \
+        GenerateTests
 
 if HAVE_CPPUNIT
 TESTS +=	     \
@@ -258,6 +259,10 @@ TESTS +=	     \
 	ReportTests
 endif
 
+if DEBUG
+TESTS += CheckTests
+endif
+
 if HAVE_BOOST_PYTHON
 TESTS += PyUnitTests
 endif
@@ -409,6 +414,12 @@ GenerateTests: $(srcdir)/test/GenerateTests.py
 	echo "$(PYTHON) $(srcdir)/test/GenerateTests.py -j$(JOBS) $(top_builddir)/ledger$(EXEEXT) $(srcdir) 1 ${1:-20} \"\$$@\"" > $@
 	chmod 755 $@
 
+CheckTests_SOURCES = test/CheckTests.py
+
+CheckTests:
+	echo "$(PYTHON) $(srcdir)/test/CheckTests.py $(top_builddir)/ledger$(EXEEXT) $(srcdir) \"\$$@\"" > $@
+	chmod 755 $@
+
 FULLCHECK=$(srcdir)/test/fullcheck.sh
 
 if HAVE_CPPUNIT
diff --git a/tools/proof b/tools/proof
index 755c3fe7..cd7b6636 100755
--- a/tools/proof
+++ b/tools/proof
@@ -14,8 +14,7 @@ fi
 
 rm -fr ~/Products/ledger-proof
 
-time ./acprep --enable-cache --enable-doxygen \
-    --universal -j16 --warn proof 2>&1 | \
+time ./acprep --enable-doxygen --universal -j16 --warn proof 2>&1 | \
     tee ~/Desktop/proof.log
 
 if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then
@@ -26,9 +25,13 @@ if egrep -q '(ERROR|CRITICAL)' ~/Desktop/proof.log; then
         exit 1
     fi
 else
-    echo "Ledger proof build succeeded"
     echo $VERSION > ~/Products/last-proofed
     mv ~/Desktop/proof.log /tmp
+
+    cd ~/Products/ledger-proof/debug; make docs
+    cd ~/Products/ledger-proof/gcov;  make report
+
+    echo "Ledger proof build succeeded"
 fi
 
 exit 0
diff --git a/tools/push b/tools/push
index 286b3206..0333cf9c 100755
--- a/tools/push
+++ b/tools/push
@@ -2,17 +2,38 @@
 
 set -e
 
+ACPREP="./acprep --universal -j16 --warn opt"
+
 (cd plan/data; git push)
 (cd plan; git commit -a -m "Update TODO files" && git push)
+
+git checkout next
+
+perl -i -pe "s/([-abgrc][0-9]*)?\\]\\)/-$(date +%Y%m%d)])/;" version.m4
+git add version.m4
+echo git commit -m "v$(cat version.m4 | sed 's/.*\[//' | sed 's/\].*//')"
+
 git checkout master
 git merge --no-ff next
 git checkout next
 git rebase master
 git push
+
 git checkout master
-./acprep --enable-cache --universal -j16 --warn opt upload
-cp -p ~/Products/ledger/opt/ledger ~/bin
-./acprep --enable-cache --universal -j16 --warn opt make speedtest 2>&1 \
-    | tee build/last-speed.txt
-mv *.dmg* build
+$ACPREP upload
+$ACPREP make dist
+
+scp ~/Products/ledger/opt/ledger-*.tar.* jw:/srv/ftp/pub/ledger
+openssl md5 *.dmg* ~/Products/ledger/opt/ledger-*.tar.* > build/CHECKSUMS.txt
+openssl sha1 *.dmg* ~/Products/ledger/opt/ledger-*.tar.* >> build/CHECKSUMS.txt
+openssl rmd160 *.dmg* ~/Products/ledger/opt/ledger-*.tar.* >> build/CHECKSUMS.txt
+perl -i -pe 's/\/.*\///;' build/CHECKSUMS.txt
+scp build/CHECKSUMS.txt jw:/srv/ftp/pub/ledger
+
+rsync -az --delete ~/Products/ledger-proof/gcov/doc/report/ jw:/srv/ftp/pub/ledger/lcov/
+
+$ACPREP make speedtest 2>&1 | tee build/last-speed.txt
+
+mv *.dmg* ~/Products/ledger/opt/ledger-*.tar.* build
+
 git checkout next
diff --git a/tools/speed-test.sh b/tools/speed-test.sh
index 0139a11d..0b03147c 100755
--- a/tools/speed-test.sh
+++ b/tools/speed-test.sh
@@ -1,18 +1,16 @@
 #!/bin/bash
 
-set -e
-
-cd ~/src/ledger
 /bin/rm -fr ~/Products/ledger/opt
-./acprep --no-python -j16 opt make check
+
+./acprep -j16 opt update || exit 0
 
 COMMIT=$(git describe --long --all)
 
-SPEEDS=$(./acprep --no-python -j16 opt make speedtest 2>&1 \
+SPEEDS=$(./acprep -j16 opt make speedtest 2>&1 \
          | grep "Finished executing command" \
          | awk '{print $1}' \
          | xargs)
 
-echo $COMMIT,$(echo $SPEEDS | sed 's/ /,/g') >> speed.log
+echo $COMMIT,$(echo $SPEEDS | sed 's/ /,/g') >> ~/src/ledger/speed.log
 
 exit 0