Skip to content

Commit d33d578

Browse files
philderbeastphilderbeast
committed
Add cfgVerbosity
1 parent 7b15731 commit d33d578

14 files changed

+62
-86
lines changed

‎cabal-install/src/Distribution/Client/CmdBench.hs

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{-# LANGUAGE RecordWildCards #-}
2-
31
-- | cabal-install CLI command: bench
42
module Distribution.Client.CmdBench
53
( -- * The @bench@ CLI and action
@@ -29,13 +27,13 @@ import Distribution.Client.CmdErrorMessages
2927
import Distribution.Client.Errors
3028
import Distribution.Client.NixStyleOptions
3129
( NixStyleFlags (..)
30+
, cfgVerbosity
3231
, defaultNixStyleFlags
3332
, nixStyleOptions
3433
)
3534
import Distribution.Client.ProjectOrchestration
3635
import Distribution.Client.Setup
37-
( ConfigFlags (..)
38-
, GlobalFlags
36+
( GlobalFlags
3937
)
4038
import Distribution.Client.TargetProblem
4139
( TargetProblem (..)
@@ -47,10 +45,6 @@ import Distribution.Simple.Command
4745
( CommandUI (..)
4846
, usageAlternatives
4947
)
50-
import Distribution.Simple.Flag
51-
( fromFlagOrDefault
52-
)
53-
import Distribution.Simple.Setup (CommonSetupFlags (..))
5448
import Distribution.Simple.Utils
5549
( dieWithException
5650
, warn
@@ -111,7 +105,7 @@ benchCommand =
111105
-- For more details on how this works, see the module
112106
-- "Distribution.Client.ProjectOrchestration"
113107
benchAction :: NixStyleFlags () -> [String] -> GlobalFlags -> IO ()
114-
benchAction flags@NixStyleFlags{..} targetStrings globalFlags = do
108+
benchAction flags targetStrings globalFlags = do
115109
baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
116110

117111
targetSelectors <-
@@ -151,7 +145,7 @@ benchAction flags@NixStyleFlags{..} targetStrings globalFlags = do
151145
buildOutcomes <- runProjectBuildPhase verbosity baseCtx buildCtx
152146
runProjectPostBuildPhase verbosity baseCtx buildCtx buildOutcomes
153147
where
154-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
148+
verbosity = cfgVerbosity normal flags
155149
cliConfig =
156150
commandLineFlagsToProjectConfig
157151
globalFlags

‎cabal-install/src/Distribution/Client/CmdBuild.hs

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
{-# LANGUAGE RecordWildCards #-}
2-
31
-- | cabal-install CLI command: build
42
module Distribution.Client.CmdBuild
53
( -- * The @build@ CLI and action
@@ -30,6 +28,7 @@ import qualified Data.Map as Map
3028
import Distribution.Client.Errors
3129
import Distribution.Client.NixStyleOptions
3230
( NixStyleFlags (..)
31+
, cfgVerbosity
3332
, defaultNixStyleFlags
3433
, nixStyleOptions
3534
)
@@ -40,17 +39,15 @@ import Distribution.Client.ScriptUtils
4039
, withContextAndSelectors
4140
)
4241
import Distribution.Client.Setup
43-
( CommonSetupFlags (..)
44-
, ConfigFlags (..)
45-
, GlobalFlags
42+
( GlobalFlags
4643
, yesNoOpt
4744
)
4845
import Distribution.Simple.Command
4946
( CommandUI (..)
5047
, option
5148
, usageAlternatives
5249
)
53-
import Distribution.Simple.Flag (Flag (..), fromFlag, fromFlagOrDefault, toFlag)
50+
import Distribution.Simple.Flag (Flag (..), fromFlag, toFlag)
5451
import Distribution.Simple.Utils
5552
( dieWithException
5653
, wrapText
@@ -134,7 +131,7 @@ defaultBuildFlags =
134131
-- For more details on how this works, see the module
135132
-- "Distribution.Client.ProjectOrchestration"
136133
buildAction :: NixStyleFlags BuildFlags -> [String] -> GlobalFlags -> IO ()
137-
buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globalFlags =
134+
buildAction flags@NixStyleFlags{extraFlags = buildFlags} targetStrings globalFlags =
138135
withContextAndSelectors verbosity RejectNoTargets Nothing flags targetStrings globalFlags BuildCommand $ \targetCtx ctx targetSelectors -> do
139136
-- TODO: This flags defaults business is ugly
140137
let onlyConfigure =
@@ -185,7 +182,7 @@ buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globa
185182
buildOutcomes <- runProjectBuildPhase verbosity baseCtx buildCtx
186183
runProjectPostBuildPhase verbosity baseCtx buildCtx buildOutcomes
187184
where
188-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
185+
verbosity = cfgVerbosity normal flags
189186

190187
-- | This defines what a 'TargetSelector' means for the @bench@ command.
191188
-- It selects the 'AvailableTarget's that the 'TargetSelector' refers to,

‎cabal-install/src/Distribution/Client/CmdConfigure.hs

+4-5
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,15 @@ import Distribution.Client.ProjectFlags
2222
)
2323
import Distribution.Client.ProjectOrchestration
2424
import Distribution.Simple.Flag
25-
import Distribution.Simple.Setup (CommonSetupFlags (..))
2625

2726
import Distribution.Client.NixStyleOptions
2827
( NixStyleFlags (..)
28+
, cfgVerbosity
2929
, defaultNixStyleFlags
3030
, nixStyleOptions
3131
)
3232
import Distribution.Client.Setup
3333
( ConfigExFlags (..)
34-
, ConfigFlags (..)
3534
, GlobalFlags
3635
)
3736
import Distribution.Verbosity
@@ -117,14 +116,14 @@ configureCommand =
117116
-- For more details on how this works, see the module
118117
-- "Distribution.Client.ProjectOrchestration"
119118
configureAction :: NixStyleFlags () -> [String] -> GlobalFlags -> IO ()
120-
configureAction flags@NixStyleFlags{..} extraArgs globalFlags = do
119+
configureAction flags extraArgs globalFlags = do
121120
(baseCtx, projConfig) <- configureAction' flags extraArgs globalFlags
122121

123122
if shouldNotWriteFile baseCtx
124123
then notice v "Config file not written due to flag(s)."
125124
else writeProjectLocalExtraConfig (distDirLayout baseCtx) projConfig
126125
where
127-
v = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
126+
v = cfgVerbosity normal flags
128127

129128
configureAction' :: NixStyleFlags () -> [String] -> GlobalFlags -> IO (ProjectBaseContext, ProjectConfig)
130129
configureAction' flags@NixStyleFlags{..} _extraArgs globalFlags = do
@@ -165,7 +164,7 @@ configureAction' flags@NixStyleFlags{..} _extraArgs globalFlags = do
165164
return (baseCtx, conf <> cliConfig)
166165
else return (baseCtx, cliConfig)
167166
where
168-
v = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
167+
v = cfgVerbosity normal flags
169168
cliConfig =
170169
commandLineFlagsToProjectConfig
171170
globalFlags

‎cabal-install/src/Distribution/Client/CmdExec.hs

+4-8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import Distribution.Client.InstallPlan
2323
)
2424
import Distribution.Client.NixStyleOptions
2525
( NixStyleFlags (..)
26+
, cfgVerbosity
2627
, defaultNixStyleFlags
2728
, nixStyleOptions
2829
)
@@ -58,15 +59,11 @@ import Distribution.Client.ProjectPlanning.Types
5859
( dataDirsEnvironmentForPlan
5960
)
6061
import Distribution.Client.Setup
61-
( ConfigFlags (configCommonFlags)
62-
, GlobalFlags
62+
( GlobalFlags
6363
)
6464
import Distribution.Simple.Command
6565
( CommandUI (..)
6666
)
67-
import Distribution.Simple.Flag
68-
( fromFlagOrDefault
69-
)
7067
import Distribution.Simple.GHC
7168
( GhcImplInfo (supportsPkgEnvFiles)
7269
, getImplInfo
@@ -87,7 +84,6 @@ import Distribution.Simple.Program.Run
8784
( programInvocation
8885
, runProgramInvocation
8986
)
90-
import Distribution.Simple.Setup (CommonSetupFlags (..))
9187
import Distribution.Simple.Utils
9288
( createDirectoryIfMissingVerbose
9389
, dieWithException
@@ -144,7 +140,7 @@ execCommand =
144140
}
145141

146142
execAction :: NixStyleFlags () -> [String] -> GlobalFlags -> IO ()
147-
execAction flags@NixStyleFlags{..} extraArgs globalFlags = do
143+
execAction flags extraArgs globalFlags = do
148144
baseCtx <- establishProjectBaseContext verbosity cliConfig OtherCommand
149145

150146
-- To set up the environment, we'd like to select the libraries in our
@@ -226,7 +222,7 @@ execAction flags@NixStyleFlags{..} extraArgs globalFlags = do
226222
then notice verbosity "Running of executable suppressed by flag(s)"
227223
else runProgramInvocation verbosity invocation
228224
where
229-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
225+
verbosity = cfgVerbosity normal flags
230226
cliConfig =
231227
commandLineFlagsToProjectConfig
232228
globalFlags

‎cabal-install/src/Distribution/Client/CmdFreeze.hs

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE NamedFieldPuns #-}
2-
{-# LANGUAGE RecordWildCards #-}
32

43
-- | cabal-install CLI command: freeze
54
module Distribution.Client.CmdFreeze
@@ -17,6 +16,7 @@ import Distribution.Client.IndexUtils (ActiveRepos, TotalIndexState, filterSkipp
1716
import qualified Distribution.Client.InstallPlan as InstallPlan
1817
import Distribution.Client.NixStyleOptions
1918
( NixStyleFlags (..)
19+
, cfgVerbosity
2020
, defaultNixStyleFlags
2121
, nixStyleOptions
2222
)
@@ -40,9 +40,7 @@ import Distribution.Solver.Types.PackageConstraint
4040
)
4141

4242
import Distribution.Client.Setup
43-
( CommonSetupFlags (setupVerbosity)
44-
, ConfigFlags (..)
45-
, GlobalFlags
43+
( GlobalFlags
4644
)
4745
import Distribution.Package
4846
( PackageName
@@ -53,7 +51,7 @@ import Distribution.PackageDescription
5351
( FlagAssignment
5452
, nullFlagAssignment
5553
)
56-
import Distribution.Simple.Flag (Flag (..), fromFlagOrDefault)
54+
import Distribution.Simple.Flag (Flag (..))
5755
import Distribution.Simple.Utils
5856
( dieWithException
5957
, notice
@@ -125,7 +123,7 @@ freezeCommand =
125123
-- For more details on how this works, see the module
126124
-- "Distribution.Client.ProjectOrchestration"
127125
freezeAction :: NixStyleFlags () -> [String] -> GlobalFlags -> IO ()
128-
freezeAction flags@NixStyleFlags{..} extraArgs globalFlags = do
126+
freezeAction flags extraArgs globalFlags = do
129127
unless (null extraArgs) $
130128
dieWithException verbosity $
131129
FreezeAction extraArgs
@@ -160,7 +158,7 @@ freezeAction flags@NixStyleFlags{..} extraArgs globalFlags = do
160158
notice verbosity $
161159
"Wrote freeze file: " ++ (distProjectFile distDirLayout "freeze")
162160
where
163-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
161+
verbosity = cfgVerbosity normal flags
164162
cliConfig =
165163
commandLineFlagsToProjectConfig
166164
globalFlags

‎cabal-install/src/Distribution/Client/CmdHaddock.hs

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import Prelude ()
1919
import Distribution.Client.CmdErrorMessages
2020
import Distribution.Client.NixStyleOptions
2121
( NixStyleFlags (..)
22+
, cfgVerbosity
2223
, defaultNixStyleFlags
2324
, nixStyleOptions
2425
)
@@ -31,9 +32,7 @@ import Distribution.Client.ProjectPlanning
3132
( ElaboratedSharedConfig (..)
3233
)
3334
import Distribution.Client.Setup
34-
( CommonSetupFlags (..)
35-
, ConfigFlags (..)
36-
, GlobalFlags
35+
( GlobalFlags
3736
, InstallFlags (..)
3837
)
3938
import Distribution.Client.TargetProblem
@@ -149,7 +148,7 @@ haddockAction relFlags targetStrings globalFlags = do
149148
flags@NixStyleFlags{..} <- mkFlagsAbsolute relFlags
150149

151150
let
152-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags)
151+
verbosity = cfgVerbosity normal flags
153152
installDoc = fromFlagOrDefault True (installDocumentation installFlags)
154153
flags' = flags{installFlags = installFlags{installDocumentation = Flag installDoc}}
155154
cliConfig = commandLineFlagsToProjectConfig globalFlags flags' mempty -- ClientInstallFlags, not needed here

‎cabal-install/src/Distribution/Client/CmdInstall.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ import Distribution.Client.InstallSymlink
6262
)
6363
import Distribution.Client.NixStyleOptions
6464
( NixStyleFlags (..)
65+
, cfgVerbosity
6566
, defaultNixStyleFlags
6667
, nixStyleOptions
6768
)
@@ -97,8 +98,7 @@ import Distribution.Client.RebuildMonad
9798
( runRebuild
9899
)
99100
import Distribution.Client.Setup
100-
( CommonSetupFlags (..)
101-
, ConfigFlags (..)
101+
( ConfigFlags (..)
102102
, GlobalFlags (..)
103103
, InstallFlags (..)
104104
)
@@ -543,7 +543,7 @@ installAction flags@NixStyleFlags{extraFlags, configFlags, installFlags, project
543543
traverseInstall (installCheckUnitExes InstallCheckInstall) installCfg
544544
where
545545
configFlags' = disableTestsBenchsByDefault . ignoreProgramAffixes $ configFlags
546-
verbosity = fromFlagOrDefault normal (setupVerbosity $ configCommonFlags configFlags')
546+
verbosity = cfgVerbosity normal flags
547547
ignoreProject = flagIgnoreProject projectFlags
548548
cliConfig =
549549
commandLineFlagsToProjectConfig

‎cabal-install/src/Distribution/Client/CmdListBin.hs

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{-# LANGUAGE OverloadedStrings #-}
2-
{-# LANGUAGE RecordWildCards #-}
32

43
module Distribution.Client.CmdListBin
54
( listbinCommand
@@ -30,10 +29,12 @@ import Distribution.Client.CmdErrorMessages
3029
import Distribution.Client.DistDirLayout (DistDirLayout (..))
3130
import Distribution.Client.NixStyleOptions
3231
( NixStyleFlags (..)
32+
, cfgVerbosity
3333
, defaultNixStyleFlags
3434
, nixStyleOptions
3535
)
36-
import Distribution.Client.ProjectOrchestration
36+
import Distribution.Client.ProjectOrchestration hiding (distDirLayout, targetsMap)
37+
import qualified Distribution.Client.ProjectOrchestration as Orchestration (distDirLayout, targetsMap)
3738
import Distribution.Client.ProjectPlanning.Types
3839
import Distribution.Client.ScriptUtils
3940
( AcceptNoTargets (..)
@@ -46,7 +47,6 @@ import Distribution.Client.Setup (GlobalFlags (..))
4647
import Distribution.Client.TargetProblem (TargetProblem (..))
4748
import Distribution.Simple.BuildPaths (dllExtension, exeExtension)
4849
import Distribution.Simple.Command (CommandUI (..))
49-
import Distribution.Simple.Setup (configCommonFlags, fromFlagOrDefault, setupVerbosity)
5050
import Distribution.Simple.Utils (dieWithException, withOutputMarker, wrapText)
5151
import Distribution.System (Platform)
5252
import Distribution.Types.ComponentName (showComponentName)
@@ -86,7 +86,7 @@ listbinCommand =
8686
-------------------------------------------------------------------------------
8787

8888
listbinAction :: NixStyleFlags () -> [String] -> GlobalFlags -> IO ()
89-
listbinAction flags@NixStyleFlags{..} args globalFlags = do
89+
listbinAction flags args globalFlags = do
9090
-- fail early if multiple target selectors specified
9191
target <- case args of
9292
[] -> dieWithException verbosity NoTargetProvided
@@ -140,7 +140,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
140140
singleComponentOrElse
141141
( dieWithException verbosity ThisIsABug
142142
)
143-
$ targetsMap buildCtx
143+
$ Orchestration.targetsMap buildCtx
144144

145145
printPlan verbosity baseCtx buildCtx
146146

@@ -150,7 +150,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
150150
return $
151151
IP.foldPlanPackage
152152
(const []) -- IPI don't have executables
153-
(elaboratedPackage (distDirLayout baseCtx) (elaboratedShared buildCtx) selectedComponent)
153+
(elaboratedPackage (Orchestration.distDirLayout baseCtx) (elaboratedShared buildCtx) selectedComponent)
154154
gpp
155155

156156
case binfiles of
@@ -170,7 +170,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
170170
_ -> dieWithException verbosity MultipleTargetsFound
171171
where
172172
defaultVerbosity = verboseStderr silent
173-
verbosity = fromFlagOrDefault defaultVerbosity (setupVerbosity $ configCommonFlags configFlags)
173+
verbosity = cfgVerbosity defaultVerbosity flags
174174

175175
-- this is copied from
176176
elaboratedPackage

0 commit comments

Comments
 (0)