Merge pull request #2322 from sjakobi/2262-multiple-config-pvp-bounds

Add multi-config pvp-bounds generation (#2262)

src/Stack/Build/Installed.hs

@@ -8,6 +8,7 @@ module Stack.Build.Installed
     ( InstalledMap
     , Installed (..)
     , GetInstalledOpts (..)
+    , defaultGetInstalledOpts
     , getInstalled
     ) where
 
@@ -58,10 +59,18 @@ data GetInstalledOpts = GetInstalledOpts
       -- ^ Require haddocks?
     }
 
+defaultGetInstalledOpts :: GetInstalledOpts
+defaultGetInstalledOpts = GetInstalledOpts
+    { getInstalledProfiling = False
+    , getInstalledHaddock = False
+    }
+
 -- | Returns the new InstalledMap and all of the locally registered packages.
 getInstalled :: (M env m, PackageInstallInfo pii)
              => EnvOverride
              -> GetInstalledOpts
+             -- TODO: Clarify what the Map is used for and what properties it
+             -- should have.
              -> Map PackageName pii -- ^ does not contain any installed information
              -> m ( InstalledMap
                   , [DumpPackage () ()] -- globally installed

src/Stack/BuildPlan.hs

@@ -424,7 +424,7 @@ getToolMap mbp =
 
 loadResolver
     :: (MonadIO m, MonadLogger m, MonadReader env m, HasHttpManager env, HasConfig env, HasGHCVariant env, MonadBaseControl IO m, MonadMask m)
-    => Maybe (Path Abs File)
+    => Maybe (Path Abs File) -- ^ Optional path to project config file
     -> Resolver
     -> m (MiniBuildPlan, LoadedResolver)
 loadResolver mconfigPath resolver =
@@ -958,7 +958,7 @@ shadowMiniBuildPlan (MiniBuildPlan cv pkgs0) shadowed =
 
 parseCustomMiniBuildPlan
     :: (MonadIO m, MonadMask m, MonadLogger m, MonadReader env m, HasHttpManager env, HasConfig env, HasGHCVariant env, MonadBaseControl IO m)
-    => Maybe (Path Abs File) -- ^ Root directory for when url is a filepath
+    => Maybe (Path Abs File) -- ^ Optional path to project config file
     -> T.Text
     -> m (MiniBuildPlan, SnapshotHash)
 parseCustomMiniBuildPlan mconfigPath0 url0 = do

src/Stack/Config.hs

@@ -26,6 +26,7 @@ module Stack.Config
   ,loadConfig
   ,loadConfigMaybeProject
   ,loadMiniConfig
+  ,loadProjectConfig
   ,packagesParser
   ,resolvePackageEntry
   ,getImplicitGlobalProjectDir

src/Stack/Dot.hs

@@ -31,7 +31,7 @@ import qualified Data.Traversable as T
 import           Network.HTTP.Client.Conduit (HasHttpManager)
 import           Prelude -- Fix redundant import warnings
 import           Stack.Build (withLoadPackage)
-import           Stack.Build.Installed (getInstalled, GetInstalledOpts(..))
+import           Stack.Build.Installed (getInstalled, defaultGetInstalledOpts)
 import           Stack.Build.Source
 import           Stack.Build.Target
 import           Stack.Constants
@@ -97,7 +97,7 @@ createDependencyGraph dotOpts = do
   let graph = Map.fromList (localDependencies dotOpts locals)
   menv <- getMinimalEnvOverride
   installedMap <- fmap snd . fst4 <$> getInstalled menv
-                                                   (GetInstalledOpts False False)
+                                                   defaultGetInstalledOpts
                                                    sourceMap
   withLoadPackage menv (\loader -> do
     let depLoader =

src/Stack/Ghci.hs

@@ -311,10 +311,7 @@ ghciSetup GhciOpts{..} = do
     menv <- getMinimalEnvOverride
     (installedMap, _, _, _) <- getInstalled
         menv
-        GetInstalledOpts
-            { getInstalledProfiling = False
-            , getInstalledHaddock   = False
-            }
+        defaultGetInstalledOpts
         sourceMap
     econfig <- asks getEnvConfig
     directlyWanted <-

src/Stack/Options.hs

@@ -24,49 +24,52 @@ module Stack.Options
     ,testOptsParser
     ,haddockOptsParser
     ,hpcReportOptsParser
+    ,sdistOptsParser
     ,pvpBoundsOption
+    ,pvpBoundsOptsParser
     ,globalOptsFromMonoid
     ,splitObjsWarning
     ) where
 
-import           Control.Monad.Logger              (LogLevel (..))
-import           Data.Char                         (isSpace, toLower, toUpper)
-import           Data.List                         (intercalate)
-import           Data.List.Split                   (splitOn)
-import qualified Data.Map                          as Map
-import           Data.Map.Strict                   (Map)
-import qualified Data.Map.Strict                   as M
+import           Control.Monad.Logger (LogLevel (..))
+import           Data.Char (isSpace, toLower, toUpper)
+import           Data.List (intercalate)
+import           Data.List.Split (splitOn)
+import qualified Data.Map as Map
+import           Data.Map.Strict (Map)
+import qualified Data.Map.Strict as M
 import           Data.Maybe
 import           Data.Monoid.Extra
-import qualified Data.Set                          as Set
-import qualified Data.Text                         as T
-import           Data.Text.Read                    (decimal)
-import           Distribution.Version              (anyVersion)
+import qualified Data.Set as Set
+import qualified Data.Text as T
+import           Data.Text.Read (decimal)
+import           Distribution.Version (anyVersion)
 import           Options.Applicative
 import           Options.Applicative.Args
 import           Options.Applicative.Builder.Extra
-import           Options.Applicative.Types         (fromM, oneM, readerAsk)
-import           Stack.Build                       (splitObjsWarning)
-import           Stack.Clean                       (CleanOpts (..))
-import           Stack.Config                      (packagesParser)
+import           Options.Applicative.Types (fromM, oneM, readerAsk)
+import           Stack.Build (splitObjsWarning)
+import           Stack.Clean (CleanOpts (..))
+import           Stack.Config (packagesParser)
 import           Stack.ConfigCmd
 import           Stack.Constants
-import           Stack.Coverage                    (HpcReportOpts (..))
+import           Stack.Coverage (HpcReportOpts (..))
 import           Stack.Docker
-import qualified Stack.Docker                      as Docker
+import qualified Stack.Docker as Docker
 import           Stack.Dot
-import           Stack.Ghci                        (GhciOpts (..))
+import           Stack.Ghci (GhciOpts (..))
 import           Stack.Init
 import           Stack.New
 import           Stack.Nix
-import           Stack.Types.FlagName
-import           Stack.Types.PackageName
-import           Stack.Types.Version
+import           Stack.SDist
+import           Stack.Types.Compiler
 import           Stack.Types.Config
 import           Stack.Types.Docker
+import           Stack.Types.FlagName
 import           Stack.Types.Nix
-import           Stack.Types.Compiler
+import           Stack.Types.PackageName
 import           Stack.Types.TemplateName
+import           Stack.Types.Version
 
 -- | Allows adjust global options depending on their context
 -- Note: This was being used to remove ambibuity between the local and global
@@ -949,6 +952,29 @@ hpcReportOptsParser = HpcReportOpts
     <*> switch (long "all" <> help "Use results from all packages and components")
     <*> optional (strOption (long "destdir" <> help "Output directy for HTML report"))
 
+sdistOptsParser :: Parser SDistOpts
+sdistOptsParser = SDistOpts
+    <$> many (strArgument $ metavar "DIR")
+    <*> optional pvpBoundsOptsParser
+    <*> switch (long "ignore-check" <> help "Do not check package for common mistakes")
+    <*> switch (long "sign" <> help "Sign & upload signatures")
+    <*> strOption
+            (long "sig-server" <> metavar "URL" <> showDefault <>
+             value "https://sig.commercialhaskell.org" <>
+             help "URL")
+
+pvpBoundsOptsParser :: Parser PvpBoundsOpts
+pvpBoundsOptsParser = PvpBoundsOpts
+    <$> pvpBoundsOption
+    <*> many (option readDependencyConfigurationSource
+                (long "also-considering" <>
+                 help "Extra dependency configs to consider during bounds generation" <>
+                 metavar "RESOLVER_OR_STACK_YAML"))
+  where
+    readDependencyConfigurationSource =
+        DCSResolver <$> readAbstractResolver <|>
+        DCSProjectConfig <$> str
+
 pvpBoundsOption :: Parser PvpBounds
 pvpBoundsOption =
     option