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
f2a5242f
Commit
f2a5242f
authored
Sep 06, 2016
by
Mikhail Glushenkov
Browse files
s/progconf/progdb/
parent
d4666458
Changes
2
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Compiler.hs
View file @
f2a5242f
...
...
@@ -15,8 +15,8 @@
-- case analysis on this compiler flavour enumeration like:
--
-- > case compilerFlavor comp of
-- > GHC -> GHC.getInstalledPackages verbosity packageDb prog
conf
-- > JHC -> JHC.getInstalledPackages verbosity packageDb prog
conf
-- > GHC -> GHC.getInstalledPackages verbosity packageDb prog
db
-- > JHC -> JHC.getInstalledPackages verbosity packageDb prog
db
--
-- Obviously it would be better to use the proper 'Compiler' abstraction
-- because that would keep all the compiler-specific code together.
...
...
Cabal/Distribution/Simple/Configure.hs
View file @
f2a5242f
...
...
@@ -1248,7 +1248,7 @@ getInstalledPackages :: Verbosity -> Compiler
->
PackageDBStack
-- ^ The stack of package databases.
->
ProgramDb
->
IO
InstalledPackageIndex
getInstalledPackages
verbosity
comp
packageDBs
prog
conf
=
do
getInstalledPackages
verbosity
comp
packageDBs
prog
db
=
do
when
(
null
packageDBs
)
$
die
$
"No package databases have been specified. If you use "
++
"--package-db=clear, you must follow it with --package-db= "
...
...
@@ -1256,13 +1256,13 @@ getInstalledPackages verbosity comp packageDBs progconf = do
info
verbosity
"Reading installed packages..."
case
compilerFlavor
comp
of
GHC
->
GHC
.
getInstalledPackages
verbosity
comp
packageDBs
prog
conf
GHCJS
->
GHCJS
.
getInstalledPackages
verbosity
packageDBs
prog
conf
JHC
->
JHC
.
getInstalledPackages
verbosity
packageDBs
prog
conf
LHC
->
LHC
.
getInstalledPackages
verbosity
packageDBs
prog
conf
UHC
->
UHC
.
getInstalledPackages
verbosity
comp
packageDBs
prog
conf
GHC
->
GHC
.
getInstalledPackages
verbosity
comp
packageDBs
prog
db
GHCJS
->
GHCJS
.
getInstalledPackages
verbosity
packageDBs
prog
db
JHC
->
JHC
.
getInstalledPackages
verbosity
packageDBs
prog
db
LHC
->
LHC
.
getInstalledPackages
verbosity
packageDBs
prog
db
UHC
->
UHC
.
getInstalledPackages
verbosity
comp
packageDBs
prog
db
HaskellSuite
{}
->
HaskellSuite
.
getInstalledPackages
verbosity
packageDBs
prog
conf
HaskellSuite
.
getInstalledPackages
verbosity
packageDBs
prog
db
flv
->
die
$
"don't know how to find the installed packages for "
++
display
flv
...
...
@@ -1275,13 +1275,13 @@ getInstalledPackages verbosity comp packageDBs progconf = do
getPackageDBContents
::
Verbosity
->
Compiler
->
PackageDB
->
ProgramDb
->
IO
InstalledPackageIndex
getPackageDBContents
verbosity
comp
packageDB
prog
conf
=
do
getPackageDBContents
verbosity
comp
packageDB
prog
db
=
do
info
verbosity
"Reading installed packages..."
case
compilerFlavor
comp
of
GHC
->
GHC
.
getPackageDBContents
verbosity
packageDB
prog
conf
GHCJS
->
GHCJS
.
getPackageDBContents
verbosity
packageDB
prog
conf
GHC
->
GHC
.
getPackageDBContents
verbosity
packageDB
prog
db
GHCJS
->
GHCJS
.
getPackageDBContents
verbosity
packageDB
prog
db
-- For other compilers, try to fall back on 'getInstalledPackages'.
_
->
getInstalledPackages
verbosity
comp
[
packageDB
]
prog
conf
_
->
getInstalledPackages
verbosity
comp
[
packageDB
]
prog
db
-- | A set of files (or directories) that can be monitored to detect when
...
...
@@ -1291,10 +1291,10 @@ getInstalledPackagesMonitorFiles :: Verbosity -> Compiler
->
PackageDBStack
->
ProgramDb
->
Platform
->
IO
[
FilePath
]
getInstalledPackagesMonitorFiles
verbosity
comp
packageDBs
prog
conf
platform
=
getInstalledPackagesMonitorFiles
verbosity
comp
packageDBs
prog
db
platform
=
case
compilerFlavor
comp
of
GHC
->
GHC
.
getInstalledPackagesMonitorFiles
verbosity
platform
prog
conf
packageDBs
verbosity
platform
prog
db
packageDBs
other
->
do
warn
verbosity
$
"don't know how to find change monitoring files for "
++
"the installed package databases for "
++
display
other
...
...
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