WIP

mpickering · Sep 25, 2023 · 6ee4530 · 6ee4530
1 parent 6bd0f24
commit 6ee4530
Show file tree

Hide file tree

Showing 31 changed files with 584 additions and 96 deletions.
diff --git a/Cabal-syntax/src/Distribution/Types/BuildType.hs b/Cabal-syntax/src/Distribution/Types/BuildType.hs
@@ -29,14 +29,17 @@ data BuildType
     Make
   | -- | uses user-supplied @Setup.hs@ or @Setup.lhs@ (default)
     Custom
+  | -- |
+    Hooks
+
   deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
 
 instance Binary BuildType
 instance Structured BuildType
 instance NFData BuildType where rnf = genericRnf
 
 knownBuildTypes :: [BuildType]
-knownBuildTypes = [Simple, Configure, Make, Custom]
+knownBuildTypes = [Simple, Configure, Make, Custom, Hooks]
 
 instance Pretty BuildType where
   pretty = Disp.text . show
@@ -49,6 +52,7 @@ instance Parsec BuildType where
       "Configure" -> return Configure
       "Custom" -> return Custom
       "Make" -> return Make
+      "Hooks" -> return Hooks
       "Default" -> do
         v <- askCabalSpecVersion
         if v <= CabalSpecV1_18 -- oldest version needing this, based on hackage-tests

diff --git a/Cabal-syntax/src/Distribution/Types/Library.hs b/Cabal-syntax/src/Distribution/Types/Library.hs
@@ -16,6 +16,7 @@ import Distribution.Types.BuildInfo
 import Distribution.Types.LibraryName
 import Distribution.Types.LibraryVisibility
 import Distribution.Types.ModuleReexport
+import Distribution.Types.BuildInfo
 
 import qualified Distribution.Types.BuildInfo.Lens as L
 

diff --git a/Cabal-syntax/src/Distribution/Types/PackageDescription.hs b/Cabal-syntax/src/Distribution/Types/PackageDescription.hs
@@ -367,6 +367,7 @@ allBuildDepends = targetBuildDepends <=< allBuildInfo
 enabledBuildDepends :: PackageDescription -> ComponentRequestedSpec -> [Dependency]
 enabledBuildDepends spec pd = targetBuildDepends =<< enabledBuildInfos spec pd
 
+-- Look at
 updatePackageDescription :: HookedBuildInfo -> PackageDescription -> PackageDescription
 updatePackageDescription (mb_lib_bi, exe_bi) p =
   p

diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -139,6 +139,7 @@ library
     Distribution.Simple.Test.Log
     Distribution.Simple.UHC
     Distribution.Simple.UserHooks
+    Distribution.Simple.SetupHooks
     Distribution.Simple.Utils
     Distribution.TestSuite
     Distribution.Types.AnnotatedId

diff --git a/Cabal/src/Distribution/PackageDescription/Check.hs b/Cabal/src/Distribution/PackageDescription/Check.hs
@@ -1263,7 +1263,7 @@ checkFields pkg =
         PackageDistInexcusable ZPrefix
     , check (isNothing (buildTypeRaw pkg) && specVersion pkg < CabalSpecV2_2) $
         PackageBuildWarning NoBuildType
-    , check (isJust (setupBuildInfo pkg) && buildType pkg /= Custom) $
+    , check (isJust (setupBuildInfo pkg) && buildType pkg `notElem` [Custom, Hooks]) $
         PackageBuildWarning NoCustomSetup
     , check (not (null unknownCompilers)) $
         PackageBuildWarning (UnknownCompilers unknownCompilers)