Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add info about git commit and date to --version info.

Browse source 
See #8016.
This commit is contained in:
John MacFarlane 2022-04-11 09:33:41 -07:00
parent 810879a02b
commit 9d7c01e4a4
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandoc.cabal
View file

@ -528,7 +528,8 @@ library
xml-types >= 0.3 && < 0.4,
yaml >= 0.11 && < 0.12,
zip-archive >= 0.2.3.4 && < 0.5,
zlib >= 0.5 && < 0.7
zlib >= 0.5 && < 0.7,
githash >= 0.1.6.2 && < 0.2
if !os(windows)
build-depends: unix >= 2.4 && < 2.8
if flag(lua53)

9
src/Text/Pandoc/App/CommandLineOptions.hs
View file

@ -5,6 +5,7 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE TemplateHaskell #-}
{- |
Module : Text.Pandoc.App.CommandLineOptions
Copyright : Copyright (C) 2006-2022 John MacFarlane
@ -70,6 +71,7 @@ import qualified Data.ByteString.Lazy as B
import qualified Data.Map as M
import qualified Data.Text as T
import qualified Text.Pandoc.UTF8 as UTF8
import GitHash
parseOptions :: [OptDescr (Opt -> IO Opt)] -> Opt -> IO Opt
parseOptions options' defaults = do
@ -952,9 +954,14 @@ options =
openlibs
getglobal "_VERSION"
peek top
let buildInfo = either
(\_ -> mempty)
(\gi -> "\nBuilt from commit " ++ giDescribe gi ++
" on " ++ giCommitDate gi)
$$tGitInfoCwdTry
UTF8.hPutStrLn stdout
$ T.pack
$ prg ++ " " ++ T.unpack pandocVersion ++
$ prg ++ " " ++ T.unpack pandocVersion ++ buildInfo ++
compileInfo ++ "\nScripting engine: " ++ luaVersion ++
"\nUser data directory: " ++ defaultDatadir ++
('\n':copyrightMessage)