git.iko.soy/stackage
on master help sign in
skip-hoogle options
commit076c477905575fead6fb672b7b116373d3aeeaf9 authorMichael Snoyman <michael@snoyman.com> dateWed 18 Mar 2015, 15:45 (12 years ago) parentd0138fa
5 files changed+28−8
compare with master
unifiedsplit
ChangeLog.md+1 Stackage/CompleteBuild.hs+2 Stackage/InstallBuild.hs+2 Stackage/PerformBuild.hs+11−6 app/stackage.hs+12−2
ChangeLog.md+1
@@ -1,6 +1,7 @@
11## 0.6.1
22
33* Switch to V2 upload by default
4+* --skip-hoogle option
45
56## 0.6.0
67
Stackage/CompleteBuild.hs+2
@@ -42,6 +42,7 @@ data BuildFlags = BuildFlags
4242 , bfSkipCheck :: !Bool
4343 , bfUploadV1 :: !Bool
4444 , bfServer :: !StackageServer
45+ , bfBuildHoogle :: !Bool
4546 } deriving (Show)
4647
4748data BuildType = Nightly | LTS BumpType
@@ -221,6 +222,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
221222 , pbEnableExecDyn = bfEnableExecDyn buildFlags
222223 , pbVerbose = bfVerbose buildFlags
223224 , pbAllowNewer = bfSkipCheck buildFlags
225+ , pbBuildHoogle = bfBuildHoogle buildFlags
224226 }
225227
226228-- | Make a complete plan, build, test and upload bundle, docs and
Stackage/InstallBuild.hs+2
@@ -33,6 +33,7 @@ data InstallFlags = InstallFlags
3333 , ifEnableExecDyn :: !Bool
3434 , ifVerbose :: !Bool
3535 , ifSkipCheck :: !Bool
36+ , ifBuildHoogle :: !Bool
3637 } deriving (Show)
3738
3839-- | Source for build plan.
@@ -55,6 +56,7 @@ getPerformBuild plan InstallFlags{..} =
5556 , pbEnableExecDyn = ifEnableExecDyn
5657 , pbVerbose = ifVerbose
5758 , pbAllowNewer = ifSkipCheck
59+ , pbBuildHoogle = ifBuildHoogle
5860 }
5961
6062-- | Install stackage from an existing build plan.
Stackage/PerformBuild.hs+11−6
@@ -69,6 +69,10 @@ data PerformBuild = PerformBuild
6969 , pbVerbose :: Bool
7070 , pbAllowNewer :: Bool
7171 -- ^ Pass --allow-newer to cabal configure
72+ , pbBuildHoogle :: Bool
73+ -- ^ Should we build Hoogle database?
74+ --
75+ -- May be disabled due to: https://ghc.haskell.org/trac/ghc/ticket/9921
7276 }
7377
7478data PackageInfo = PackageInfo
@@ -421,12 +425,13 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
421425 , "/,"
422426 , fpToText hf
423427 ]
424− args = "haddock"
425− : "--hyperlink-source"
426− : "--html"
427− : "--hoogle"
428− : "--html-location=../$pkg-$version/"
429− : hfsOpts
428+ args = ($ hfsOpts) $ execWriter $ do
429+ let tell' x = tell (x:)
430+ tell' "haddock"
431+ tell' "--hyperlink-source"
432+ tell' "--html"
433+ when pbBuildHoogle $ tell' "--hoogle"
434+ tell' "--html-location=../$pkg-$version/"
430435
431436 eres <- tryAny $ run "cabal" args
432437
app/stackage.hs+12−2
@@ -116,7 +116,12 @@ main =
116116 (long "server-url" <>
117117 metavar "SERVER-URL" <>
118118 showDefault <> value (T.unpack $ unStackageServer def) <>
119− help "Server to upload bundle to")))
119+ help "Server to upload bundle to"))) <*>
120+ fmap
121+ not
122+ (switch
123+ (long "skip-hoogle" <>
124+ help "Skip generating Hoogle input files"))
120125
121126 nightlyUploadFlags = fromString <$> strArgument
122127 (metavar "DATE" <>
@@ -178,7 +183,12 @@ main =
178183 help "Output verbose detail about the build steps") <*>
179184 switch
180185 (long "skip-check" <>
181− help "Skip the check phase, and pass --allow-newer to cabal configure")
186+ help "Skip the check phase, and pass --allow-newer to cabal configure") <*>
187+ fmap
188+ not
189+ (switch
190+ (long "skip-hoogle" <>
191+ help "Skip generating Hoogle input files"))
182192
183193 uploadv2 (path, url) = withManager tlsManagerSettings $ \man -> do
184194 token <- getStackageAuthToken