haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-02-16 16:25:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up warnings

Browse Source
This commit is contained in:
Michael Snoyman 2012-12-17 15:45:38 +02:00
parent 5a410bf896
commit 66e9032142
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stackage/Build.hs
View File

@ -10,7 +10,7 @@ import qualified Data.Map as Map
import Data.Set (empty) import Data.Set (empty)
import qualified Data.Set as Set import qualified Data.Set as Set
import Distribution.Text (simpleParse) import Distribution.Text (simpleParse)
import Distribution.Version (thisVersion, withinRange) import Distribution.Version (withinRange)
import Stackage.CheckPlan import Stackage.CheckPlan
import Stackage.Config import Stackage.Config
import Stackage.InstallInfo import Stackage.InstallInfo

2
Stackage/Config.hs
View File

@ -3,7 +3,7 @@ module Stackage.Config where
import Control.Monad.Trans.Writer (execWriter, tell) import Control.Monad.Trans.Writer (execWriter, tell)
import qualified Data.Map as Map import qualified Data.Map as Map
import Data.Set (fromList, singleton) import Data.Set (fromList)
import Distribution.Text (simpleParse) import Distribution.Text (simpleParse)
import Stackage.Types import Stackage.Types

1
Stackage/InstallInfo.hs
View File

@ -10,7 +10,6 @@ import qualified Data.Set as Set
import Data.Version (showVersion) import Data.Version (showVersion)
import qualified Distribution.Text import qualified Distribution.Text
import Distribution.Version (withinRange, simplifyVersionRange) import Distribution.Version (withinRange, simplifyVersionRange)
import Stackage.Config
import Stackage.HaskellPlatform import Stackage.HaskellPlatform
import Stackage.LoadDatabase import Stackage.LoadDatabase
import Stackage.NarrowDatabase import Stackage.NarrowDatabase

12
Stackage/LoadDatabase.hs
View File

@ -12,7 +12,6 @@ import Distribution.Compiler (CompilerFlavor (GHC))
import Distribution.Package (Dependency (Dependency)) import Distribution.Package (Dependency (Dependency))
import Distribution.PackageDescription (Condition (..), import Distribution.PackageDescription (Condition (..),
ConfVar (..), ConfVar (..),
allBuildInfo,
benchmarkBuildInfo, benchmarkBuildInfo,
buildInfo, buildTools, buildInfo, buildTools,
condBenchmarks, condBenchmarks,
@ -25,7 +24,6 @@ import Distribution.PackageDescription (Condition (..),
flagDefault, flagName, flagDefault, flagName,
genPackageFlags, genPackageFlags,
libBuildInfo, libBuildInfo,
packageDescription,
testBuildInfo, testBuildInfo,
FlagName (FlagName)) FlagName (FlagName))
import Distribution.PackageDescription.Parse (ParseResult (ParseOk), import Distribution.PackageDescription.Parse (ParseResult (ParseOk),
@ -73,12 +71,12 @@ loadPackageDB settings core deps = do
_ -> _ ->
case Tar.entryContent e of case Tar.entryContent e of
Tar.NormalFile bs _ -> do Tar.NormalFile bs _ -> do
let (deps', hasTests, buildTools) = parseDeps bs let (deps', hasTests, buildTools') = parseDeps bs
return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo return $ mappend pdb $ PackageDB $ Map.singleton p PackageInfo
{ piVersion = v { piVersion = v
, piDeps = deps' , piDeps = deps'
, piHasTests = hasTests , piHasTests = hasTests
, piBuildTools = buildTools , piBuildTools = buildTools'
} }
_ -> return pdb _ -> return pdb
@ -113,7 +111,7 @@ loadPackageDB settings core deps = do
where where
checkCond' (Var (OS os)) = os == buildOS checkCond' (Var (OS os)) = os == buildOS
checkCond' (Var (Arch arch)) = arch == buildArch checkCond' (Var (Arch arch)) = arch == buildArch
checkCond' (Var (Flag flag)) = flag `elem` flags checkCond' (Var (Flag flag)) = flag `elem` flags'
checkCond' (Var (Impl compiler range)) = checkCond' (Var (Impl compiler range)) =
compiler == GHC && withinRange targetCompilerVersion range compiler == GHC && withinRange targetCompilerVersion range
checkCond' (Lit b) = b checkCond' (Lit b) = b
@ -121,5 +119,5 @@ loadPackageDB settings core deps = do
checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2 checkCond' (COr c1 c2) = checkCond' c1 || checkCond' c2
checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2 checkCond' (CAnd c1 c2) = checkCond' c1 && checkCond' c2
flags = map flagName (filter flagDefault $ genPackageFlags gpd) ++ flags' = map flagName (filter flagDefault $ genPackageFlags gpd) ++
(map FlagName $ Set.toList $ Stackage.Types.flags settings) (map FlagName $ Set.toList $ Stackage.Types.flags settings)

19
Stackage/Test.hs
View File

@ -4,17 +4,14 @@ module Stackage.Test
) where ) where
import qualified Control.Concurrent as C import qualified Control.Concurrent as C
import Control.Exception (Exception, handle, throwIO, finally, SomeException) import Control.Exception (Exception, handle, throwIO, SomeException)
import Control.Monad (foldM, unless, when, replicateM) import Control.Monad (unless, when, replicateM)
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.Typeable (Typeable) import Data.Typeable (Typeable)
import Stackage.Config
import Stackage.Types import Stackage.Types
import Stackage.Util import Stackage.Util
import System.Directory (canonicalizePath, createDirectory, import System.Directory (createDirectory, removeFile)
removeFile)
import System.Environment (getEnvironment)
import System.Exit (ExitCode (ExitSuccess)) import System.Exit (ExitCode (ExitSuccess))
import System.FilePath ((<.>), (</>)) import System.FilePath ((<.>), (</>))
import System.IO (IOMode (WriteMode, AppendMode), import System.IO (IOMode (WriteMode, AppendMode),
@ -39,12 +36,12 @@ parFoldM :: Int -- ^ number of threads
-> a -> a
-> [b] -> [b]
-> IO a -> IO a
parFoldM threadCount f g a0 bs0 = do parFoldM threadCount0 f g a0 bs0 = do
ma <- C.newMVar a0 ma <- C.newMVar a0
mbs <- C.newMVar bs0 mbs <- C.newMVar bs0
signal <- C.newEmptyMVar signal <- C.newEmptyMVar
tids <- replicateM threadCount $ C.forkIO $ worker ma mbs signal tids <- replicateM threadCount0 $ C.forkIO $ worker ma mbs signal
wait threadCount signal tids wait threadCount0 signal tids
C.takeMVar ma C.takeMVar ma
where where
worker ma mbs signal = worker ma mbs signal =
@ -90,8 +87,8 @@ runTestSuite settings testdir hasTestSuites (packageName, (version, Maintainer m
$ ("HASKELL_PACKAGE_SANDBOX", packageDir settings) $ ("HASKELL_PACKAGE_SANDBOX", packageDir settings)
: env' : env'
let runGen addGPP cmd args wdir handle = do let runGen addGPP cmd args wdir handle' = do
ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle) (Just handle) ph <- runProcess cmd args (Just wdir) (menv addGPP) Nothing (Just handle') (Just handle')
ec <- waitForProcess ph ec <- waitForProcess ph
unless (ec == ExitSuccess) $ throwIO TestException unless (ec == ExitSuccess) $ throwIO TestException

2
Stackage/Util.hs
View File

@ -71,12 +71,14 @@ getPackageVersion e = do
defaultHasTestSuites :: Bool defaultHasTestSuites :: Bool
defaultHasTestSuites = True defaultHasTestSuites = True
packageDir, libDir, binDir, dataDir, docDir :: BuildSettings -> FilePath
packageDir = (</> "package-db") . sandboxRoot packageDir = (</> "package-db") . sandboxRoot
libDir = (</> "lib") . sandboxRoot libDir = (</> "lib") . sandboxRoot
binDir = (</> "bin") . sandboxRoot binDir = (</> "bin") . sandboxRoot
dataDir = (</> "share") . sandboxRoot dataDir = (</> "share") . sandboxRoot
docDir x = sandboxRoot x </> "share" </> "doc" </> "$pkgid" docDir x = sandboxRoot x </> "share" </> "doc" </> "$pkgid"
addCabalArgs :: BuildSettings -> [String] -> [String]
addCabalArgs settings rest addCabalArgs settings rest
= "--package-db=clear" = "--package-db=clear"
: "--package-db=global" : "--package-db=global"