haddocset 0.4.0 → 0.4.1

raw patch · 3 files changed

+11/−5 lines, 3 filesdep ~http-typesdep ~optparse-applicative

Dependency ranges changed: http-types, optparse-applicative

Files

• Documentation/Haddocset.hs +9/−3
• Main.hs +1/−1
• haddocset.cabal +1/−1

@@ -139,11 +139,17 @@                 | otherwise -> Just $                     DocInfo                         (sourcePackageId a)-                        (haddockInterfaces a)-                        (haddockHTMLs a)+                        (map expandPkgRoot (haddockInterfaces a))+                        (map expandPkgRoot (haddockHTMLs a))                         (exposed a)              ParseOk _  _  -> Nothing+  where+    -- drop the package.conf directory: pkgroot/package.conf.d/foo.conf -> pkgroot+    pkgroot = takeDirectory . takeDirectory $ pifile+    expandPkgRoot path = case splitPath path of+        "${pkgroot}/":rest -> joinPath (pkgroot : rest)+        _ -> path  copyHtml :: DocFile -> FilePath -> IO () copyHtml doc dst = do@@ -245,7 +251,7 @@         =$= awaitForever             (\f -> yield                 $ DocFile sourcePackageId dir-                $ fromMaybe (error $ "Prefix missmatch: " ++ show (dir, f))+                $ fromMaybe (error $ "Prefix mismatch: " ++ show (dir, f))                 $ stripPrefixPath (addTrailingPathSeparator dir) f)  data Provider

@@ -111,7 +111,7 @@         <*> fmap docsetDir             (strOption (long "target" <> short 't' <> metavar "DOCSET" <> help "output directory (default: haskell.docset)") <|> pure "haskell")         <*> switch (long "quiet" <> short 'q' <> help "suppress output.")-        <*> subparser (command "create" (info createOpts  $ progDesc "crate new docset.")+        <*> subparser (command "create" (info createOpts  $ progDesc "create new docset.")                     <> command "list"   (info (pure List) $ progDesc "list package of docset.")                     <> command "add"    (info addOpts $ progDesc "add package to docset.")) 

@@ -1,5 +1,5 @@ name:                haddocset-version:             0.4.0+version:             0.4.1 synopsis:            Generate docset of Dash by Haddock haskell documentation tool description:         please read README.md <https://github.com/philopon/haddocset/blob/master/README.md> license:             BSD3