simplify ghc -M and add new tests

shayne-fletcher · Jul 22, 2024 · 5213531 · 5213531
1 parent 6fe98c9
commit 5213531
Show file tree

Hide file tree

Showing 4 changed files with 101 additions and 41 deletions.
diff --git a/.github/workflows/ghc-lib-da-ghc-8.4.3.yml b/.github/workflows/ghc-lib-da-ghc-8.4.3.yml
@@ -4,32 +4,35 @@ on:
 jobs:
   runhaskell:
     name: ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, windows]
+        os: [ubuntu-latest, macos-13, windows-latest]
     steps:
       - uses: actions/checkout@v4
       - uses: haskell-actions/setup@v2
         id: setup-haskell
         with:
           ghc-version: 8.4.3
           cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos-13'
       - name: Configure msys2 (windows)
         shell: bash
         run: |-
           echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
           echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
           echo "/c/msys64/usr/bin" >> $GITHUB_PATH
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (windows)
         shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
         run: |-
           pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
           cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'windows'
+        if: matrix.os == 'windows-latest'
       - name: Run CI.hs (unix)
         shell: bash
         run: cabal run exe:ghc-lib-build-tool -- --da
-        if: matrix.os == 'ubuntu' || matrix.os ==  'macos'
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml b/.github/workflows/ghc-lib-ghc-9.0.2-ghc-8.10.7.yml
@@ -0,0 +1,38 @@
+name: ghc-lib-ghc-9.0.2-ghc-8.10.7
+on:
+  push:
+jobs:
+  runhaskell:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 8.10.7
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos-13'
+      - name: Configure msys2 (windows)
+        shell: bash
+        run: |-
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (windows)
+        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+        run: |-
+          pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
+          cabal run exe:ghc-lib-build-tool --constraint=any."happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (unix)
+        shell: bash
+        run: cabal run exe:ghc-lib-build-tool --constraint="any.happy==1.19.12" --constraint="any.alex==3.2.7.3" -- --ghc-flavor ghc-9.0.2
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml b/.github/workflows/ghc-lib-ghc-9.4.8-ghc-9.0.2.yml
@@ -0,0 +1,38 @@
+name: ghc-lib-ghc-9.4.8-ghc-9.0.2
+on:
+  push:
+jobs:
+  runhaskell:
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-13, windows-latest]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: haskell-actions/setup@v2
+        id: setup-haskell
+        with:
+          ghc-version: 9.0.2
+          cabal-version: 'latest'
+      - name: Install build tools (macOS)
+        run: brew install automake
+        if: matrix.os == 'macos'
+      - name: Configure msys2 (windows)
+        shell: bash
+        run: |-
+          echo "MSYSTEM=CLANG64" >> $GITHUB_ENV
+          echo "/c/mingw64/usr/bin" >> $GITHUB_PATH
+          echo "/c/msys64/usr/bin" >> $GITHUB_PATH
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (windows)
+        shell: C:\msys64\usr\bin\bash.exe --noprofile --norc -e -o pipefail '{0}'
+        run: |-
+          pacman -S autoconf automake-wrapper make patch python tar mintty --noconfirm
+          cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
+        if: matrix.os == 'windows-latest'
+      - name: Run CI.hs (unix)
+        shell: bash
+        run: cabal run exe:ghc-lib-build-tool -- --ghc-flavor ghc-9.4.8
+        if: matrix.os == 'ubuntu-latest' || matrix.os ==  'macos-13'
diff --git a/ghc-lib-gen/src/Ghclibgen.hs b/ghc-lib-gen/src/Ghclibgen.hs
@@ -313,6 +313,8 @@ cabalPackageDb ghcNumericVersion = do
         case Map.lookup "Project Unit Id" ghcInfoMap of
           Just projectUnitId -> projectUnitId -- e.g. ghc-9.10.1-2e29
           Nothing -> "ghc-" ++ ghcNumericVersion
+  msg <- systemOutput_ $ "bash -c 'echo \"cabal store contents: \" && ls " ++ cabalStoreDir ++ "'"
+  putStrLn msg
   pure $ cabalStoreDir ++ "/" ++ ghcDir ++ "/package.db"
 
 ghcPackageDb :: String -> IO String
@@ -327,12 +329,7 @@ ghcPackageDb _ghcNumericVersion = do
 
 ghcPackagePath :: String -> String -> String -> IO String
 ghcPackagePath ghcPackageDb cabalPackageDb ghcNumericVersion =
-  pure $ "GHC_PACKAGE_PATH=" ++ cabalPackageDb ++
-    (if not isWindows then
-        ":"
-      else
-       ":" ++ ghcPackageDb
-    )
+  pure $ "GHC_PACKAGE_PATH=" ++ cabalPackageDb ++ ":" ++ ghcPackageDb
 
 semaphoreCompatBootExists :: IO Bool
 semaphoreCompatBootExists =
@@ -361,34 +358,20 @@ setupModuleDepsPlaceholders _ = do
               createDirectoryIfMissing True dir
               copyFile file new_p
 
-calcModuleDeps :: [FilePath] -> [FilePath] -> [FilePath] -> GhcFlavor -> String -> Bool -> String -> String
-calcModuleDeps includeDirs _hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath semaphoreCompatBootExists ghcMakeModeOutputFile = do
-  let series = ghcSeries ghcFlavor
-      rootModulePath = placeholderModulesDir </> "Main.hs"
-      cmd = unwords $
-        [ "ghc" ] ++
-        [ "-optP -DGHCI" | series < GHC_8_10 ] ++
-        [ "-optP -DSTAGE=2" | series < GHC_8_10 ] ++
-        [ "-optP -DGHC_IN_GHCI" | series < GHC_9_2 ] ++
-        [ "-dep-suffix ''"
+calcModuleDeps :: [FilePath] -> [FilePath] -> [FilePath] -> GhcFlavor -> String -> String -> String
+calcModuleDeps includeDirs _hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath ghcMakeModeOutputFile =
+  let cmd = unwords $
+        [ "ghc", "-M"
+        , "-dep-suffix ''"
         , "-dep-makefile " ++ ghcMakeModeOutputFile
-        , "-M"
-        ] ++
-        includeDirs ++
-        [ "-ignore-package ghc"
-        , "-ignore-package ghci"
-        , "-package base"
-        ] ++
-        [ "-package exceptions" | series == GHC_9_0 ] ++
+        ]  ++
+        [ "-optP -DGHCI" | series < GHC_8_10 ] ++
         [ "-package semaphore-compat" | series >= GHC_9_8 ] ++
-        hsSrcIncludes ++
-        [ rootModulePath ]
-      cmd' =
-        if series < GHC_9_8 || semaphoreCompatBootExists then
-          cmd
-        else
-          "bash -c \"" ++ ghcPackagePath ++ " " ++ cmd ++ "\""
-    in cmd'
+        includeDirs ++ hsSrcIncludes ++ [ placeholderModulesDir </> "Main.hs" ]
+      cmd' = "bash -c \"" ++ ghcPackagePath ++ " " ++ cmd ++ "\""
+  in cmd'
+  where
+    series = ghcSeries ghcFlavor
 
 readGhcMakeModeOutputFile :: FilePath -> [FilePath] -> IO [String]
 readGhcMakeModeOutputFile file hsSrcDirs = do
@@ -428,11 +411,10 @@ calcParserModules ghcFlavor = do
   copyFile mainFile rootModulePath
   lib <- mapM readCabalFile (cabalFileLibraries ghcFlavor)
   ghcPackagePath <- ghcPackagePath'
-  semaphoreCompatBootExists <- semaphoreCompatBootExists
   let includeDirs = map ("-I" ++ ) (ghcLibParserIncludeDirs ghcFlavor)
       hsSrcDirs = placeholderModulesDir : ghcLibParserHsSrcDirs True ghcFlavor lib
       hsSrcIncludes = map ("-i" ++ ) hsSrcDirs
-      cmd' = calcModuleDeps includeDirs hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath semaphoreCompatBootExists ".parser-depends"
+      cmd' = calcModuleDeps includeDirs hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath ".parser-depends"
   putStrLn "# Generating 'ghc/.parser-depends'..."
   putStrLn $ "\n\n# Running: " ++ cmd'
   system_ cmd'
@@ -446,11 +428,10 @@ calcLibModules ghcFlavor = do
   copyFile mainFile rootModulePath
   lib <- mapM readCabalFile (cabalFileLibraries ghcFlavor)
   ghcPackagePath <- ghcPackagePath'
-  semaphoreCompatBootExists <- semaphoreCompatBootExists
   let includeDirs = map ("-I" ++ ) (ghcLibIncludeDirs ghcFlavor)
       hsSrcDirs = placeholderModulesDir : ghcLibHsSrcDirs True ghcFlavor lib
       hsSrcIncludes = map ("-i" ++ ) hsSrcDirs
-      cmd' = calcModuleDeps includeDirs hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath semaphoreCompatBootExists ".lib-depends"
+      cmd' = calcModuleDeps includeDirs hsSrcDirs hsSrcIncludes ghcFlavor ghcPackagePath ".lib-depends"
   putStrLn "# Generating 'ghc/.lib-depends'..."
   putStrLn $ "\n\n# Running: " ++ cmd'
   system_ cmd'