Improve s-b-i frontend command and add tests

haskell · Sep 15, 2019 · c946e9a · c946e9a
1 parent 59281db
commit c946e9a
Show file tree

Hide file tree

Showing 45 changed files with 1,061 additions and 427 deletions.
diff --git a/cabal-install/Distribution/Client/CmdBuild.hs b/cabal-install/Distribution/Client/CmdBuild.hs
@@ -8,7 +8,8 @@ module Distribution.Client.CmdBuild (
     -- * Internals exposed for testing
     TargetProblem(..),
     selectPackageTargets,
-    selectComponentTarget
+    selectComponentTarget,
+    reportTargetProblems
   ) where
 
 import Distribution.Client.ProjectOrchestration

diff --git a/cabal-install/Distribution/Client/CmdShowBuildInfo.hs b/cabal-install/Distribution/Client/CmdShowBuildInfo.hs
diff --git a/cabal-install/Distribution/Client/CmdWriteAutogenFiles.hs b/cabal-install/Distribution/Client/CmdWriteAutogenFiles.hs
diff --git a/cabal-install/Distribution/Client/Setup.hs b/cabal-install/Distribution/Client/Setup.hs
@@ -56,10 +56,7 @@ module Distribution.Client.Setup
     , doctestCommand
     , copyCommand
     , registerCommand
-
-    --ghc-mod support commands
-    , showBuildInfoCommand
-    , writeAutogenFilesCommand, WriteAutogenFilesFlags(..)
+    --, showBuildInfoCommand
     , parsePackageArgs
     , liftOptions
     , yesNoOpt
@@ -108,7 +105,6 @@ import Distribution.Simple.Setup
          , SDistFlags(..), HaddockFlags(..)
          , CleanFlags(..), DoctestFlags(..)
          , CopyFlags(..), RegisterFlags(..)
-         , WriteAutogenFilesFlags(..)
          , readPackageDbList, showPackageDbList
          , Flag(..), toFlag, flagToMaybe, flagToList, maybeToFlag
          , BooleanFlag(..), optionVerbosity
@@ -202,7 +198,6 @@ globalCommand commands = CommandUI {
           , "haddock"
           , "hscolour"
           , "show-build-info"
-          , "write-autogen-files"
           , "exec"
           , "new-build"
           , "new-configure"
@@ -290,7 +285,6 @@ globalCommand commands = CommandUI {
         , addCmd "report"
         , par
         , addCmd "show-build-info"
-        , addCmd "write-autogen-files"
         , addCmd "freeze"
         , addCmd "gen-bounds"
         , addCmd "outdated"
@@ -869,25 +863,6 @@ filterTestFlags flags cabalLibVersion
       Cabal.testWrapper = NoFlag
       }
 
--- ------------------------------------------------------------
--- * show-build-info command
--- ------------------------------------------------------------
-
-showBuildInfoCommand :: CommandUI (BuildFlags, BuildExFlags)
-showBuildInfoCommand = parent {
-    commandDefaultFlags = (commandDefaultFlags parent, mempty),
-    commandOptions      =
-      \showOrParseArgs -> liftOptions fst setFst
-                          (commandOptions parent showOrParseArgs)
-                          ++
-                          liftOptions snd setSnd (buildExOptions showOrParseArgs)
-  }
-  where
-    setFst a (_,b) = (a,b)
-    setSnd b (a,_) = (a,b)
-
-    parent = Cabal.showBuildInfoCommand defaultProgramDb
-
 -- ------------------------------------------------------------
 -- * Repl command
 -- ------------------------------------------------------------
@@ -3012,10 +2987,10 @@ relevantConfigValuesText vs =
 
 
 -- ------------------------------------------------------------
--- * Commands to support ghc-mod
+-- * Commands to support show-build-info
 -- ------------------------------------------------------------
 
-showBuildInfoCommand :: CommandUI (BuildFlags, BuildExFlags)
+showBuildInfoCommand :: CommandUI (Cabal.ShowBuildInfoFlags, BuildExFlags)
 showBuildInfoCommand = parent {
     commandDefaultFlags = (commandDefaultFlags parent, mempty),
     commandOptions      =
@@ -3029,6 +3004,3 @@ showBuildInfoCommand = parent {
     setSnd b (a,_) = (a,b)
 
     parent = Cabal.showBuildInfoCommand defaultProgramDb
-
-writeAutogenFilesCommand :: CommandUI WriteAutogenFilesFlags
-writeAutogenFilesCommand = Cabal.writeAutogenFilesCommand defaultProgramDb
diff --git a/cabal-install/Distribution/Client/SetupWrapper.hs b/cabal-install/Distribution/Client/SetupWrapper.hs
@@ -17,7 +17,7 @@
 -- runs it with the given arguments.
 
 module Distribution.Client.SetupWrapper (
-    getSetup, runSetup, runSetupCommand, setupWrapper,
+    getSetup, runSetup, runSetupCommand, setupWrapper, getSetupMethod,
     SetupScriptOptions(..),
     defaultSetupScriptOptions,
   ) where

diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
@@ -161,8 +161,6 @@ executable cabal
         Distribution.Client.CmdBench
         Distribution.Client.CmdBuild
         Distribution.Client.CmdClean
-        Distribution.Client.CmdShowBuildInfo
-        Distribution.Client.CmdWriteAutogenFiles
         Distribution.Client.CmdConfigure
         Distribution.Client.CmdUpdate
         Distribution.Client.CmdErrorMessages
@@ -173,6 +171,7 @@ executable cabal
         Distribution.Client.CmdInstall.ClientInstallFlags
         Distribution.Client.CmdRepl
         Distribution.Client.CmdRun
+        Distribution.Client.CmdShowBuildInfo
         Distribution.Client.CmdTest
         Distribution.Client.CmdLegacy
         Distribution.Client.CmdSdist

diff --git a/cabal-install/cabal-install.cabal.pp b/cabal-install/cabal-install.cabal.pp
@@ -100,6 +100,7 @@
         Distribution.Client.CmdInstall.ClientInstallFlags
         Distribution.Client.CmdRepl
         Distribution.Client.CmdRun
+        Distribution.Client.CmdShowBuildInfo
         Distribution.Client.CmdTest
         Distribution.Client.CmdLegacy
         Distribution.Client.CmdSdist