simplify PATCHES handling, fixes "make ci"

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

View File

@ -3,7 +3,7 @@
default: tag build
# 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=ghc --make hledger.hs -o hledger -O

View File

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

View File

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