From fe87cf417d54520c47606f0424ae8c574fd45e4a Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 5 Sep 2010 22:51:51 +0000
Subject: [PATCH] tools: fix doctest rule

---
 Hledger/Cli/Tests.hs |  4 ++--
 Makefile             | 30 ++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Hledger/Cli/Tests.hs b/Hledger/Cli/Tests.hs
index 45a950744..7e9d73a46 100644
--- a/Hledger/Cli/Tests.hs
+++ b/Hledger/Cli/Tests.hs
@@ -12,10 +12,10 @@ by .test files in the tests\/ subdirectory. These can be run by doing
 
 hledger's doctests are shell tests defined in literal blocks in haddock
 documentation in the source, run by doing @make doctest@ in the hledger
-source tree. They are no longer used, but here is an example:
+source tree. They hardly used, but here is an example:
 
 @
-$ hledger -f sample.journal balance o
+$ hledger -f data/sample.journal balance o
                   $1  expenses:food
                  $-2  income
                  $-1    gifts
diff --git a/Makefile b/Makefile
index 02e801b17..abf7b0d4a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,15 @@
 # hledger project makefile
 
 # optional features described in MANUAL, comment out if you don't have the libs
-#OPTFLAGS=-DCHART -DVTY -DWEB
-OPTFLAGS=-DWEB
+OPTFLAGS=-DWEB -DVTY -DCHART
+OPTFLAGS=-DWEB -DVTY
+#OPTFLAGS=-DWEB
 #OPTFLAGS=
 
 # command to run during "make ci"
+CICMD=web --debug -f ~/personal/current.journal # -f data/sample.journal
 CICMD=test
-#CICMD=web -f t.journal --debug
+#CICMD=-f t.journal print
 
 # command line to run during "make prof" and "make heap"
 PROFCMD=bin/hledgerp -f data/1000x1000x10.journal balance >/dev/null
@@ -18,13 +20,13 @@ COVCMD=test
 # executables to run during "make simplebench". They should be on the path
 # or in the current directory. hledger executables for benchmarking should
 # generally be the standard optimised cabal build, constrained to parsec 2.
-BENCHEXES=hledger-0.9 hledger-0.10-1 hledger ledger
+BENCHEXES=hledger-0.9 hledger-0.10-1 hledgeropt ledger
 #BENCHEXES=hledger
 
 # misc. tools
 RST2PDF=rst2pdf
-#VIEWHTML=open
-VIEWHTML=open -a 'Google Chrome'
+#VIEWHTML=open -a 'Google Chrome'
+VIEWHTML=google-chrome
 VIEWPS=open
 VIEWPDF=open
 PRINT=lpr
@@ -192,8 +194,8 @@ functest: hledger
 
 # run doc tests
 doctest: tools/doctest hledger
-	@(tools/doctest Commands/Add.hs \
-		&& tools/doctest Tests.hs \
+	@(tools/doctest Hledger/Cli/Commands/Add.hs \
+		&& tools/doctest Hledger/Cli/Tests.hs \
 		&& echo $@ PASSED) || echo $@ FAILED
 
 # make sure we have no haddock errors
@@ -614,6 +616,18 @@ showreleasechanges:
 ######################################################################
 # MISCELLANEOUS
 
+#LOCAL
+
+# deploy latest build at demo.hledger.org
+deploy:
+	ssh -t simon@joyful.com make -C /repos/hledger deploy
+
+# autobuild web ui showing my personal journal
+autowebmine:
+	sp --no-exts --no-default-map -o bin/hledger ghc --make hledger.hs $(BUILDFLAGS) -DWEB --run web -B -f ~/personal/2010.journal
+
+#
+
 tag: emacstags
 
 emacstags: