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

Merge branch 'master' into incremental

Browse Source
This commit is contained in:
Michael Snoyman 2015-03-13 08:52:42 +02:00
commit 9598bf9a3c
5 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Stackage/BuildConstraints.hs
View File

@ -120,7 +120,7 @@ instance FromJSON PackageConstraints where
pcBuildBenchmarks <- o .: "build-benchmarks" pcBuildBenchmarks <- o .: "build-benchmarks"
pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags" pcFlagOverrides <- Map.mapKeysWith const mkFlagName <$> o .: "flags"
pcMaintainer <- o .:? "maintainer" pcMaintainer <- o .:? "maintainer"
pcEnableLibProfile <- fmap (fromMaybe False) (o .:? "library-profiling") pcEnableLibProfile <- fmap (fromMaybe True) (o .:? "library-profiling")
return PackageConstraints {..} return PackageConstraints {..}
-- | The proposed plan from the requirements provided by contributors. -- | The proposed plan from the requirements provided by contributors.

2
Stackage/CompleteBuild.hs
View File

@ -36,6 +36,7 @@ data BuildFlags = BuildFlags
, bfEnableHaddock :: !Bool , bfEnableHaddock :: !Bool
, bfDoUpload :: !Bool , bfDoUpload :: !Bool
, bfEnableLibProfile :: !Bool , bfEnableLibProfile :: !Bool
, bfEnableExecDyn :: !Bool
, bfVerbose :: !Bool , bfVerbose :: !Bool
, bfSkipCheck :: !Bool , bfSkipCheck :: !Bool
} deriving (Show) } deriving (Show)
@ -206,6 +207,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
, pbEnableTests = bfEnableTests buildFlags , pbEnableTests = bfEnableTests buildFlags
, pbEnableHaddock = bfEnableHaddock buildFlags , pbEnableHaddock = bfEnableHaddock buildFlags
, pbEnableLibProfiling = bfEnableLibProfile buildFlags , pbEnableLibProfiling = bfEnableLibProfile buildFlags
, pbEnableExecDyn = bfEnableExecDyn buildFlags
, pbVerbose = bfVerbose buildFlags , pbVerbose = bfVerbose buildFlags
, pbAllowNewer = bfSkipCheck buildFlags , pbAllowNewer = bfSkipCheck buildFlags
} }

2
Stackage/InstallBuild.hs
View File

@ -30,6 +30,7 @@ data InstallFlags = InstallFlags
, ifEnableTests :: !Bool , ifEnableTests :: !Bool
, ifEnableHaddock :: !Bool , ifEnableHaddock :: !Bool
, ifEnableLibProfiling :: !Bool , ifEnableLibProfiling :: !Bool
, ifEnableExecDyn :: !Bool
, ifVerbose :: !Bool , ifVerbose :: !Bool
, ifSkipCheck :: !Bool , ifSkipCheck :: !Bool
} deriving (Show) } deriving (Show)
@ -51,6 +52,7 @@ getPerformBuild plan InstallFlags{..} =
, pbEnableTests = ifEnableTests , pbEnableTests = ifEnableTests
, pbEnableHaddock = ifEnableHaddock , pbEnableHaddock = ifEnableHaddock
, pbEnableLibProfiling = ifEnableLibProfiling , pbEnableLibProfiling = ifEnableLibProfiling
, pbEnableExecDyn = ifEnableExecDyn
, pbVerbose = ifVerbose , pbVerbose = ifVerbose
, pbAllowNewer = ifSkipCheck , pbAllowNewer = ifSkipCheck
} }

2
Stackage/PerformBuild.hs
View File

@ -65,6 +65,7 @@ data PerformBuild = PerformBuild
, pbEnableTests :: Bool , pbEnableTests :: Bool
, pbEnableHaddock :: Bool , pbEnableHaddock :: Bool
, pbEnableLibProfiling :: Bool , pbEnableLibProfiling :: Bool
, pbEnableExecDyn :: Bool
, pbVerbose :: Bool , pbVerbose :: Bool
, pbAllowNewer :: Bool , pbAllowNewer :: Bool
-- ^ Pass --allow-newer to cabal configure -- ^ Pass --allow-newer to cabal configure
@ -334,6 +335,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
tell' $ "--flags=" ++ flags tell' $ "--flags=" ++ flags
when (pbEnableLibProfiling && pcEnableLibProfile) $ when (pbEnableLibProfiling && pcEnableLibProfile) $
tell' "--enable-library-profiling" tell' "--enable-library-profiling"
when pbEnableExecDyn $ tell' "--enable-executable-dynamic"
where where
tell' x = tell (x:) tell' x = tell (x:)

6
app/stackage.hs
View File

@ -90,6 +90,9 @@ main =
switch switch
(long "enable-library-profiling" <> (long "enable-library-profiling" <>
help "Enable profiling when building") <*> help "Enable profiling when building") <*>
switch
(long "enable-executable-dynamic" <>
help "Enable dynamic executables when building") <*>
switch switch
(long "verbose" <> short 'v' <> (long "verbose" <> short 'v' <>
help "Output verbose detail about the build steps") <*> help "Output verbose detail about the build steps") <*>
@ -149,6 +152,9 @@ main =
switch switch
(long "enable-library-profiling" <> (long "enable-library-profiling" <>
help "Enable profiling when building") <*> help "Enable profiling when building") <*>
switch
(long "enable-executable-dynamic" <>
help "Enable dynamic executables when building") <*>
switch switch
(long "verbose" <> short 'v' <> (long "verbose" <> short 'v' <>
help "Output verbose detail about the build steps") <*> help "Output verbose detail about the build steps") <*>