Skip to content

haddock-packages fixes #9213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 27, 2023
Merged

haddock-packages fixes #9213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f2bd3b
haddock-project: use UnitId instead of package names
coot Apr 25, 2023
b88a414
Removed some haddock-project options
coot May 29, 2023
43cf168
Build dependencies with haddock-project
coot May 20, 2023
e720627
Fixed building documentation
coot Aug 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ register.sh
# windows test artifacts
cabal-testsuite/**/*.exe
cabal-testsuite/**/*.bat
cabal-testsuite/**/haddocks

# python artifacts from documentation builds
*.pyc
Expand Down
17 changes: 11 additions & 6 deletions Cabal/src/Distribution/Simple/Haddock.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ createHaddockIndex :: Verbosity
createHaddockIndex verbosity programDb comp platform flags = do
let args = fromHaddockProjectFlags flags
(haddockProg, _version) <-
getHaddockProg verbosity programDb comp args (haddockProjectQuickJump flags)
getHaddockProg verbosity programDb comp args (Flag True)
runHaddock verbosity defaultTempFileOptions comp platform haddockProg False args

-- ------------------------------------------------------------------------------
Expand Down Expand Up @@ -405,12 +405,12 @@ fromHaddockProjectFlags :: HaddockProjectFlags -> HaddockArgs
fromHaddockProjectFlags flags =
mempty
{ argOutputDir = Dir (fromFlag $ haddockProjectDir flags)
, argQuickJump = haddockProjectQuickJump flags
, argGenContents = haddockProjectGenContents flags
, argGenIndex = haddockProjectGenIndex flags
, argQuickJump = Flag True
, argGenContents = Flag True
, argGenIndex = Flag True
, argPrologueFile = haddockProjectPrologue flags
, argInterfaces = fromFlagOrDefault [] (haddockProjectInterfaces flags)
, argLinkedSource = haddockProjectLinkedSource flags
, argLinkedSource = Flag True
, argLib = haddockProjectLib flags
}

Expand Down Expand Up @@ -684,7 +684,12 @@ renderArgs verbosity tmpFileOpts version comp platform args k = do
result = intercalate ", "
. map (\o -> outputDir </>
case o of
Html -> "index.html"
Html
| fromFlagOrDefault False (argGenIndex args) ->
"index.html"
Html
| otherwise ->
mempty
Hoogle -> pkgstr <.> "txt")
. fromFlagOrDefault [Html]
. argOutput
Expand Down
Loading