Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
be58af2a
Commit
be58af2a
authored
Dec 01, 2018
by
Emily Pillmore
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rename TargzFormat -> TarGzArchive
parent
cce76220
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
cabal-install/Distribution/Client/CmdInstall.hs
cabal-install/Distribution/Client/CmdInstall.hs
+1
-1
cabal-install/Distribution/Client/CmdSdist.hs
cabal-install/Distribution/Client/CmdSdist.hs
+4
-4
No files found.
cabal-install/Distribution/Client/CmdInstall.hs
View file @
be58af2a
...
...
@@ -375,7 +375,7 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags, testFlags
unless
(
Map
.
null
targets
)
$
mapM_
(
\
(
SpecificSourcePackage
pkg
)
->
packageToSdist
verbosity
(
distProjectRootDirectory
localDistDirLayout
)
Tar
gzFormat
(
distProjectRootDirectory
localDistDirLayout
)
Tar
GzArchive
(
distSdistFile
localDistDirLayout
(
packageId
pkg
))
pkg
)
(
localPackages
localBaseCtx
)
...
...
cabal-install/Distribution/Client/CmdSdist.hs
View file @
be58af2a
...
...
@@ -170,7 +170,7 @@ sdistAction SdistFlags{..} targetStrings globalFlags = do
format
=
if
|
listSources
,
nulSeparated
->
SourceList
'
\0
'
|
listSources
->
SourceList
'
\n
'
|
otherwise
->
Tar
gzFormat
|
otherwise
->
Tar
GzArchive
outputPath
pkg
=
case
mOutputPath'
of
Just
path
...
...
@@ -194,7 +194,7 @@ data IsExec = Exec | NoExec
deriving
(
Show
,
Eq
)
data
OutputFormat
=
SourceList
Char
|
Tar
gzFormat
|
Tar
GzArchive
deriving
(
Show
,
Eq
)
packageToSdist
::
Verbosity
->
FilePath
->
OutputFormat
->
FilePath
->
UnresolvedSourcePackage
->
IO
()
...
...
@@ -216,7 +216,7 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
case
dir0
of
Left
tgz
->
do
case
format
of
Tar
gzFormat
->
do
Tar
GzArchive
->
do
write
=<<
BSL
.
readFile
tgz
when
(
outputFile
/=
"-"
)
$
notice
verbosity
$
"Wrote tarball sdist to "
++
outputFile
++
"
\n
"
...
...
@@ -238,7 +238,7 @@ packageToSdist verbosity projectRootDir format outputFile pkg = do
write
(
BSL
.
pack
.
(
++
[
nulSep
])
.
intercalate
[
nulSep
]
.
fmap
((
prefix
</>
)
.
snd
)
$
files
)
when
(
outputFile
/=
"-"
)
$
notice
verbosity
$
"Wrote source list to "
++
outputFile
++
"
\n
"
Tar
gzFormat
->
do
Tar
GzArchive
->
do
let
entriesM
::
StateT
(
Set
.
Set
FilePath
)
(
WriterT
[
Tar
.
Entry
]
IO
)
()
entriesM
=
do
let
prefix
=
prettyShow
(
packageId
pkg
)
...
...
Write
Preview
Markdown
is supported
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