git.iko.soy/stackage
on master help sign in
Merge pull request #452 from phadej/skip-haddock

Add --skip-haddock -flag

commitafdd1c6abcb24e070a0e933ebb134fdb2b2f8574 authorChris Done <chrisdone@gmail.com> dateSun 22 Feb 2015, 12:37 (12 years ago) parent4e2260a4312df0
4 files changed+16−1
compare with master
unifiedsplit
Stackage/CompleteBuild.hs+2 Stackage/InstallBuild.hs+2 Stackage/PerformBuild.hs+2−1 app/stackage.hs+10
Stackage/CompleteBuild.hs+2
@@ -33,6 +33,7 @@ import System.IO (BufferMode (LineBuffering), hSetBuffering)
3333-- | Flags passed in from the command line.
3434data BuildFlags = BuildFlags
3535 { bfEnableTests :: !Bool
36+ , bfEnableHaddock :: !Bool
3637 , bfDoUpload :: !Bool
3738 , bfEnableLibProfile :: !Bool
3839 , bfVerbose :: !Bool
@@ -203,6 +204,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
203204 , pbJobs = 8
204205 , pbGlobalInstall = False
205206 , pbEnableTests = bfEnableTests buildFlags
207+ , pbEnableHaddock = bfEnableHaddock buildFlags
206208 , pbEnableLibProfiling = bfEnableLibProfile buildFlags
207209 , pbVerbose = bfVerbose buildFlags
208210 , pbAllowNewer = bfSkipCheck buildFlags
Stackage/InstallBuild.hs+2
@@ -28,6 +28,7 @@ data InstallFlags = InstallFlags
2828 , ifJobs :: !Int
2929 , ifGlobalInstall :: !Bool
3030 , ifEnableTests :: !Bool
31+ , ifEnableHaddock :: !Bool
3132 , ifEnableLibProfiling :: !Bool
3233 , ifVerbose :: !Bool
3334 , ifSkipCheck :: !Bool
@@ -48,6 +49,7 @@ getPerformBuild plan InstallFlags{..} =
4849 , pbJobs = ifJobs
4950 , pbGlobalInstall = ifGlobalInstall
5051 , pbEnableTests = ifEnableTests
52+ , pbEnableHaddock = ifEnableHaddock
5153 , pbEnableLibProfiling = ifEnableLibProfiling
5254 , pbVerbose = ifVerbose
5355 , pbAllowNewer = ifSkipCheck
Stackage/PerformBuild.hs+2−1
@@ -62,6 +62,7 @@ data PerformBuild = PerformBuild
6262 , pbGlobalInstall :: Bool
6363 -- ^ Register packages in the global database
6464 , pbEnableTests :: Bool
65+ , pbEnableHaddock :: Bool
6566 , pbEnableLibProfiling :: Bool
6667 , pbVerbose :: Bool
6768 , pbAllowNewer :: Bool
@@ -354,7 +355,7 @@ singleBuild pb@PerformBuild {..} SingleBuild {..} =
354355 -- dependency's haddocks before this finishes
355356 atomically $ putTMVar (piResult sbPackageInfo) True
356357
357− when (pcHaddocks /= Don'tBuild && not (null $ sdModules $ ppDesc $ piPlan sbPackageInfo)) $ do
358+ when (pbEnableHaddock && pcHaddocks /= Don'tBuild && not (null $ sdModules $ ppDesc $ piPlan sbPackageInfo)) $ do
358359 log' $ "Haddocks " ++ namever
359360 hfs <- readTVarIO sbHaddockFiles
360361 let hfsOpts = flip map (mapToList hfs) $ \(pkgVer, hf) -> concat
app/stackage.hs+10
@@ -77,6 +77,11 @@ main =
7777 (switch
7878 (long "skip-tests" <>
7979 help "Skip build and running the test suites")) <*>
80+ fmap
81+ not
82+ (switch
83+ (long "skip-haddock" <>
84+ help "Skip generating haddock documentation")) <*>
8085 fmap
8186 not
8287 (switch
@@ -136,6 +141,11 @@ main =
136141 (switch
137142 (long "skip-tests" <>
138143 help "Skip build and running the test suites")) <*>
144+ fmap
145+ not
146+ (switch
147+ (long "skip-haddock" <>
148+ help "Skip generating haddock documentation")) <*>
139149 switch
140150 (long "enable-library-profiling" <>
141151 help "Enable profiling when building") <*>