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

simplify PATCHES handling, fixes "make ci"

Browse Source
This commit is contained in:
Simon Michael 2009-02-27 05:50:12 +00:00
parent 9333f98b6b
commit 36c76cf7f1
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@
default: tag build default: tag build
# patches since last release tag (as a haskell string literal) # patches since last release tag (as a haskell string literal)
PATCHES:="\"`expr \`darcs changes --count --from-tag=\\\\\.\` - 1`\"" PATCHES:=`expr \`darcs changes --count --from-tag=\\\\\.\` - 1`
# build the normal hledger binary # build the normal hledger binary
BUILD=ghc --make hledger.hs -o hledger -O BUILD=ghc --make hledger.hs -o hledger -O

8
Version.hs
View File

@ -4,14 +4,12 @@ where
import Ledger.Utils import Ledger.Utils
import Options (progname) import Options (progname)
#ifndef PATCHES
#define PATCHES "0"
#endif
-- updated by build process from VERSION -- updated by build process from VERSION
version = "0.3.99" version = "0.3.99"
-- PATCHES defined by build process from repo state -- PATCHES defined by build process from repo state
buildversion = version ++ "." ++ PATCHES buildversion = version ++ "." ++ "\
PATCHES\
"
versionstr = prettify $ splitAtElement '.' buildversion versionstr = prettify $ splitAtElement '.' buildversion
where where

2
hledger.cabal
View File

@ -58,7 +58,7 @@ Executable hledger
Ledger.Types Ledger.Types
Ledger.Utils Ledger.Utils
-- the cabal build does not yet report patches since last release -- the cabal build does not yet report patches since last release
cpp-options: -DPATCHES="0" cpp-options: -DPATCHES=0
if flag(vty) if flag(vty)
Build-Depends:vty>=3.1.8.2 Build-Depends:vty>=3.1.8.2
Other-Modules:UICommand Other-Modules:UICommand