Skip to content
GitLab
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
1ade2203
Commit
1ade2203
authored
Feb 02, 2016
by
Edward Z. Yang
Browse files
Hoist out some functions in mkComponentLocalBuildInfo.
Signed-off-by:
Edward Z. Yang
<
ezyang@cs.stanford.edu
>
parent
94e831ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/Configure.hs
View file @
1ade2203
...
...
@@ -1697,14 +1697,6 @@ mkComponentsLocalBuildInfo cfg comp installedPackages pkg_descr
componentPackageRenaming
=
cprns
}
where
-- TODO: this should include internal deps too
getDeps
::
ComponentName
->
[
ComponentId
]
getDeps
cname
=
let
externalPkgs
=
maybe
[]
(
\
lib
->
selectSubset
(
componentBuildInfo
lib
)
externalPkgDeps
)
(
lookupComponent
pkg_descr
cname
)
in
map
Installed
.
installedComponentId
externalPkgs
-- TODO configIPID should have name changed
cid
=
computeComponentId
(
configIPID
cfg
)
(
package
pkg_descr
)
...
...
@@ -1718,8 +1710,6 @@ mkComponentsLocalBuildInfo cfg comp installedPackages pkg_descr
bi
=
componentBuildInfo
component
dedup
=
Map
.
toList
.
Map
.
fromList
lookupInternalPkg
::
PackageId
->
UnitId
lookupInternalPkg
pkgid
=
do
let
matcher
(
clbi
,
_
)
...
...
@@ -1743,6 +1733,17 @@ mkComponentsLocalBuildInfo cfg comp installedPackages pkg_descr
then
targetBuildRenaming
bi
else
Map
.
empty
dedup
=
Map
.
toList
.
Map
.
fromList
-- TODO: this should include internal deps too
getDeps
::
ComponentName
->
[
ComponentId
]
getDeps
cname
=
let
externalPkgs
=
maybe
[]
(
\
lib
->
selectSubset
(
componentBuildInfo
lib
)
externalPkgDeps
)
(
lookupComponent
pkg_descr
cname
)
in
map
Installed
.
installedComponentId
externalPkgs
selectSubset
::
Package
pkg
=>
BuildInfo
->
[
pkg
]
->
[
pkg
]
selectSubset
bi
pkgs
=
[
pkg
|
pkg
<-
pkgs
,
packageName
pkg
`
elem
`
names
bi
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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