Skip to content

Create source archives by running 'setup sdist --output-directory'. #1305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
May 2, 2013
Merged

Create source archives by running 'setup sdist --output-directory'. #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9718e4a
Add a '--list-sources' option for 'cabal sdist'.
23Skidoo Apr 30, 2013
dd361cc
Refactor D.S.SrcDist.prepareTree.
23Skidoo Apr 30, 2013
b915e0c
Actually implement the '--list-sources' option of 'cabal sdist'.
23Skidoo May 1, 2013
356bae1
Create source archives by running 'setup sdist --output-directory'.
23Skidoo May 1, 2013
97c6a72
Don't tell the user about the temporary directory used by sdist.
23Skidoo May 1, 2013
c7aa581
Use 'sdist --list-sources' for the timestamp check.
23Skidoo May 1, 2013
9308fde
Add a lower bound on the test-framework-quickcheck2 dependency.
23Skidoo May 1, 2013
300f61d
Reowrk the logic a bit.
23Skidoo May 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Cabal/Distribution/Simple/Haddock.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ import qualified Distribution.InstalledPackageInfo as InstalledPackageInfo
import Distribution.InstalledPackageInfo
( InstalledPackageInfo )
import Distribution.Simple.Utils
( die, warn, notice, intercalate, setupMessage
( die, copyFileTo, warn, notice, intercalate, setupMessage
, createDirectoryIfMissingVerbose, withTempFile, copyFileVerbose
, withTempDirectory, matchFileGlob
, findFileWithExtension, findFile )
Expand All @@ -112,7 +112,6 @@ import System.FilePath((</>), (<.>), splitFileName, splitExtension,
normalise, splitPath, joinPath )
import System.IO (hClose, hPutStrLn)
import Distribution.Version
import Distribution.Simple.SrcDist (copyFileTo)

-- Types

Expand Down
44 changes: 27 additions & 17 deletions Cabal/Distribution/Simple/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,19 +792,21 @@ instance Monoid InstallFlags where

-- | Flags to @sdist@: (snapshot, verbosity)
data SDistFlags = SDistFlags {
sDistSnapshot :: Flag Bool,
sDistDirectory :: Flag FilePath,
sDistDistPref :: Flag FilePath,
sDistVerbosity :: Flag Verbosity
sDistSnapshot :: Flag Bool,
sDistDirectory :: Flag FilePath,
sDistDistPref :: Flag FilePath,
sDistListSources :: Flag FilePath,
sDistVerbosity :: Flag Verbosity
}
deriving Show

defaultSDistFlags :: SDistFlags
defaultSDistFlags = SDistFlags {
sDistSnapshot = Flag False,
sDistDirectory = mempty,
sDistDistPref = Flag defaultDistPref,
sDistVerbosity = Flag normal
sDistSnapshot = Flag False,
sDistDirectory = mempty,
sDistDistPref = Flag defaultDistPref,
sDistListSources = mempty,
sDistVerbosity = Flag normal
}

sdistCommand :: CommandUI SDistFlags
Expand All @@ -819,13 +821,19 @@ sdistCommand = makeCommand name shortDesc longDesc defaultSDistFlags options
sDistDistPref (\d flags -> flags { sDistDistPref = d })
showOrParseArgs

,option "" ["list-sources"]
"Just write a list of the package's sources to a file"
sDistListSources (\v flags -> flags { sDistListSources = v })
(reqArgFlag "FILE")

,option "" ["snapshot"]
"Produce a snapshot source distribution"
sDistSnapshot (\v flags -> flags { sDistSnapshot = v })
trueArg

,option "" ["output-directory"]
"Generate a source distribution in the given directory"
("Generate a source distribution in the given directory, "
++ "without creating a tarball")
sDistDirectory (\v flags -> flags { sDistDirectory = v })
(reqArgFlag "DIR")
]
Expand All @@ -835,16 +843,18 @@ emptySDistFlags = mempty

instance Monoid SDistFlags where
mempty = SDistFlags {
sDistSnapshot = mempty,
sDistDirectory = mempty,
sDistDistPref = mempty,
sDistVerbosity = mempty
sDistSnapshot = mempty,
sDistDirectory = mempty,
sDistDistPref = mempty,
sDistListSources = mempty,
sDistVerbosity = mempty
}
mappend a b = SDistFlags {
sDistSnapshot = combine sDistSnapshot,
sDistDirectory = combine sDistDirectory,
sDistDistPref = combine sDistDistPref,
sDistVerbosity = combine sDistVerbosity
sDistSnapshot = combine sDistSnapshot,
sDistDirectory = combine sDistDirectory,
sDistDistPref = combine sDistDistPref,
sDistListSources = combine sDistListSources,
sDistVerbosity = combine sDistVerbosity
}
where combine field = field a `mappend` field b

Expand Down
Loading