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
414aed98
Commit
414aed98
authored
Nov 29, 2009
by
Duncan Coutts
Browse files
Package registration files are always UTF8
As is the output from ghc-pkg dump.
parent
869d4561
Changes
2
Hide whitespace changes
Inline
Side-by-side
Distribution/Simple/Program/HcPkg.hs
View file @
414aed98
...
...
@@ -38,7 +38,7 @@ import Distribution.Simple.Compiler
import
Distribution.Simple.Program.Types
(
ConfiguredProgram
(
programId
,
programVersion
)
)
import
Distribution.Simple.Program.Run
(
ProgramInvocation
(
..
),
programInvocation
(
ProgramInvocation
(
..
),
IOEncoding
(
..
),
programInvocation
,
runProgramInvocation
,
getProgramInvocationOutput
)
import
Distribution.Version
(
Version
(
..
)
)
...
...
@@ -168,21 +168,25 @@ registerInvocation, reregisterInvocation
registerInvocation
=
registerInvocation'
"register"
reregisterInvocation
=
registerInvocation'
"update"
registerInvocation'
::
String
->
ConfiguredProgram
->
Verbosity
->
PackageDB
->
Either
FilePath
InstalledPackageInfo
->
ProgramInvocation
registerInvocation'
cmdname
hcPkg
verbosity
packagedb
(
Left
pkgFile
)
=
programInvocation
hcPkg
$
[
cmdname
,
pkgFile
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
programInvocation
hcPkg
args
where
args
=
[
cmdname
,
pkgFile
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
registerInvocation'
cmdname
hcPkg
verbosity
packagedb
(
Right
pkgInfo
)
=
let
args
=
[
cmdname
,
"-"
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
in
(
programInvocation
hcPkg
args
)
{
progInvokeInput
=
Just
(
showInstalledPackageInfo
pkgInfo
)
}
(
programInvocation
hcPkg
args
)
{
progInvokeInput
=
Just
(
showInstalledPackageInfo
pkgInfo
),
progInvokeInputEncoding
=
IOEncodingUTF8
}
where
args
=
[
cmdname
,
"-"
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
unregisterInvocation
::
ConfiguredProgram
...
...
@@ -213,9 +217,12 @@ hideInvocation hcPkg verbosity packagedb pkgid =
dumpInvocation
::
ConfiguredProgram
->
Verbosity
->
PackageDB
->
ProgramInvocation
dumpInvocation
hcPkg
verbosity
packagedb
=
programInvocation
hcPkg
$
[
"dump"
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
(
programInvocation
hcPkg
args
)
{
progInvokeOutputEncoding
=
IOEncodingUTF8
}
where
args
=
[
"dump"
,
packageDbOpts
packagedb
]
++
verbosityOpts
hcPkg
verbosity
packageDbOpts
::
PackageDB
->
String
...
...
Distribution/Simple/Register.hs
View file @
414aed98
...
...
@@ -90,7 +90,7 @@ import Distribution.InstalledPackageInfo
,
showInstalledPackageInfo
)
import
qualified
Distribution.InstalledPackageInfo
as
IPI
import
Distribution.Simple.Utils
(
createDirectoryIfMissingVerbose
,
writeFileAtomic
(
createDirectoryIfMissingVerbose
,
writeUTF8File
,
writeFileAtomic
,
die
,
notice
,
setupMessage
)
import
Distribution.System
(
OS
(
..
),
buildOS
)
...
...
@@ -148,7 +148,7 @@ register pkg@PackageDescription { library = Just lib }
writeRegistrationFile
installedPkgInfo
=
do
notice
verbosity
(
"Creating package registration file: "
++
regFile
)
writeFile
Atomic
regFile
(
showInstalledPackageInfo
installedPkgInfo
)
write
UTF8
File
regFile
(
showInstalledPackageInfo
installedPkgInfo
)
writeRegisterScript
installedPkgInfo
=
case
compilerFlavor
(
compiler
lbi
)
of
...
...
@@ -236,8 +236,8 @@ registerPackageHugs verbosity installedPkgInfo pkg lbi inplace _packageDb = do
when
inplace
$
die
"--inplace is not supported with Hugs"
let
installDirs
=
absoluteInstallDirs
pkg
lbi
NoCopyDest
createDirectoryIfMissingVerbose
verbosity
True
(
libdir
installDirs
)
writeFile
Atomic
(
libdir
installDirs
</>
"package.conf"
)
(
showInstalledPackageInfo
installedPkgInfo
)
write
UTF8
File
(
libdir
installDirs
</>
"package.conf"
)
(
showInstalledPackageInfo
installedPkgInfo
)
writeHcPkgRegisterScript
::
Verbosity
...
...
@@ -251,7 +251,7 @@ writeHcPkgRegisterScript verbosity installedPkgInfo hcPkg packageDb = do
regScript
=
invocationAsSystemScript
buildOS
invocation
notice
verbosity
(
"Creating package registration script: "
++
regScriptFileName
)
writeFile
Atomic
regScriptFileName
regScript
write
UTF8
File
regScriptFileName
regScript
setFileExecutable
regScriptFileName
regScriptFileName
::
FilePath
...
...
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