slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: fix doctest rule

Browse Source
This commit is contained in:
Simon Michael 2010-09-05 22:51:51 +00:00
parent 06066ebd57
commit fe87cf417d
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Hledger/Cli/Tests.hs
View File

@ -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 hledger's doctests are shell tests defined in literal blocks in haddock
documentation in the source, run by doing @make doctest@ in the hledger 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 $1 expenses:food
$-2 income $-2 income
$-1 gifts $-1 gifts

30
Makefile
View File

@ -1,13 +1,15 @@
# hledger project makefile # hledger project makefile
# optional features described in MANUAL, comment out if you don't have the libs # optional features described in MANUAL, comment out if you don't have the libs
#OPTFLAGS=-DCHART -DVTY -DWEB OPTFLAGS=-DWEB -DVTY -DCHART
OPTFLAGS=-DWEB OPTFLAGS=-DWEB -DVTY
#OPTFLAGS=-DWEB
#OPTFLAGS= #OPTFLAGS=
# command to run during "make ci" # command to run during "make ci"
CICMD=web --debug -f ~/personal/current.journal # -f data/sample.journal
CICMD=test CICMD=test
#CICMD=web -f t.journal --debug #CICMD=-f t.journal print
# command line to run during "make prof" and "make heap" # command line to run during "make prof" and "make heap"
PROFCMD=bin/hledgerp -f data/1000x1000x10.journal balance >/dev/null 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 # executables to run during "make simplebench". They should be on the path
# or in the current directory. hledger executables for benchmarking should # or in the current directory. hledger executables for benchmarking should
# generally be the standard optimised cabal build, constrained to parsec 2. # 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 #BENCHEXES=hledger
# misc. tools # misc. tools
RST2PDF=rst2pdf RST2PDF=rst2pdf
#VIEWHTML=open #VIEWHTML=open -a 'Google Chrome'
VIEWHTML=open -a 'Google Chrome' VIEWHTML=google-chrome
VIEWPS=open VIEWPS=open
VIEWPDF=open VIEWPDF=open
PRINT=lpr PRINT=lpr
@ -192,8 +194,8 @@ functest: hledger
# run doc tests # run doc tests
doctest: tools/doctest hledger doctest: tools/doctest hledger
@(tools/doctest Commands/Add.hs \ @(tools/doctest Hledger/Cli/Commands/Add.hs \
&& tools/doctest Tests.hs \ && tools/doctest Hledger/Cli/Tests.hs \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED
# make sure we have no haddock errors # make sure we have no haddock errors
@ -614,6 +616,18 @@ showreleasechanges:
###################################################################### ######################################################################
# MISCELLANEOUS # 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 tag: emacstags
emacstags: emacstags: