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

Setup.hs: Don't assume that the build directory is "dist."

Browse source 
Instead, get it from localBuildInfo.
This commit is contained in:
John MacFarlane 2010-03-22 18:43:38 -07:00
parent 1b1ba25432
commit 7689cacb5d
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Setup.hs
View file

@ -48,7 +48,9 @@ runTestSuite _ _ pkg _ = do
-- | Build man pages from markdown sources in man/man1/. -- | Build man pages from markdown sources in man/man1/.
makeManPages :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO () makeManPages :: Args -> BuildFlags -> PackageDescription -> LocalBuildInfo -> IO ()
makeManPages _ flags _ _ = mapM_ (makeManPage (fromFlag $ buildVerbosity flags)) manpages makeManPages _ flags _ buildInfo =
mapM_ (makeManPage pandocPath (fromFlag $ buildVerbosity flags)) manpages
where pandocPath = (buildDir buildInfo) </> "pandoc" </> "pandoc"
manpages :: [FilePath] manpages :: [FilePath]
manpages = ["pandoc.1", "markdown2pdf.1"] manpages = ["pandoc.1", "markdown2pdf.1"]
@ -57,21 +59,20 @@ manDir :: FilePath
manDir = "man" </> "man1" manDir = "man" </> "man1"
-- | Build a man page from markdown source in man/man1. -- | Build a man page from markdown source in man/man1.
makeManPage :: Verbosity -> FilePath -> IO () makeManPage :: FilePath -> Verbosity -> FilePath -> IO ()
makeManPage verbosity manpage = do makeManPage pandoc verbosity manpage = do
let pandoc = "dist" </> "build" </> "pandoc" </> "pandoc"
let page = manDir </> manpage let page = manDir </> manpage
let source = manDir </> manpage <.> "md" let source = page <.> "md"
modifiedDeps <- modifiedDependencies page [source] modifiedDeps <- modifiedDependencies page [source]
unless (null modifiedDeps) $ do unless (null modifiedDeps) $ do
ec <- runProcess pandoc ["-s", "-S", "-r", "markdown", "-w", "man", ec <- runProcess pandoc ["-s", "-S", "-r", "markdown", "-w", "man",
"--template=templates/man.template", "-o", page, source] "--template=templates/man.template", "-o", page, source]
Nothing Nothing Nothing Nothing (Just stderr) >>= waitForProcess Nothing Nothing Nothing Nothing (Just stderr) >>= waitForProcess
case ec of case ec of
ExitSuccess -> unless (verbosity == silent) $ ExitSuccess -> unless (verbosity == silent) $
putStrLn $ "Created " ++ manDir </> manpage putStrLn $ "Created " ++ page
_ -> do putStrLn $ "Error creating " ++ manDir </> manpage ExitFailure n -> putStrLn ("Error creating " ++ page ++
exitWith ec ". Exit code = " ++ show n) >> exitWith ec
installScripts :: PackageDescription -> LocalBuildInfo installScripts :: PackageDescription -> LocalBuildInfo
-> Verbosity -> CopyDest -> IO () -> Verbosity -> CopyDest -> IO ()