[Git][ghc/ghc][wip/haddock-optimizations] 3 commits: Update haddock and xhtml submodules

[Finley McIlwaine (@FinleyMcIlwaine)]

Finley McIlwaine pushed to branch wip/haddock-optimizations at Glasgow Haskell Compiler / GHC


Commits:
27ea35be by Finley McIlwaine at 2023-08-19T11:11:11-06:00
Update haddock and xhtml submodules

Include latest optimizations for haddock, including adaptation to latest xhtml
changes.

Bumps haddock submodule
Bumps xhtml submodule

xhtml is added to the stage0 packages because we need a newer version to
build stage1 haddock. In normal situations we shouldn't be building
stage0 haddock but in case someone attempts to..

Metric Decrease:
    haddock.Cabal
    haddock.base
    haddock.compiler

- - - - -
5161a828 by Matthew Pickering at 2023-08-19T11:12:25-06:00
testsuite: Don't need haddock executable when testing stage1 compiler

This causes some unecessary things to be built when testing stage1.
Ideally we want to move to a place where a test properly declares if it
depends on an executable so we only build the ones we actually need
rather than everything.

- - - - -
97f679f9 by Finley McIlwaine at 2023-08-19T11:13:31-06:00
TEST, REMOVE THIS COMMIT: manually make xhtml my remote

- - - - -


5 changed files:

- .gitmodules
- hadrian/src/Rules/Test.hs
- hadrian/src/Settings/Default.hs
- libraries/xhtml
- utils/haddock


Changes:

=====================================
.gitmodules
=====================================
@@ -32,7 +32,7 @@
 	ignore = untracked
 [submodule "libraries/xhtml"]
 	path = libraries/xhtml
-	url = https://gitlab.haskell.org/ghc/packages/xhtml.git
+	url = https://github.com/finleymcilwaine/xhtml.git
 	ignore = untracked
 [submodule "libraries/Win32"]
 	path = libraries/Win32


=====================================
hadrian/src/Rules/Test.hs
=====================================
@@ -339,7 +339,7 @@ needTestsuitePackages stg = do
   -- This is a hack, but a major usecase for testing the stage1 compiler is
   -- so that we can use it even if ghc stage2 fails to build
   -- Unfortunately, we still need the liba
-  let pkgs = filter (\(_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["ghc", "Cabal"]) && isStage0 stg))
+  let pkgs = filter (\(_,p) -> not $ "iserv" `isInfixOf` pkgName p || ((pkgName p `elem` ["haddock", "ghc", "Cabal"]) && isStage0 stg))
                     (libpkgs ++ exepkgs ++ [ (stg,timeout) | windowsHost ])
   need =<< mapM (uncurry pkgFile) pkgs
   cross <- flag CrossCompiling


=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -98,6 +98,7 @@ stage0Packages = do
              , ghcToolchain
              , ghci
              , ghcPkg
+             , xhtml -- Dependency of haddock
              , haddock
              , hsc2hs
              , hpc


=====================================
libraries/xhtml
=====================================
@@ -1 +1 @@
-Subproject commit 68353ccd1a2e776d6c2b11619265d8140bb7dc07
+Subproject commit 322108f03f8031bffb9b460aa513306a72a7a6e8


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 5877bcebce88afad40ae9decb0f6029681c51848
+Subproject commit 384d1838f85703f317c2422208616375e8d44da1



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c06e42081ce47669a089c8aa51449e5c980226fc...97f679f9fce294a0cae55b58e9eff00fcedf2dd6

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/c06e42081ce47669a089c8aa51449e5c980226fc...97f679f9fce294a0cae55b58e9eff00fcedf2dd6
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230819/2c00d847/attachment-0001.html>