msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

Setup.hs: fix two problems with querying darcs

Browse Source
This commit is contained in:
hallgren
2012-05-30 16:15:59 +00:00
parent 13cda24924
commit 22e1a5b9f7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Setup.hs
View File

@@ -376,7 +376,7 @@ extractDarcsVersion distFlag =
do info <- E.try askDarcs do info <- E.try askDarcs
updateFile versionModulePath $ unlines $ updateFile versionModulePath $ unlines $
["module "++modname++" where", ["module "++modname++" where",
"darcs_info = "++show info] "darcs_info = "++show (either (const (Left ())) Right info)]
where where
dist = fromFlagOrDefault "dist" distFlag dist = fromFlagOrDefault "dist" distFlag
versionModulePath = dist</>"build"</>"autogen"</>"DarcsVersion_gf.hs" versionModulePath = dist</>"build"</>"autogen"</>"DarcsVersion_gf.hs"
@@ -389,9 +389,9 @@ extractDarcsVersion distFlag =
tag:_ -> ["--from-tag="++tag] tag:_ -> ["--from-tag="++tag]
changes <- lines `fmap` readProcess "darcs" ("changes":from) "" changes <- lines `fmap` readProcess "darcs" ("changes":from) ""
let dates = filter ((`notElem` [""," "]).take 1) changes let dates = filter ((`notElem` [""," "]).take 1) changes
whatsnew <- lines `fmap` readProcess "darcs" ["whatsnew","-s"] "" whatsnew<-E.try $ lines `fmap` readProcess "darcs" ["whatsnew","-s"] ""
return (listToMaybe tags,listToMaybe dates, return (listToMaybe tags,listToMaybe dates,
length dates,length whatsnew) length dates,either (const 0) length whatsnew)
-- | Only update the file if contents has changed -- | Only update the file if contents has changed
updateFile path new = updateFile path new =