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

web: rename -fhapps flag to -fweb

Browse Source
This commit is contained in:
Simon Michael 2009-11-28 15:37:56 +00:00
parent a1de72bea5
commit 8a98b83286
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Commands/All.hs
View File

@ -18,7 +18,7 @@ module Commands.All (
#ifdef VTY #ifdef VTY
module Commands.UI, module Commands.UI,
#endif #endif
#ifdef HAPPS #ifdef WEB
module Commands.Web, module Commands.Web,
#endif #endif
) )
@ -33,6 +33,6 @@ import Commands.Stats
#ifdef VTY #ifdef VTY
import Commands.UI import Commands.UI
#endif #endif
#ifdef HAPPS #ifdef WEB
import Commands.Web import Commands.Web
#endif #endif

4
MANUAL
View File

@ -46,7 +46,7 @@ hledger works on all major platforms. One of these pre-built binaries_ might wor
If not, please report the problem, then install the `Haskell Platform`_ and type:: If not, please report the problem, then install the `Haskell Platform`_ and type::
cabal update cabal update
cabal install hledger [-fvty] [-fhapps] cabal install hledger [-fvty] [-fweb]
The optional -f flags will install more libraries and enable hledger's The optional -f flags will install more libraries and enable hledger's
"ui" and "web" commands respectively. Note -fvty may not work on Microsoft "ui" and "web" commands respectively. Note -fvty may not work on Microsoft
@ -76,7 +76,7 @@ account name or transaction description. Here are some commands to try
hledger reg desc:shop # transactions with shop in the description hledger reg desc:shop # transactions with shop in the description
hledger histogram # transactions per day, or other interval hledger histogram # transactions per day, or other interval
hledger ui # curses ui, if installed with -fvty hledger ui # curses ui, if installed with -fvty
hledger web # web ui, if installed with -fhapps hledger web # web ui, if installed with -fweb
hledger -f new.ledger add # record transactions from the command line hledger -f new.ledger add # record transactions from the command line
Reference Reference

8
Makefile
View File

@ -1,7 +1,7 @@
# 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=-DHAPPS -DVTY OPTFLAGS=-DWEB -DVTY
# command to run during "make ci" # command to run during "make ci"
CICMD=test CICMD=test
@ -37,7 +37,7 @@ default: tag hledger
# build the standard cabal binary # build the standard cabal binary
hledgercabal: hledgercabal:
cabal configure -fhapps -fvty && cabal build cabal configure -fweb -fvty && cabal build
# build the standard developer's binary, quickly # build the standard developer's binary, quickly
hledger: setversion hledger: setversion
@ -160,14 +160,14 @@ warningstest:
quickcabaltest: setversion quickcabaltest: setversion
@(cabal clean \ @(cabal clean \
&& cabal check \ && cabal check \
&& cabal configure -fvty -fhapps \ && cabal configure -fvty -fweb \
&& echo $@ passed) || echo $@ FAILED && echo $@ passed) || echo $@ FAILED
# make sure cabal is happy in all possible ways # make sure cabal is happy in all possible ways
fullcabaltest: setversion fullcabaltest: setversion
@(cabal clean \ @(cabal clean \
&& cabal check \ && cabal check \
&& cabal configure -fvty -fhapps \ && cabal configure -fvty -fweb \
&& cabal build \ && cabal build \
&& dist/build/hledger/hledger test 2>&1 | tail -1 | grep -q 'Errors: 0 Failures: 0' \ && dist/build/hledger/hledger test 2>&1 | tail -1 | grep -q 'Errors: 0 Failures: 0' \
&& cabal sdist \ && cabal sdist \

2
Options.hs
View File

@ -36,7 +36,7 @@ usagehdr =
#ifdef VTY #ifdef VTY
" ui - run a simple text-based UI\n" ++ " ui - run a simple text-based UI\n" ++
#endif #endif
#ifdef HAPPS #ifdef WEB
" web - run a simple web-based UI\n" ++ " web - run a simple web-based UI\n" ++
#endif #endif
" test - run self-tests\n" ++ " test - run self-tests\n" ++

4
Version.hs
View File

@ -64,7 +64,7 @@ configflags = tail [""
#ifdef VTY #ifdef VTY
,"vty" ,"vty"
#endif #endif
#ifdef HAPPS #ifdef WEB
,"happs" ,"web"
#endif #endif
] ]

6
hledger.cabal
View File

@ -33,7 +33,7 @@ flag vty
description: enable the curses ui description: enable the curses ui
default: False default: False
flag happs flag web
description: enable the web ui description: enable the web ui
default: False default: False
@ -126,8 +126,8 @@ executable hledger
build-depends: build-depends:
vty >= 4.0.0.1 && < 4.1 vty >= 4.0.0.1 && < 4.1
if flag(happs) if flag(web)
cpp-options: -DHAPPS cpp-options: -DWEB
other-modules:Commands.Web other-modules:Commands.Web
build-depends: build-depends:
hsp hsp

2
hledger.hs
View File

@ -65,7 +65,7 @@ main = do
#ifdef VTY #ifdef VTY
| cmd `isPrefixOf` "ui" = withLedgerDo opts args cmd ui | cmd `isPrefixOf` "ui" = withLedgerDo opts args cmd ui
#endif #endif
#ifdef HAPPS #ifdef WEB
| cmd `isPrefixOf` "web" = withLedgerDo opts args cmd web | cmd `isPrefixOf` "web" = withLedgerDo opts args cmd web
#endif #endif
| cmd `isPrefixOf` "test" = runtests opts args >> return () | cmd `isPrefixOf` "test" = runtests opts args >> return ()