29ebe5d · stackage · git.iko.soy

git.iko.soy/stackage

on master help sign in

Warnings cleanup

29ebe5dMichael Snoyman12 years ago

Stackage/BuildConstraints.hs−3

compare with master

unifiedsplit

@@ -20,7 +20,6 @@ import Distribution.Package (Dependency (..))

20import Distribution.System (Arch, OS)

21import qualified Distribution.System

22import Distribution.Version (anyVersion)

23−import Distribution.Version (anyVersion)

24import Filesystem (isFile)

23import Filesystem (isFile)

25import Network.HTTP.Client (Manager, httpLbs, responseBody)

24import Network.HTTP.Client (Manager, httpLbs, responseBody)

26import Stackage.CorePackages

25import Stackage.CorePackages

@@ -144,8 +143,6 @@ getSystemInfo = do

144 siOS = Distribution.System.Linux

143 siOS = Distribution.System.Linux

145 siArch = Distribution.System.X86_64

144 siArch = Distribution.System.X86_64

146

145

147−loadBuildConstraints fp = decodeFileEither fp >>= either throwIO toBC

148−

149data ConstraintFile = ConstraintFile

146data ConstraintFile = ConstraintFile

150 { cfGlobalFlags :: Map FlagName Bool

147 { cfGlobalFlags :: Map FlagName Bool

151 , cfPackageFlags :: Map PackageName (Map FlagName Bool)

148 , cfPackageFlags :: Map PackageName (Map FlagName Bool)

Stackage/PerformBuild.hs+10−4

@@ -103,15 +103,21 @@ waitForDeps toolMap packageMap activeComps bp pi action = do

103 isCore = (`member` siCorePackages (bpSystemInfo bp))

104 isCoreExe = (`member` siCoreExecutables (bpSystemInfo bp))

105

106+withCounter :: TVar Int -> IO a -> IO a

106withCounter counter = bracket_

107withCounter counter = bracket_

107 (atomically $ modifyTVar counter (+ 1))

108 (atomically $ modifyTVar counter (+ 1))

108 (atomically $ modifyTVar counter (subtract 1))

109 (atomically $ modifyTVar counter (subtract 1))

109

110

111+withTSem :: TSem -> IO a -> IO a

110withTSem sem = bracket_ (atomically $ waitTSem sem) (atomically $ signalTSem sem)

112withTSem sem = bracket_ (atomically $ waitTSem sem) (atomically $ signalTSem sem)

111

113

114+-- | Returns @Nothing@ if installing to a global database

115+pbDatabase :: PerformBuild -> Maybe FilePath

112pbDatabase pb

116pbDatabase pb

113 | pbGlobalInstall pb = Nothing

117 | pbGlobalInstall pb = Nothing

114 | otherwise = Just $ pbInstallDest pb </> "pkgdb"

118 | otherwise = Just $ pbInstallDest pb </> "pkgdb"

119+

120+pbBinDir, pbLibDir, pbDataDir, pbDocDir :: PerformBuild -> FilePath

115pbBinDir pb = pbInstallDest pb </> "bin"

121pbBinDir pb = pbInstallDest pb </> "bin"

116pbLibDir pb = pbInstallDest pb </> "lib"

122pbLibDir pb = pbInstallDest pb </> "lib"

117pbDataDir pb = pbInstallDest pb </> "share"

123pbDataDir pb = pbInstallDest pb </> "share"

@@ -260,9 +266,9 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

260 testOut = pbLogDir </> fpFromText namever </> "test.out"

266 testOut = pbLogDir </> fpFromText namever </> "test.out"

261 testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"

267 testRunOut = pbLogDir </> fpFromText namever </> "test-run.out"

262

268

263− wf fp inner = do

269+ wf fp inner' = do

264 createTree $ parent fp

270 createTree $ parent fp

265− withBinaryFile (fpToString fp) WriteMode inner

271+ withBinaryFile (fpToString fp) WriteMode inner'

266

272

267 configArgs = ($ []) $ execWriter $ do

273 configArgs = ($ []) $ execWriter $ do

268 tell' "--package-db=clear"

274 tell' "--package-db=clear"

@@ -279,9 +285,9 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =

279 flags :: Text

285 flags :: Text

280 flags = unwords $ map go $ mapToList pcFlagOverrides

286 flags = unwords $ map go $ mapToList pcFlagOverrides

281 where

287 where

282− go (name, isOn) = concat

288+ go (name', isOn) = concat

283 [ if isOn then "" else "-"

289 [ if isOn then "" else "-"

284− , unFlagName name

290+ , unFlagName name'

285 ]

291 ]

286

292

287 PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo

293 PackageConstraints {..} = ppConstraints $ piPlan sbPackageInfo

Stackage/Prelude.hs−1

@@ -20,7 +20,6 @@ import Distribution.Version as X (Version (..),

20 VersionRange)

21import Distribution.Version as X (withinRange)

22import qualified Distribution.Version as C

23−import System.Exit (ExitCode (ExitSuccess))

25unPackageName :: PackageName -> Text

24unPackageName :: PackageName -> Text

26unPackageName (PackageName str) = pack str

25unPackageName (PackageName str) = pack str

Stackage/Upload.hs+2

@@ -90,6 +90,7 @@ data UploadDocs = UploadDocs

90 , udSnapshot :: SnapshotIdent

91 }

93+uploadDocs :: UploadDocs -> Manager -> IO (Response LByteString)

93uploadDocs (UploadDocs (StackageServer host) fp0 token ident) man = do

94uploadDocs (UploadDocs (StackageServer host) fp0 token ident) man = do

94 fe <- isFile fp0

95 fe <- isFile fp0

95 if fe

96 if fe

@@ -179,6 +180,7 @@ data UploadDocMap = UploadDocMap

179 , udmPlan :: BuildPlan

180 , udmPlan :: BuildPlan

180 }

181 }

181

182

183+uploadDocMap :: UploadDocMap -> Manager -> IO (Response LByteString)

182uploadDocMap UploadDocMap {..} man = do

184uploadDocMap UploadDocMap {..} man = do

183 docmap <- docsListing udmPlan udmDocDir

185 docmap <- docsListing udmPlan udmDocDir

184 req1 <- parseUrl $ unpack $ unStackageServer udmServer ++ "/upload-doc-map"

186 req1 <- parseUrl $ unpack $ unStackageServer udmServer ++ "/upload-doc-map"