d6c659c · stackage · git.iko.soy

Stackage/BuildPlan.hs+3−3

compare with master

unifiedsplit

@@ -29,9 +29,9 @@ import Stackage.PackageIndex

29import Stackage.Prelude

30

31data BuildPlan = BuildPlan

32− { bpSystemInfo :: SystemInfo

32+ { bpSystemInfo :: SystemInfo

33− , bpTools :: Vector (PackageName, Version)

33+ , bpTools :: Vector (PackageName, Version)

34− , bpPackages :: Map PackageName PackagePlan

34+ , bpPackages :: Map PackageName PackagePlan

35 , bpGithubUsers :: Map Text (Set Text)

36 }

37 deriving (Show, Eq)

Stackage/CheckBuildPlan.hs+6−6

@@ -9,12 +9,12 @@ module Stackage.CheckBuildPlan

9 ( checkBuildPlan

10 ) where

11

12−import Control.Monad.Writer.Strict (Writer, execWriter, tell)

12+import Control.Monad.Writer.Strict (Writer, execWriter, tell)

13−import Stackage.BuildConstraints

14−import Stackage.BuildPlan

15−import Stackage.PackageDescription

16−import Stackage.Prelude

17−import qualified Data.Text as T

13+import qualified Data.Text as T

14+import Stackage.BuildConstraints

15+import Stackage.BuildPlan

16+import Stackage.PackageDescription

17+import Stackage.Prelude

18

19-- FIXME check cycles in dependencies, only looking at libraries and

20-- executables

Stackage/CompleteBuild.hs+5−5

@@ -6,11 +6,11 @@ module Stackage.CompleteBuild

6 , BumpType (..)

7 , completeBuild

8 ) where

9−import Data.Default.Class (def)

9+import Data.Default.Class (def)

10−import Data.Semigroup (Max (..), Option (..))

10+import Data.Semigroup (Max (..), Option (..))

11−import Data.Text.Read (decimal)

11+import Data.Text.Read (decimal)

12import Data.Time

13−import Data.Yaml (decodeFileEither, encodeFile)

13+import Data.Yaml (decodeFileEither, encodeFile)

14import Network.HTTP.Client

15import Stackage.BuildConstraints

16import Stackage.BuildPlan

@@ -20,7 +20,7 @@ import Stackage.Prelude

20import Stackage.ServerBundle

21import Stackage.UpdateBuildPlan

22import Stackage.Upload

23−import System.IO (BufferMode (LineBuffering), hSetBuffering)

23+import System.IO (BufferMode (LineBuffering), hSetBuffering)

24

25data BuildType = Nightly | LTS BumpType

26 deriving (Show, Read, Eq, Ord)

Stackage/CorePackages.hs+3−3

@@ -6,10 +6,10 @@ module Stackage.CorePackages

6 , getGhcVersion

7 ) where

8

9−import qualified Data.Text as T

9+import qualified Data.Text as T

10−import Filesystem (listDirectory)

10+import Filesystem (listDirectory)

11import Stackage.Prelude

12−import System.Directory (findExecutable)

12+import System.Directory (findExecutable)

13

14-- | Get a @Map@ of all of the core packages. Core packages are defined as

15-- packages which ship with GHC itself.

Stackage/PackageDescription.hs+1−1

@@ -51,7 +51,7 @@ instance FromJSON Component where

51

52data DepInfo = DepInfo

53 { diComponents :: Set Component

54− , diRange :: VersionRange

54+ , diRange :: VersionRange

55 }

56 deriving (Show, Eq)

57

Stackage/PerformBuild.hs+38−35

@@ -1,10 +1,10 @@

1-- | Perform an actual build, generate a binary package database and a

2-- documentation directory in the process.

3−{-# LANGUAGE CPP #-}

3+{-# LANGUAGE CPP #-}

4{-# LANGUAGE DeriveDataTypeable #-}

5−{-# LANGUAGE RecordWildCards #-}

6{-# LANGUAGE NoImplicitPrelude #-}

5{-# LANGUAGE NoImplicitPrelude #-}

7{-# LANGUAGE OverloadedStrings #-}

6{-# LANGUAGE OverloadedStrings #-}

7+{-# LANGUAGE RecordWildCards #-}

8module Stackage.PerformBuild

9 ( performBuild

10 , PerformBuild (..)

@@ -12,22 +12,25 @@ module Stackage.PerformBuild

12 , pbDocDir

13 ) where

14

15−import Stackage.BuildConstraints

15+import Control.Concurrent.Async (async)

16−import Stackage.PackageDescription

17−import Stackage.BuildPlan

18−import Stackage.Prelude hiding (pi)

19−import qualified Data.Map as Map

20−import Control.Concurrent.STM.TSem

16+import Control.Concurrent.STM.TSem

21−import Control.Monad.Writer.Strict (execWriter, tell)

17+import Control.Monad.Writer.Strict (execWriter, tell)

18+import qualified Data.Map as Map

22−import Data.NonNull (fromNullable)

19+import Data.NonNull (fromNullable)

23−import Control.Concurrent.Async (async)

20+import Filesystem (canonicalizePath, createTree,

24−import System.IO.Temp (withSystemTempDirectory)

21+ getWorkingDirectory, isDirectory,

25−import Filesystem (createTree, removeTree, isDirectory, rename, canonicalizePath, getWorkingDirectory)

22+ removeTree, rename)

26−import System.IO (withBinaryFile, IOMode (WriteMode))

27−import Filesystem.Path (parent)

23+import Filesystem.Path (parent)

28−import qualified Filesystem.Path as F

24+import qualified Filesystem.Path as F

29−import System.Environment (getEnvironment)

25+import Stackage.BuildConstraints

26+import Stackage.BuildPlan

27+import Stackage.PackageDescription

28+import Stackage.Prelude hiding (pi)

30−import System.Directory (findExecutable)

29+import System.Directory (findExecutable)

30+import System.Environment (getEnvironment)

31+import System.IO (IOMode (WriteMode),

32+ withBinaryFile)

33+import System.IO.Temp (withSystemTempDirectory)

31

34

32data BuildException = BuildException (Map PackageName BuildFailure) [Text]

35data BuildException = BuildException (Map PackageName BuildFailure) [Text]

33 deriving Typeable

36 deriving Typeable

@@ -51,18 +54,18 @@ data BuildFailure = DependencyFailed PackageName

51instance Exception BuildFailure

54instance Exception BuildFailure

52

55

53data PerformBuild = PerformBuild

56data PerformBuild = PerformBuild

54− { pbPlan :: BuildPlan

57+ { pbPlan :: BuildPlan

55− , pbInstallDest :: FilePath

58+ , pbInstallDest :: FilePath

56− , pbLog :: ByteString -> IO ()

59+ , pbLog :: ByteString -> IO ()

57− , pbLogDir :: FilePath

60+ , pbLogDir :: FilePath

58− , pbJobs :: Int

61+ , pbJobs :: Int

59 , pbGlobalInstall :: Bool

62 , pbGlobalInstall :: Bool

60 -- ^ Register packages in the global database

63 -- ^ Register packages in the global database

61 }

64 }

62

65

63data PackageInfo = PackageInfo

66data PackageInfo = PackageInfo

64− { piPlan :: PackagePlan

67+ { piPlan :: PackagePlan

65− , piName :: PackageName

68+ , piName :: PackageName

66 , piResult :: TMVar Bool

69 , piResult :: TMVar Bool

67 }

70 }

68

71

@@ -200,17 +203,17 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do

200#endif

203#endif

201

204

202data SingleBuild = SingleBuild

205data SingleBuild = SingleBuild

203− { sbSem :: TSem

206+ { sbSem :: TSem

204− , sbErrsVar :: TVar (Map PackageName BuildFailure)

207+ , sbErrsVar :: TVar (Map PackageName BuildFailure)

205− , sbWarningsVar :: TVar ([Text] -> [Text])

208+ , sbWarningsVar :: TVar ([Text] -> [Text])

206− , sbActive :: TVar Int

209+ , sbActive :: TVar Int

207− , sbToolMap :: Map ExeName (Set PackageName)

210+ , sbToolMap :: Map ExeName (Set PackageName)

208− , sbPackageMap :: Map PackageName PackageInfo

211+ , sbPackageMap :: Map PackageName PackageInfo

209− , sbBuildDir :: FilePath

212+ , sbBuildDir :: FilePath

210− , sbPackageInfo :: PackageInfo

213+ , sbPackageInfo :: PackageInfo

211 , sbRegisterMutex :: MVar ()

214 , sbRegisterMutex :: MVar ()

212− , sbModifiedEnv :: [(String, String)]

215+ , sbModifiedEnv :: [(String, String)]

213− , sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file

216+ , sbHaddockFiles :: TVar (Map Text FilePath) -- ^ package-version, .haddock file

214 }

217 }

215

218

216singleBuild :: PerformBuild -> SingleBuild -> IO ()

219singleBuild :: PerformBuild -> SingleBuild -> IO ()

Stackage/ServerBundle.hs+9−9

@@ -9,18 +9,18 @@ module Stackage.ServerBundle

9 , docsListing

10 ) where

11

12−import qualified Codec.Archive.Tar as Tar

12+import qualified Codec.Archive.Tar as Tar

13−import qualified Codec.Archive.Tar.Entry as Tar

13+import qualified Codec.Archive.Tar.Entry as Tar

14−import qualified Codec.Compression.GZip as GZip

14+import qualified Codec.Compression.GZip as GZip

15−import qualified Data.Yaml as Y

15+import qualified Data.Yaml as Y

16+import Filesystem (isFile)

16−import Foreign.C.Types (CTime (CTime))

17+import Foreign.C.Types (CTime (CTime))

17import Stackage.BuildConstraints

18import Stackage.BuildConstraints

18import Stackage.BuildPlan

19import Stackage.BuildPlan

19import Stackage.Prelude

20import Stackage.Prelude

20−import qualified System.PosixCompat.Time as PC

21+import qualified System.PosixCompat.Time as PC

21−import qualified Text.XML as X

22+import qualified Text.XML as X

22−import Text.XML.Cursor

23+import Text.XML.Cursor

23−import Filesystem (isFile)

24

25-- | Get current time

26epochTime :: IO Tar.EpochTime

Stackage/UpdateBuildPlan.hs+3−3

@@ -8,9 +8,9 @@ module Stackage.UpdateBuildPlan

8 , updateBuildPlan

9 ) where

10

11−import qualified Data.Map as Map

11+import qualified Data.Map as Map

12−import Distribution.Version (anyVersion, earlierVersion,

12+import Distribution.Version (anyVersion, earlierVersion,

13− orLaterVersion)

13+ orLaterVersion)

14import Stackage.BuildConstraints

15import Stackage.BuildPlan

16import Stackage.Prelude

Stackage/Upload.hs+6−6

@@ -20,9 +20,9 @@ import Data.Default.Class (Default (..))

20import Filesystem (isDirectory, isFile)

21import Network.HTTP.Client

22import Network.HTTP.Client.MultipartFormData

23−import Stackage.BuildPlan (BuildPlan)

23+import Stackage.BuildPlan (BuildPlan)

24import Stackage.Prelude

25−import Stackage.ServerBundle (bpAllPackages, docsListing)

25+import Stackage.ServerBundle (bpAllPackages, docsListing)

26import System.IO.Temp (withSystemTempFile)

27

28newtype StackageServer = StackageServer { unStackageServer :: Text }

@@ -173,11 +173,11 @@ uploadHackageDistro bp username password =

173 }

174

175data UploadDocMap = UploadDocMap

176− { udmServer :: StackageServer

176+ { udmServer :: StackageServer

177 , udmAuthToken :: Text

178− , udmSnapshot :: SnapshotIdent

178+ , udmSnapshot :: SnapshotIdent

179− , udmDocDir :: FilePath

179+ , udmDocDir :: FilePath

180− , udmPlan :: BuildPlan

180+ , udmPlan :: BuildPlan

181 }

182

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