;shake: man page date is now updated by manuals, not setversion
This commit is contained in:
		
							parent
							
								
									21f508f799
								
							
						
					
					
						commit
						116945e907
					
				
							
								
								
									
										15
									
								
								Shake.hs
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								Shake.hs
									
									
									
									
									
								
							| @ -276,20 +276,14 @@ main = do | |||||||
|                 ] |                 ] | ||||||
|           cmd Shell gitcommit ("-m '"++msg++"' --") specifiedversionfiles dependents |           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 |       "hledger*/defs.m4" %> \out -> do | ||||||
|         let versionfile = takeDirectory out </> ".version" |         let versionfile = takeDirectory out </> ".version" | ||||||
|         need [versionfile] |         need [versionfile] | ||||||
|         version <- ((head . words) <$>) $ liftIO $ readFile versionfile |         version <- ((head . words) <$>) $ liftIO $ readFile versionfile | ||||||
|         date    <- liftIO getCurrentDay |         cmd_ Shell sed "-i -e" ("'s/(_version_}}, *)\\{\\{[^}]+/\\1{{"++version++"/;'") out | ||||||
|         let manualdate = formatTime defaultTimeLocale "%B %Y" date |  | ||||||
|         cmd_ Shell sed "-i -e" ( |  | ||||||
|             "'s/(_version_}}, *)\\{\\{[^}]+/\\1{{"++version++"/;" |  | ||||||
|           ++" s/(_monthyear_}}, *)\\{\\{[^}]+/\\1{{"++manualdate++"/;" |  | ||||||
|           ++"'") |  | ||||||
|           out |  | ||||||
| 
 | 
 | ||||||
|       -- PKG/package.yaml <- PKG/.version |       -- PKG/package.yaml <- PKG/.version, just updates version strings | ||||||
|       "hledger*/package.yaml" %> \out -> do |       "hledger*/package.yaml" %> \out -> do | ||||||
|         let versionfile = takeDirectory out </> ".version" |         let versionfile = takeDirectory out </> ".version" | ||||||
|         need [versionfile] |         need [versionfile] | ||||||
| @ -369,6 +363,7 @@ main = do | |||||||
|           cmd Shell gitcommit ("-m '"++msg++"' --") packagem4s nroffmanuals infomanuals txtmanuals |           cmd Shell gitcommit ("-m '"++msg++"' --") packagem4s nroffmanuals infomanuals txtmanuals | ||||||
| 
 | 
 | ||||||
|       -- Generate nroff man pages suitable for man output, from the .m4.md source. |       -- 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 |       phony "nroffmanuals" $ need nroffmanuals | ||||||
|       nroffmanuals |%> \out -> do -- hledger/hledger.1 |       nroffmanuals |%> \out -> do -- hledger/hledger.1 | ||||||
|         let src       = manpageNameToManualName out <.> "m4.md" |         let src       = manpageNameToManualName out <.> "m4.md" | ||||||
| @ -376,10 +371,12 @@ main = do | |||||||
|             dir       = takeDirectory out |             dir       = takeDirectory out | ||||||
|             packagem4 = dir </> "defs.m4" |             packagem4 = dir </> "defs.m4" | ||||||
|             tmpl      = "doc/manpage.nroff" |             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 |         -- 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 |         deps <- liftIO $ filter (/= src) . filter (".m4.md" `isSuffixOf`) . map (dir </>) <$> S.getDirectoryContents dir | ||||||
|         need $ [src, commonm4, packagem4, tmpl] ++ deps |         need $ [src, commonm4, packagem4, tmpl] ++ deps | ||||||
|         when (dir=="hledger") $ need commandmds |         when (dir=="hledger") $ need commandmds | ||||||
|  |         cmd_ Shell sed "-i -e" (" s/(_monthyear_}}, *)\\{\\{[^}]+/\\1{{"++mandate++"/;") packagem4 | ||||||
|         cmd Shell |         cmd Shell | ||||||
|           "m4 -P -DMAN -I" dir commonm4 packagem4 src "|" |           "m4 -P -DMAN -I" dir commonm4 packagem4 src "|" | ||||||
|           pandoc fromsrcmd "-s" "--template" tmpl |           pandoc fromsrcmd "-s" "--template" tmpl | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| m4_dnl m4 macro definitions used in this package's docs. | m4_dnl m4 macro definitions used in this package's docs. | ||||||
| m4_dnl | 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_define({{_version_}}, {{1.20}})m4_dnl | ||||||
| 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 | m4_define({{_monthyear_}}, {{December 2020}})m4_dnl | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| m4_dnl m4 macro definitions used in this package's docs. | m4_dnl m4 macro definitions used in this package's docs. | ||||||
| m4_dnl | 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_define({{_version_}}, {{1.20}})m4_dnl | ||||||
| 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 | m4_define({{_monthyear_}}, {{December 2020}})m4_dnl | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| m4_dnl m4 macro definitions used in this package's docs. | m4_dnl m4 macro definitions used in this package's docs. | ||||||
| m4_dnl | 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_define({{_version_}}, {{1.20.1}})m4_dnl | ||||||
| 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 | m4_define({{_monthyear_}}, {{December 2020}})m4_dnl | ||||||
|  | |||||||
| @ -1,7 +1,7 @@ | |||||||
| m4_dnl m4 macro definitions used in this package's docs. | m4_dnl m4 macro definitions used in this package's docs. | ||||||
| m4_dnl | 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_define({{_version_}}, {{1.20}})m4_dnl | ||||||
| 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 | m4_define({{_monthyear_}}, {{December 2020}})m4_dnl | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user