add v1-clean

Author: typedrat

cabal-install/Distribution/Client/CmdLegacy.hs

@@ -69,6 +69,9 @@ instance HasVerbosity Client.ExecFlags where
 instance HasVerbosity Client.UpdateFlags where
     verbosity = verbosity . Client.updateVerbosity
 
+instance HasVerbosity Setup.CleanFlags where
+    verbosity = verbosity . Setup.cleanVerbosity
+
 --
 
 legacyCmd :: (HasVerbosity flags) => CommandUI flags -> (flags -> [String] -> globals -> IO action) -> [CommandSpec (globals -> IO action)]

cabal-install/Distribution/Client/Setup.hs

@@ -50,6 +50,7 @@ module Distribution.Client.Setup
     , userConfigCommand, UserConfigFlags(..)
     , manpageCommand
     , haddockCommand
+    , cleanCommand
 
     , parsePackageArgs
     --TODO: stop exporting these:
@@ -92,6 +93,7 @@ import Distribution.Simple.Setup
          ( ConfigFlags(..), BuildFlags(..), ReplFlags
          , TestFlags(..), BenchmarkFlags(..)
          , SDistFlags(..), HaddockFlags(..)
+         , CleanFlags(..)
          , readPackageDbList, showPackageDbList
          , Flag(..), toFlag, flagToMaybe, flagToList, maybeToFlag
          , BooleanFlag(..), optionVerbosity
@@ -194,6 +196,7 @@ globalCommand commands = CommandUI {
           , "new-exec"
           , "new-update"
           , "new-install"
+          , "new-clean"
           , "v1-build"
           , "v1-configure"
           , "v1-repl"
@@ -205,6 +208,7 @@ globalCommand commands = CommandUI {
           , "v1-exec"
           , "v1-update"
           , "v1-install"
+          , "v1-clean"
           ]
         maxlen    = maximum $ [length name | (name, _) <- cmdDescs]
         align str = str ++ replicate (maxlen - length str) ' '
@@ -275,6 +279,7 @@ globalCommand commands = CommandUI {
         , addCmd "new-exec"
         , addCmd "new-update"
         , addCmd "new-install"
+        , addCmd "new-clean"
         , par
         , startGroup "legacy command aliases"
         , addCmd "v1-build"
@@ -288,6 +293,7 @@ globalCommand commands = CommandUI {
         , addCmd "v1-exec"
         , addCmd "v1-update"
         , addCmd "v1-install"
+        , addCmd "v1-clean"
         ] ++ if null otherCmds then [] else par
                                            :startGroup "other"
                                            :[addCmd n | n <- otherCmds])
@@ -403,7 +409,7 @@ globalCommand commands = CommandUI {
 
 configureCommand :: CommandUI ConfigFlags
 configureCommand = c
-  { commandName         = "v1-configure"
+  { commandName         = "configure"
   , commandDefaultFlags = mempty
   , commandDescription  = Just $ \_ -> wrapText $
          "Configure how the package is built by setting "
@@ -1221,16 +1227,11 @@ upgradeCommand = configureCommand {
     commandOptions      = commandOptions installCommand
   }
 
-{-
-cleanCommand  :: CommandUI ()
-cleanCommand = makeCommand name shortDesc longDesc emptyFlags options
-  where
-    name       = "clean"
-    shortDesc  = "Removes downloaded files"
-    longDesc   = Nothing
-    emptyFlags = ()
-    options _  = []
--}
+cleanCommand :: CommandUI CleanFlags
+cleanCommand = Cabal.cleanCommand 
+  { commandUsage = \pname ->
+    "Usage: " ++ pname ++ " v1-clean [FLAGS]\n" 
+  }
 
 checkCommand  :: CommandUI (Flag Verbosity)
 checkCommand = CommandUI {
@@ -1753,8 +1754,7 @@ installCommand = CommandUI {
 
 haddockCommand :: CommandUI HaddockFlags
 haddockCommand = Cabal.haddockCommand
-  { commandName  = "v1-haddock"
-  , commandUsage = usageAlternatives "v1-haddock" $
+  { commandUsage = usageAlternatives "v1-haddock" $
       [ "[FLAGS]", "COMPONENTS [FLAGS]" ]
   }
 

cabal-install/main/Main.hs

@@ -48,6 +48,7 @@ import Distribution.Client.Setup
          , reportCommand
          , manpageCommand
          , haddockCommand
+         , cleanCommand
          )
 import Distribution.Simple.Setup
          ( HaddockTarget(..)
@@ -57,7 +58,7 @@ import Distribution.Simple.Setup
          , ReplFlags(..)
          , CopyFlags(..), copyCommand
          , RegisterFlags(..), registerCommand
-         , CleanFlags(..), cleanCommand
+         , CleanFlags(..)
          , TestFlags(..), BenchmarkFlags(..)
          , Flag(..), fromFlag, fromFlagOrDefault, flagToMaybe, toFlag
          , configAbsolutePaths
@@ -292,7 +293,6 @@ mainWorker args = topHandler $
       , regularCmd sandboxCommand sandboxAction
       , regularCmd doctestCommand doctestAction
       , regularCmd userConfigCommand userConfigAction
-      , regularCmd cleanCommand cleanAction
       , regularCmd genBoundsCommand genBoundsAction
       , regularCmd outdatedCommand outdatedAction
       , wrapperCmd copyCommand copyVerbosity copyDistPref
@@ -316,6 +316,20 @@ mainWorker args = topHandler $
       , regularCmd  CmdTest.testCommand           CmdTest.testAction
       , regularCmd  CmdBench.benchCommand         CmdBench.benchAction
       , regularCmd  CmdExec.execCommand           CmdExec.execAction
+      , regularCmd  CmdClean.cleanCommand         CmdClean.cleanAction 
+      ] ++ concat
+      [ legacyCmd configureExCommand configureAction
+      , legacyCmd updateCommand updateAction
+      , legacyCmd buildCommand buildAction
+      , legacyCmd replCommand replAction
+      , legacyCmd freezeCommand freezeAction
+      , legacyCmd haddockCommand haddockAction
+      , legacyCmd installCommand installAction
+      , legacyCmd runCommand runAction
+      , legacyCmd testCommand testAction
+      , legacyCmd benchmarkCommand benchmarkAction
+      , legacyCmd execCommand execAction
+      , legacyCmd cleanCommand cleanAction
       ]
 
 type Action = GlobalFlags -> IO ()