From 116945e90747163560e6ef315ff3e158bb147bd1 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 7 Dec 2020 11:37:39 -0800 Subject: [PATCH] ;shake: man page date is now updated by manuals, not setversion --- Shake.hs | 15 ++++++--------- hledger-lib/defs.m4 | 4 ++-- hledger-ui/defs.m4 | 4 ++-- hledger-web/defs.m4 | 4 ++-- hledger/defs.m4 | 4 ++-- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Shake.hs b/Shake.hs index ac1865772..4ef4cc25f 100755 --- a/Shake.hs +++ b/Shake.hs @@ -276,20 +276,14 @@ main = do ] cmd Shell gitcommit ("-m '"++msg++"' --") specifiedversionfiles dependents - -- PKG/defs.m4 <- PKG/.version + -- PKG/defs.m4 <- PKG/.version, just updates the _version_ macro "hledger*/defs.m4" %> \out -> do let versionfile = takeDirectory out ".version" need [versionfile] version <- ((head . words) <$>) $ liftIO $ readFile versionfile - date <- liftIO getCurrentDay - let manualdate = formatTime defaultTimeLocale "%B %Y" date - cmd_ Shell sed "-i -e" ( - "'s/(_version_}}, *)\\{\\{[^}]+/\\1{{"++version++"/;" - ++" s/(_monthyear_}}, *)\\{\\{[^}]+/\\1{{"++manualdate++"/;" - ++"'") - out + cmd_ Shell sed "-i -e" ("'s/(_version_}}, *)\\{\\{[^}]+/\\1{{"++version++"/;'") out - -- PKG/package.yaml <- PKG/.version + -- PKG/package.yaml <- PKG/.version, just updates version strings "hledger*/package.yaml" %> \out -> do let versionfile = takeDirectory out ".version" need [versionfile] @@ -369,6 +363,7 @@ main = do cmd Shell gitcommit ("-m '"++msg++"' --") packagem4s nroffmanuals infomanuals txtmanuals -- Generate nroff man pages suitable for man output, from the .m4.md source. + -- Also sets the _monthyear_ macro to current month and year in hledger*/defs.m4. phony "nroffmanuals" $ need nroffmanuals nroffmanuals |%> \out -> do -- hledger/hledger.1 let src = manpageNameToManualName out <.> "m4.md" @@ -376,10 +371,12 @@ main = do dir = takeDirectory out packagem4 = dir "defs.m4" tmpl = "doc/manpage.nroff" + mandate <- formatTime defaultTimeLocale "%B %Y" <$> liftIO getCurrentDay -- assume all other m4 files in dir are included by this one XXX not true in hledger-lib deps <- liftIO $ filter (/= src) . filter (".m4.md" `isSuffixOf`) . map (dir ) <$> S.getDirectoryContents dir need $ [src, commonm4, packagem4, tmpl] ++ deps when (dir=="hledger") $ need commandmds + cmd_ Shell sed "-i -e" (" s/(_monthyear_}}, *)\\{\\{[^}]+/\\1{{"++mandate++"/;") packagem4 cmd Shell "m4 -P -DMAN -I" dir commonm4 packagem4 src "|" pandoc fromsrcmd "-s" "--template" tmpl diff --git a/hledger-lib/defs.m4 b/hledger-lib/defs.m4 index 06046c492..87571be39 100644 --- a/hledger-lib/defs.m4 +++ b/hledger-lib/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl -m4_dnl Program version. Updated by make setversion. +m4_dnl Program version. Updated by Shake setversion m4_define({{_version_}}, {{1.20}})m4_dnl m4_dnl -m4_dnl Date to show in man pages. Updated by make setdate. +m4_dnl Date to show in man pages. Updated by Shake manuals m4_define({{_monthyear_}}, {{December 2020}})m4_dnl diff --git a/hledger-ui/defs.m4 b/hledger-ui/defs.m4 index 06046c492..87571be39 100644 --- a/hledger-ui/defs.m4 +++ b/hledger-ui/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl -m4_dnl Program version. Updated by make setversion. +m4_dnl Program version. Updated by Shake setversion m4_define({{_version_}}, {{1.20}})m4_dnl m4_dnl -m4_dnl Date to show in man pages. Updated by make setdate. +m4_dnl Date to show in man pages. Updated by Shake manuals m4_define({{_monthyear_}}, {{December 2020}})m4_dnl diff --git a/hledger-web/defs.m4 b/hledger-web/defs.m4 index b0b38fbcc..2ce261d0f 100644 --- a/hledger-web/defs.m4 +++ b/hledger-web/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl -m4_dnl Program version. Updated by make setversion. +m4_dnl Program version. Updated by Shake setversion m4_define({{_version_}}, {{1.20.1}})m4_dnl m4_dnl -m4_dnl Date to show in man pages. Updated by make setdate. +m4_dnl Date to show in man pages. Updated by Shake manuals m4_define({{_monthyear_}}, {{December 2020}})m4_dnl diff --git a/hledger/defs.m4 b/hledger/defs.m4 index 06046c492..87571be39 100644 --- a/hledger/defs.m4 +++ b/hledger/defs.m4 @@ -1,7 +1,7 @@ m4_dnl m4 macro definitions used in this package's docs. m4_dnl -m4_dnl Program version. Updated by make setversion. +m4_dnl Program version. Updated by Shake setversion m4_define({{_version_}}, {{1.20}})m4_dnl m4_dnl -m4_dnl Date to show in man pages. Updated by make setdate. +m4_dnl Date to show in man pages. Updated by Shake manuals m4_define({{_monthyear_}}, {{December 2020}})m4_dnl