Skip to content
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.

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

haddock-project fixes (backport #8919) #9088

Closed
wants to merge 5 commits into from
Closed

Commits on Jul 5, 2023

  1. haddock-project: use UnitId instead of package names

    This patch fixes a bug where a sublibrary overwrites a library
    directory.  This leads to overwriting `*.haddock` files, which results
    in missing entries in various indexes (e.g. the html index,
    quicksearch).
    
    (cherry picked from commit 1840bca)
    
    # Conflicts:
    #	cabal-install/src/Distribution/Client/CmdHaddockProject.hs
    coot authored and mergify[bot] committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    2ed37e5 View commit details
    Browse the repository at this point in the history
  2. Removed some haddock-project options

    This patch makes `haddock-project` use `--local` option by default.
    Since its the default, it is removed. Also `--gen-index`,
    `--gen-contents`, `--hyperlinked-source` and `--quickjump` are removed
    since they are always turned on.
    
    Added a haddock-project test.
    
    (cherry picked from commit 1b89c1b)
    
    # Conflicts:
    #	Cabal/src/Distribution/Simple/Haddock.hs
    #	Cabal/src/Distribution/Simple/Setup/Haddock.hs
    #	cabal-install/src/Distribution/Client/CmdHaddockProject.hs
    #	cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.cabal.out
    #	cabal-testsuite/PackageTests/Backpack/Includes2/setup-external.out
    #	cabal-testsuite/PackageTests/Backpack/Includes2/setup-per-component.out
    #	cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-explicit.out
    #	cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.cabal.out
    #	cabal-testsuite/PackageTests/Backpack/Includes3/setup-external-ok.out
    #	cabal-testsuite/PackageTests/Backpack/Reexport1/setup.cabal.out
    #	cabal-testsuite/PackageTests/Backpack/Reexport1/setup.out
    #	cabal-testsuite/PackageTests/Haddock/setup.cabal.out
    #	cabal-testsuite/PackageTests/Haddock/setup.out
    #	cabal-testsuite/PackageTests/HaddockArgs/quickjump.out
    #	cabal-testsuite/PackageTests/HaddockNewline/setup.cabal.out
    #	cabal-testsuite/PackageTests/HaddockNewline/setup.out
    #	cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.cabal.out
    #	cabal-testsuite/PackageTests/InternalLibraries/Haddock/haddock.out
    #	cabal-testsuite/PackageTests/NewHaddock/DisableDoc/cabal.out
    #	cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputCmd/cabal.out
    #	cabal-testsuite/PackageTests/NewHaddock/HaddockOutput/HaddockOutputConfig/cabal.out
    #	cabal-testsuite/PackageTests/NewHaddock/ImplyDependencies/cabal.out
    coot authored and mergify[bot] committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    ef0abf0 View commit details
    Browse the repository at this point in the history
  3. Build dependencies with haddock-project

    `haddock-project` command need to build the project so that haddocks of
    the dependencies are available in the store.
    
    Fixes #8958.
    
    (cherry picked from commit 2c597e8)
    
    # Conflicts:
    #	cabal-install/src/Distribution/Client/CmdHaddockProject.hs
    coot authored and mergify[bot] committed Jul 5, 2023
    Configuration menu
    Copy the full SHA
    ec73ba9 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Fix conflicts

    Kleidukos committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    f9ca706 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2023

  1. Configuration menu
    Copy the full SHA
    ee21acf View commit details
    Browse the repository at this point in the history