Skip to content

Split up ConfigFlags and the Cabal configure function: package-wide vs per-component #12562

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

Open
sheaf wants to merge 7 commits into
base: master
Choose a base branch
from
+2,242 −1,209
Open

Split up ConfigFlags and the Cabal configure function: package-wide vs per-component #12562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
17d0026
Pass the working directory to Setup only once
sheaf Nov 9, 2026
9cb4296
Cabal: move component-specific flags out of CommonSetupFlags
sheaf Oct 23, 2026
20a0915
Cabal: split up ConfigFlags into package & per-component
sheaf Oct 23, 2026
38d294f
Move build location out of LocalBuildInfo
sheaf Oct 26, 2026
5e12bf3
Move per-component configuration to ComponentBuildDescr
sheaf Nov 6, 2026
0a18a5b
Hooks: don't overwrite pkg descr with component diffs
sheaf Nov 9, 2026
9f83bbe
Split up configure into package and per-component
sheaf Nov 10, 2026
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
2 changes: 1 addition & 1 deletion Cabal-hooks/src/Distribution/Simple/SetupHooks.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ import Distribution.Types.Component
import Distribution.Types.ComponentLocalBuildInfo
( ComponentLocalBuildInfo(..) )
import Distribution.Types.LocalBuildInfo
( LocalBuildInfo(..), withPrograms )
( LocalBuildInfo(..), localPkgDescr, withPrograms )
import Distribution.Types.LocalBuildConfig
( LocalBuildConfig, PackageBuildDescr )
import Distribution.Types.TargetInfo
Expand Down
10 changes: 5 additions & 5 deletions Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import Distribution.SPDX.License (License)
import Distribution.Types.VersionRange (VersionRange)

import Distribution.Types.GenericPackageDescription (GenericPackageDescription)
import Distribution.Types.LocalBuildInfo (LocalBuildInfo)
import Distribution.Types.LocalBuildInfo (PersistedBuildInfo)

tests :: TestTree
tests = testGroup "Distribution.Utils.Structured"
Expand All @@ -21,7 +21,7 @@ tests = testGroup "Distribution.Utils.Structured"
md5Check (Proxy :: Proxy License) 0x2804cd5d2137508059c16ac2449741d2
-- The difference is in encoding of newtypes
, testCase "GenericPackageDescription" $ md5CheckGenericPackageDescription (Proxy :: Proxy GenericPackageDescription)
, testCase "LocalBuildInfo" $ md5CheckLocalBuildInfo (Proxy :: Proxy LocalBuildInfo)
, testCase "PersistedBuildInfo" $ md5CheckPersistedBuildInfo (Proxy :: Proxy PersistedBuildInfo)
]

md5Check :: Structured a => Proxy a -> Integer -> Assertion
Expand All @@ -35,6 +35,6 @@ md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertio
md5CheckGenericPackageDescription proxy = md5Check proxy
0x007316e7fd40543810a54a4d35883343

md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
md5CheckLocalBuildInfo proxy = md5Check proxy
0x1707be2edbed103d734de60544097b67
md5CheckPersistedBuildInfo :: Proxy PersistedBuildInfo -> Assertion
md5CheckPersistedBuildInfo proxy = md5Check proxy
0x0563d730a1425415e5fd9f9c46268d0b
2 changes: 2 additions & 0 deletions Cabal/Cabal.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,9 @@ library
Distribution.Simple.Utils
Distribution.TestSuite
Distribution.Types.AnnotatedId
Distribution.Types.ComponentDiff
Distribution.Types.ComponentInclude
Distribution.Types.ConfigFlags
Distribution.Types.DumpBuildInfo
Distribution.Types.PackageName.Magic
Distribution.Types.ComponentLocalBuildInfo
Expand Down
159 changes: 84 additions & 75 deletions Cabal/src/Distribution/Simple.hs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cabal/src/Distribution/Simple/Build.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ import Distribution.Simple.Program.Types
import Distribution.Simple.Register
import Distribution.Simple.Setup.Build
import Distribution.Simple.Setup.Common
import Distribution.Simple.Setup.Config
import Distribution.Simple.Setup.Haddock (HaddockTarget (ForDevelopment))
import Distribution.Simple.Setup.Repl
import Distribution.Simple.SetupHooks.Internal
Expand All @@ -112,6 +111,7 @@ import qualified Distribution.Simple.SetupHooks.Rule as SetupHooks
import Distribution.Simple.ShowBuildInfo
import Distribution.Simple.Test.LibV09
import Distribution.Simple.Utils
import qualified Distribution.Types.ConfigFlags as CF
import Distribution.Utils.Json
import Distribution.Utils.ShortText (ShortText, fromShortText, toShortText)

Expand Down Expand Up @@ -194,7 +194,7 @@ build_setupHooks
-- Before the actual building, dump out build-information.
-- This way, if the actual compilation failed, the options have still been
-- dumped.
dumpBuildInfo verbosity distPref (configDumpBuildInfo (configFlags lbi)) pkg_descr lbi flags
dumpBuildInfo verbosity distPref (CF.configDumpBuildInfo (packageConfigFlags lbi)) pkg_descr lbi flags

curDir <- absoluteWorkingDirLBI lbi

Expand Down
Loading
Loading