This commit is contained in:
Michael Snoyman 2012-11-22 09:27:47 +02:00
parent 4be13587af
commit 4e6e979e90
7 changed files with 37 additions and 35 deletions

View File

@ -2,14 +2,14 @@ module Stackage.Build
( build ( build
) where ) where
import Control.Monad (unless) import Control.Monad (unless)
import Stackage.CheckPlan import Stackage.CheckPlan
import Stackage.InstallInfo
import Stackage.Test import Stackage.Test
import Stackage.Util import Stackage.Util
import Stackage.InstallInfo import System.Exit (ExitCode (ExitSuccess), exitWith)
import System.Process (waitForProcess, runProcess) import System.IO (IOMode (WriteMode), withBinaryFile)
import System.Exit (ExitCode (ExitSuccess), exitWith) import System.Process (runProcess, waitForProcess)
import System.IO (IOMode (WriteMode), withBinaryFile)
build :: IO () build :: IO ()
build = do build = do

View File

@ -2,12 +2,12 @@ module Stackage.CheckPlan
( checkPlan ( checkPlan
) where ) where
import Control.Monad (unless) import Control.Monad (unless)
import Data.List (sort) import Data.List (sort)
import Stackage.Types
import Stackage.InstallInfo import Stackage.InstallInfo
import System.Process (readProcess) import Stackage.Types
import System.Exit (ExitCode (ExitFailure), exitWith) import System.Exit (ExitCode (ExitFailure), exitWith)
import System.Process (readProcess)
data Mismatch = OnlyDryRun String | OnlySimpleList String data Mismatch = OnlyDryRun String | OnlySimpleList String
deriving Show deriving Show

View File

@ -1,12 +1,12 @@
module Stackage.Config where module Stackage.Config where
import qualified Data.Map as Map import Control.Monad (unless, when)
import Stackage.Types import Control.Monad.Trans.Writer (execWriter, tell)
import Control.Monad.Trans.Writer (execWriter, tell) import qualified Data.Map as Map
import Data.Set (singleton, fromList) import Data.Set (fromList, singleton)
import Control.Monad (when, unless) import Distribution.System (OS (..), buildOS)
import Distribution.System (OS (..), buildOS) import Distribution.Text (simpleParse)
import Distribution.Text (simpleParse) import Stackage.Types
-- | Packages which are shipped with GHC but are not included in the -- | Packages which are shipped with GHC but are not included in the
-- Haskell Platform list of core packages. -- Haskell Platform list of core packages.

View File

@ -3,14 +3,14 @@ module Stackage.InstallInfo
, iiPackageList , iiPackageList
) where ) where
import Stackage.Types import qualified Data.Map as Map
import Stackage.Util import qualified Data.Set as Set
import Stackage.Config import Stackage.Config
import Stackage.HaskellPlatform
import Stackage.LoadDatabase import Stackage.LoadDatabase
import Stackage.NarrowDatabase import Stackage.NarrowDatabase
import Stackage.HaskellPlatform import Stackage.Types
import qualified Data.Map as Map import Stackage.Util
import qualified Data.Set as Set
getInstallInfo :: IO InstallInfo getInstallInfo :: IO InstallInfo
getInstallInfo = do getInstallInfo = do

View File

@ -2,17 +2,18 @@ module Stackage.Test
( runTestSuites ( runTestSuites
) where ) where
import Control.Monad (when, foldM) import Control.Monad (foldM, when)
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Stackage.Config
import Stackage.Types import Stackage.Types
import Stackage.Util import Stackage.Util
import Stackage.Config import System.Directory (createDirectory, removeFile)
import System.Directory (removeFile, createDirectory) import System.Exit (ExitCode (ExitSuccess))
import System.Process (waitForProcess, runProcess) import System.FilePath ((<.>), (</>))
import System.Exit (ExitCode (ExitSuccess)) import System.IO (IOMode (WriteMode, AppendMode),
import System.FilePath ((</>), (<.>)) withBinaryFile)
import System.IO (IOMode (WriteMode, AppendMode), withBinaryFile) import System.Process (runProcess, waitForProcess)
runTestSuites :: InstallInfo -> IO () runTestSuites :: InstallInfo -> IO ()
runTestSuites ii = do runTestSuites ii = do

View File

@ -40,6 +40,6 @@ instance Monoid HaskellPlatform where
HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y) HaskellPlatform a x `mappend` HaskellPlatform b y = HaskellPlatform (mappend a b) (mappend x y)
data InstallInfo = InstallInfo data InstallInfo = InstallInfo
{ iiCore :: Set PackageName { iiCore :: Set PackageName
, iiPackages :: Map PackageName Version , iiPackages :: Map PackageName Version
} }

View File

@ -1,12 +1,13 @@
module Stackage.Util where module Stackage.Util where
import Control.Monad (when)
import qualified Data.Map as Map import qualified Data.Map as Map
import qualified Data.Set as Set import qualified Data.Set as Set
import Data.Version (showVersion)
import Distribution.Version (thisVersion) import Distribution.Version (thisVersion)
import Data.Version (showVersion)
import Stackage.Types import Stackage.Types
import System.Directory (doesDirectoryExist, removeDirectoryRecursive) import System.Directory (doesDirectoryExist,
import Control.Monad (when) removeDirectoryRecursive)
identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange identsToRanges :: Set PackageIdentifier -> Map PackageName VersionRange
identsToRanges = identsToRanges =