Refactor resolveTargets to allow resolving targets from a PackageDescription

This commit refactors `resolveTargets` to allow you to either resolve
targets from

* The output of the solver by `resolveTargetsFromSolver`
* The package descriptions `resolveTargetsFromLocalPackages`

This allows you to use `v2-` infrastructure with commands which don't
require running the solver step (for example, v2-outdated).

Author: mpickering

cabal-install/src/Distribution/Client/CmdBench.hs

@@ -132,7 +132,7 @@ benchAction flags@NixStyleFlags{..} targetStrings globalFlags = do
       -- (as opposed to say build or haddock targets).
       targets <-
         either (reportTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             selectPackageTargets
             selectComponentTarget
             elaboratedPlan

cabal-install/src/Distribution/Client/CmdBuild.hs

@@ -157,7 +157,7 @@ buildAction flags@NixStyleFlags{extraFlags = buildFlags, ..} targetStrings globa
         -- (as opposed to say repl or haddock targets).
         targets <-
           either (reportBuildTargetProblems verbosity) return $
-            resolveTargets
+            resolveTargetsFromSolver
               selectPackageTargets
               selectComponentTarget
               elaboratedPlan

cabal-install/src/Distribution/Client/CmdGenBounds.hs

@@ -109,7 +109,7 @@ genBoundsAction flags targetStrings globalFlags =
     -- Step 2: Resolve the targets for the gen-bounds command.
     targets <-
       either (reportGenBoundsTargetProblems verbosity) return $
-        resolveTargets
+        resolveTargetsFromSolver
           selectPackageTargets
           selectComponentTarget
           elaboratedPlan

cabal-install/src/Distribution/Client/CmdHaddock.hs

@@ -177,7 +177,7 @@ haddockAction relFlags targetStrings globalFlags = do
       -- haddock targets
       targets <-
         either (reportBuildDocumentationTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             (selectPackageTargets haddockFlags)
             selectComponentTarget
             elaboratedPlan

cabal-install/src/Distribution/Client/CmdHaddockProject.hs

@@ -28,7 +28,7 @@ import Distribution.Client.ProjectOrchestration
   , ProjectBuildContext (..)
   , TargetSelector (..)
   , pruneInstallPlanToTargets
-  , resolveTargets
+  , resolveTargetsFromSolver
   , runProjectPreBuildPhase
   , selectComponentTargetBasic
   )
@@ -146,7 +146,7 @@ haddockProjectAction flags _extraArgs globalFlags = do
           -- (as opposed to say repl or haddock targets).
           targets <-
             either reportTargetProblems return $
-              resolveTargets
+              resolveTargetsFromSolver
                 selectPackageTargets
                 selectComponentTargetBasic
                 elaboratedPlan

cabal-install/src/Distribution/Client/CmdInstall.hs

@@ -828,7 +828,7 @@ partitionToKnownTargetsAndHackagePackages
   -> IO (TargetsMap, [PackageName])
 partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetSelectors = do
   let mTargets =
-        resolveTargets
+        resolveTargetsFromSolver
           selectPackageTargets
           selectComponentTarget
           elaboratedPlan
@@ -868,7 +868,7 @@ partitionToKnownTargetsAndHackagePackages verbosity pkgDb elaboratedPlan targetS
       -- removed (or we've given up).
       targets <-
         either (reportBuildTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             selectPackageTargets
             selectComponentTarget
             elaboratedPlan
@@ -888,7 +888,7 @@ constructProjectBuildContext verbosity baseCtx targetSelectors = do
     -- Interpret the targets on the command line as build targets
     targets <-
       either (reportBuildTargetProblems verbosity) return $
-        resolveTargets
+        resolveTargetsFromSolver
           selectPackageTargets
           selectComponentTarget
           elaboratedPlan

cabal-install/src/Distribution/Client/CmdListBin.hs

@@ -106,7 +106,7 @@ listbinAction flags@NixStyleFlags{..} args globalFlags = do
         -- (as opposed to say repl or haddock targets).
         targets <-
           either (reportTargetProblems verbosity) return $
-            resolveTargets
+            resolveTargetsFromSolver
               selectPackageTargets
               selectComponentTarget
               elaboratedPlan

cabal-install/src/Distribution/Client/CmdRepl.hs

@@ -516,7 +516,7 @@ replAction flags@NixStyleFlags{extraFlags = r@ReplFlags{..}, ..} targetStrings g
       -- (as opposed to say build or haddock targets).
       targets <-
         either (reportTargetProblems verbosity) return $
-          resolveTargets
+          resolveTargetsFromSolver
             (selectPackageTargets multi_repl_enabled)
             selectComponentTarget
             elaboratedPlan

cabal-install/src/Distribution/Client/CmdRun.hs

@@ -228,7 +228,7 @@ runAction flags@NixStyleFlags{..} targetAndArgs globalFlags =
         -- (as opposed to say repl or haddock targets).
         targets <-
           either (reportTargetProblems verbosity) return $
-            resolveTargets
+            resolveTargetsFromSolver
               selectPackageTargets
               selectComponentTarget
               elaboratedPlan

cabal-install/src/Distribution/Client/CmdTarget.hs

@@ -172,7 +172,7 @@ targetAction flags@NixStyleFlags{..} ts globalFlags = do
 
   targets :: TargetsMap <-
     either (reportBuildTargetProblems verbosity) return $
-      resolveTargets
+      resolveTargetsFromSolver
         selectPackageTargets
         selectComponentTarget
         elaboratedPlan