mirror of
https://github.com/commercialhaskell/stackage.git
synced 2026-02-11 22:07:29 +01:00
skip-hoogle options
This commit is contained in:
parent
d0138fae7a
commit
076c477905
@ -1,6 +1,7 @@
|
|||||||
## 0.6.1
|
## 0.6.1
|
||||||
|
|
||||||
* Switch to V2 upload by default
|
* Switch to V2 upload by default
|
||||||
|
* --skip-hoogle option
|
||||||
|
|
||||||
## 0.6.0
|
## 0.6.0
|
||||||
|
|
||||||
|
|||||||
@ -42,6 +42,7 @@ data BuildFlags = BuildFlags
|
|||||||
, bfSkipCheck :: !Bool
|
, bfSkipCheck :: !Bool
|
||||||
, bfUploadV1 :: !Bool
|
, bfUploadV1 :: !Bool
|
||||||
, bfServer :: !StackageServer
|
, bfServer :: !StackageServer
|
||||||
|
, bfBuildHoogle :: !Bool
|
||||||
} deriving (Show)
|
} deriving (Show)
|
||||||
|
|
||||||
data BuildType = Nightly | LTS BumpType
|
data BuildType = Nightly | LTS BumpType
|
||||||
@ -221,6 +222,7 @@ getPerformBuild buildFlags Settings {..} = PerformBuild
|
|||||||
, pbEnableExecDyn = bfEnableExecDyn buildFlags
|
, pbEnableExecDyn = bfEnableExecDyn buildFlags
|
||||||
, pbVerbose = bfVerbose buildFlags
|
, pbVerbose = bfVerbose buildFlags
|
||||||
, pbAllowNewer = bfSkipCheck buildFlags
|
, pbAllowNewer = bfSkipCheck buildFlags
|
||||||
|
, pbBuildHoogle = bfBuildHoogle buildFlags
|
||||||
}
|
}
|
||||||
|
|
||||||
-- | Make a complete plan, build, test and upload bundle, docs and
|
-- | Make a complete plan, build, test and upload bundle, docs and
|
||||||
|
|||||||
@ -33,6 +33,7 @@ data InstallFlags = InstallFlags
|
|||||||
, ifEnableExecDyn :: !Bool
|
, ifEnableExecDyn :: !Bool
|
||||||
, ifVerbose :: !Bool
|
, ifVerbose :: !Bool
|
||||||
, ifSkipCheck :: !Bool
|
, ifSkipCheck :: !Bool
|
||||||
|
, ifBuildHoogle :: !Bool
|
||||||
} deriving (Show)
|
} deriving (Show)
|
||||||
|
|
||||||
-- | Source for build plan.
|
-- | Source for build plan.
|
||||||
@ -55,6 +56,7 @@ getPerformBuild plan InstallFlags{..} =
|
|||||||
, pbEnableExecDyn = ifEnableExecDyn
|
, pbEnableExecDyn = ifEnableExecDyn
|
||||||
, pbVerbose = ifVerbose
|
, pbVerbose = ifVerbose
|
||||||
, pbAllowNewer = ifSkipCheck
|
, pbAllowNewer = ifSkipCheck
|
||||||
|
, pbBuildHoogle = ifBuildHoogle
|
||||||
}
|
}
|
||||||
|
|
||||||
-- | Install stackage from an existing build plan.
|
-- | Install stackage from an existing build plan.
|
||||||
|
|||||||
@ -69,6 +69,10 @@ data PerformBuild = PerformBuild
|
|||||||
, pbVerbose :: Bool
|
, pbVerbose :: Bool
|
||||||
, pbAllowNewer :: Bool
|
, pbAllowNewer :: Bool
|
||||||
-- ^ Pass --allow-newer to cabal configure
|
-- ^ Pass --allow-newer to cabal configure
|
||||||
|
, pbBuildHoogle :: Bool
|
||||||
|
-- ^ Should we build Hoogle database?
|
||||||
|
--
|
||||||
|
-- May be disabled due to: https://ghc.haskell.org/trac/ghc/ticket/9921
|
||||||
}
|
}
|
||||||
|
|
||||||
data PackageInfo = PackageInfo
|
data PackageInfo = PackageInfo
|
||||||
@ -421,12 +425,13 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
|
|||||||
, "/,"
|
, "/,"
|
||||||
, fpToText hf
|
, fpToText hf
|
||||||
]
|
]
|
||||||
args = "haddock"
|
args = ($ hfsOpts) $ execWriter $ do
|
||||||
: "--hyperlink-source"
|
let tell' x = tell (x:)
|
||||||
: "--html"
|
tell' "haddock"
|
||||||
: "--hoogle"
|
tell' "--hyperlink-source"
|
||||||
: "--html-location=../$pkg-$version/"
|
tell' "--html"
|
||||||
: hfsOpts
|
when pbBuildHoogle $ tell' "--hoogle"
|
||||||
|
tell' "--html-location=../$pkg-$version/"
|
||||||
|
|
||||||
eres <- tryAny $ run "cabal" args
|
eres <- tryAny $ run "cabal" args
|
||||||
|
|
||||||
|
|||||||
@ -116,7 +116,12 @@ main =
|
|||||||
(long "server-url" <>
|
(long "server-url" <>
|
||||||
metavar "SERVER-URL" <>
|
metavar "SERVER-URL" <>
|
||||||
showDefault <> value (T.unpack $ unStackageServer def) <>
|
showDefault <> value (T.unpack $ unStackageServer def) <>
|
||||||
help "Server to upload bundle to")))
|
help "Server to upload bundle to"))) <*>
|
||||||
|
fmap
|
||||||
|
not
|
||||||
|
(switch
|
||||||
|
(long "skip-hoogle" <>
|
||||||
|
help "Skip generating Hoogle input files"))
|
||||||
|
|
||||||
nightlyUploadFlags = fromString <$> strArgument
|
nightlyUploadFlags = fromString <$> strArgument
|
||||||
(metavar "DATE" <>
|
(metavar "DATE" <>
|
||||||
@ -178,7 +183,12 @@ main =
|
|||||||
help "Output verbose detail about the build steps") <*>
|
help "Output verbose detail about the build steps") <*>
|
||||||
switch
|
switch
|
||||||
(long "skip-check" <>
|
(long "skip-check" <>
|
||||||
help "Skip the check phase, and pass --allow-newer to cabal configure")
|
help "Skip the check phase, and pass --allow-newer to cabal configure") <*>
|
||||||
|
fmap
|
||||||
|
not
|
||||||
|
(switch
|
||||||
|
(long "skip-hoogle" <>
|
||||||
|
help "Skip generating Hoogle input files"))
|
||||||
|
|
||||||
uploadv2 (path, url) = withManager tlsManagerSettings $ \man -> do
|
uploadv2 (path, url) = withManager tlsManagerSettings $ \man -> do
|
||||||
token <- getStackageAuthToken
|
token <- getStackageAuthToken
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user