Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
6945d9f0
Commit
6945d9f0
authored
Dec 06, 2013
by
Mikhail Glushenkov
Browse files
Remove duplication between InstallFlags and ConfigExFlags.
parent
563fd590
Changes
2
Hide whitespace changes
Inline
Side-by-side
cabal-install/Distribution/Client/Install.hs
View file @
6945d9f0
...
...
@@ -379,7 +379,7 @@ planPackages comp platform mSandboxPkgInfo solver
maxBackjumps
=
fromFlag
(
installMaxBackjumps
installFlags
)
upgradeDeps
=
fromFlag
(
installUpgradeDeps
installFlags
)
onlyDeps
=
fromFlag
(
installOnlyDeps
installFlags
)
allowNewer
=
fromFlag
(
install
AllowNewer
install
Flags
)
allowNewer
=
fromFlag
(
config
AllowNewer
configEx
Flags
)
-- | Remove the provided targets from the install plan.
pruneInstallPlan
::
Package
pkg
=>
[
PackageSpecifier
pkg
]
->
InstallPlan
...
...
cabal-install/Distribution/Client/Setup.hs
View file @
6945d9f0
...
...
@@ -284,7 +284,8 @@ data ConfigExFlags = ConfigExFlags {
}
defaultConfigExFlags
::
ConfigExFlags
defaultConfigExFlags
=
mempty
{
configSolver
=
Flag
defaultSolver
}
defaultConfigExFlags
=
mempty
{
configSolver
=
Flag
defaultSolver
,
configAllowNewer
=
Flag
AllowNewerNone
}
configureExCommand
::
CommandUI
(
ConfigFlags
,
ConfigExFlags
)
configureExCommand
=
configureCommand
{
...
...
@@ -818,8 +819,7 @@ data InstallFlags = InstallFlags {
installBuildReports
::
Flag
ReportLevel
,
installSymlinkBinDir
::
Flag
FilePath
,
installOneShot
::
Flag
Bool
,
installNumJobs
::
Flag
(
Maybe
Int
),
installAllowNewer
::
Flag
AllowNewer
installNumJobs
::
Flag
(
Maybe
Int
)
}
defaultInstallFlags
::
InstallFlags
...
...
@@ -843,8 +843,7 @@ defaultInstallFlags = InstallFlags {
installBuildReports
=
Flag
NoReports
,
installSymlinkBinDir
=
mempty
,
installOneShot
=
Flag
False
,
installNumJobs
=
mempty
,
installAllowNewer
=
Flag
AllowNewerNone
installNumJobs
=
mempty
}
where
docIndexFile
=
toPathTemplate
(
"$datadir"
</>
"doc"
</>
"index.html"
)
...
...
@@ -905,9 +904,7 @@ installCommand = CommandUI {
,
"exact-configuration"
])
.
optionName
)
$
configureOptions
showOrParseArgs
)
++
liftOptions
get2
set2
(
filter
((
/=
)
"allow-newer"
.
optionName
)
$
configureExOptions
showOrParseArgs
)
++
liftOptions
get2
set2
(
configureExOptions
showOrParseArgs
)
++
liftOptions
get3
set3
(
installOptions
showOrParseArgs
)
++
liftOptions
get4
set4
(
haddockOptions
showOrParseArgs
)
}
...
...
@@ -976,13 +973,6 @@ installOptions showOrParseArgs =
installOverrideReinstall
(
\
v
flags
->
flags
{
installOverrideReinstall
=
v
})
(
yesNoOpt
showOrParseArgs
)
,
option
[]
[
"allow-newer"
]
"Ignore upper bounds in dependencies on some or all packages."
installAllowNewer
(
\
v
flags
->
flags
{
installAllowNewer
=
v
})
(
optArg
"PKGS"
(
fmap
Flag
allowNewerParser
)
(
Flag
AllowNewerAll
)
allowNewerPrinter
)
,
option
[]
[
"upgrade-dependencies"
]
"Pick the latest version for all dependencies, rather than trying to pick an installed version."
installUpgradeDeps
(
\
v
flags
->
flags
{
installUpgradeDeps
=
v
})
...
...
@@ -1069,8 +1059,7 @@ instance Monoid InstallFlags where
installBuildReports
=
mempty
,
installSymlinkBinDir
=
mempty
,
installOneShot
=
mempty
,
installNumJobs
=
mempty
,
installAllowNewer
=
mempty
installNumJobs
=
mempty
}
mappend
a
b
=
InstallFlags
{
installDocumentation
=
combine
installDocumentation
,
...
...
@@ -1092,8 +1081,7 @@ instance Monoid InstallFlags where
installBuildReports
=
combine
installBuildReports
,
installSymlinkBinDir
=
combine
installSymlinkBinDir
,
installOneShot
=
combine
installOneShot
,
installNumJobs
=
combine
installNumJobs
,
installAllowNewer
=
combine
installAllowNewer
installNumJobs
=
combine
installNumJobs
}
where
combine
field
=
field
a
`
mappend
`
field
b
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment