diff --git a/Shake.hs b/Shake.hs index 492a71551..087fe0f46 100755 --- a/Shake.hs +++ b/Shake.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc +{- stack runghc --verbosity info --package base-prelude --package directory --package extra @@ -7,6 +7,7 @@ --package safe --package shake --package time + --package pandoc -} {- Usage: see below. @@ -49,6 +50,7 @@ usage = [i|Usage: Commands: compile manpages + webmanual |] manpages :: [String] @@ -72,10 +74,10 @@ buildDir :: FilePath buildDir = ".build" pandocExe :: String -pandocExe = "pandoc" +pandocExe = "stack exec -- pandoc" -- use the pandoc required above pandocFiltersResolver :: String -pandocFiltersResolver = "--resolver lts-5.11" +pandocFiltersResolver = "" main :: IO () main = do @@ -133,7 +135,7 @@ main = do md = manpageDir p p <.> "md" tmpl = "doc/manpage.html" need $ md : tmpl : pandocFilters - cmd "pandoc" md "--to markdown" + cmd pandocExe md "--to markdown" -- XXX assume this is compiled "--filter tools/pandocRemoveManonlyBlocks" "-o" out @@ -157,11 +159,11 @@ main = do -- md = manpageDir p p <.> "md" -- tmpl = "doc/manpage.html" -- need [md, tmpl] - -- cmd "pandoc" md "--to html --filter tools/pandocRemoveManpageBlocks.hs --template" tmpl "-o" out + -- cmd pandocExe md "--to html --filter tools/pandocRemoveManpageBlocks.hs --template" tmpl "-o" out -- "site/manual2.html" %> \out -> do -- need ["site/manual2.md"] - -- cmd "pandoc site/manual2.md -o" out + -- cmd pandocExe "site/manual2.md -o" out -- "_build//*.o" %> \out -> do -- let c = dropDirectory1 $ out -<.> "c" diff --git a/tools/pandocCapitalizeHeaders.hs b/tools/pandocCapitalizeHeaders.hs index ed7968563..0e9cb393c 100755 --- a/tools/pandocCapitalizeHeaders.hs +++ b/tools/pandocCapitalizeHeaders.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON import Text.Pandoc.Walk diff --git a/tools/pandocRemoveHtmlBlocks.hs b/tools/pandocRemoveHtmlBlocks.hs index 839600181..8e9ccc630 100755 --- a/tools/pandocRemoveHtmlBlocks.hs +++ b/tools/pandocRemoveHtmlBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveHtmlInlines.hs b/tools/pandocRemoveHtmlInlines.hs index be8be5b76..6cb4f3538 100755 --- a/tools/pandocRemoveHtmlInlines.hs +++ b/tools/pandocRemoveHtmlInlines.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveLinks.hs b/tools/pandocRemoveLinks.hs index 7ff7506b0..28551a11a 100755 --- a/tools/pandocRemoveLinks.hs +++ b/tools/pandocRemoveLinks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveManonlyBlocks.hs b/tools/pandocRemoveManonlyBlocks.hs index ec3a8ef3f..b1f849923 100755 --- a/tools/pandocRemoveManonlyBlocks.hs +++ b/tools/pandocRemoveManonlyBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.Builder import Text.Pandoc.JSON diff --git a/tools/pandocRemoveNotes.hs b/tools/pandocRemoveNotes.hs index 29de813d3..36c8cc9c3 100755 --- a/tools/pandocRemoveNotes.hs +++ b/tools/pandocRemoveNotes.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.JSON diff --git a/tools/pandocRemoveWebonlyBlocks.hs b/tools/pandocRemoveWebonlyBlocks.hs index 180a64c28..791bf8348 100755 --- a/tools/pandocRemoveWebonlyBlocks.hs +++ b/tools/pandocRemoveWebonlyBlocks.hs @@ -1,5 +1,5 @@ #!/usr/bin/env stack -{- stack runghc --verbosity info --resolver lts-5.11 --package pandoc-types-1.16.1 -} +{- stack runghc --verbosity info --package pandoc-types-1.16.1 -} import Text.Pandoc.Builder import Text.Pandoc.JSON