Fix up build

IntersectMBO · Jul 21, 2021 · 1b3ab31 · 1b3ab31
1 parent e8555c5
commit 1b3ab31
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 77 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "optparse-applicative"]
-	path = optparse-applicative
-	url = git@github.com:input-output-hk/optparse-applicative.git
-[submodule "criterion"]
-	path = criterion
-	url = git@github.com:input-output-hk/criterion.git

diff --git a/cabal.project b/cabal.project
@@ -12,8 +12,6 @@ packages:
     nix/workbench/cardano-topology
     bench/tx-generator
     nix/workbench/locli
-    optparse-applicative
-    criterion
 
 package cardano-api
   ghc-options: -Werror
@@ -109,6 +107,18 @@ package cardano-ledger-alonzo-test
 -- --------------------------- 8< --------------------------
 -- Please do not put any `source-repository-package` clause above this line.
 
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/optparse-applicative
+  tag: ca02c8e0f54a8f1853e7a1c1f770153833cae988
+  --sha256: 0l0b1g2y73z18azqck53y0k3269sb1ga591v7yv9w356xx0n6hi9
+
+source-repository-package
+  type: git
+  location: https://github.com/input-output-hk/criterion
+  tag: fb2e7be532db96255d203f86360230cae37130f3
+  --sha256: 14r9zkfa8zslky3969gaq27gi7yi9rlqv0h1iq7zam9l15z53vhr
+
 source-repository-package
   type: git
   location: https://github.com/input-output-hk/hedgehog-extras

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -92,8 +92,6 @@ library
                         Cardano.CLI.Mary.RenderValue
                         Cardano.CLI.Mary.ValueParser
 
-                        Cardano.CLI.Render
-
                         Cardano.CLI.TopHandler
 
   other-modules:        Paths_cardano_cli

diff --git a/cardano-cli/src/Cardano/CLI/Parsers.hs b/cardano-cli/src/Cardano/CLI/Parsers.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE OverloadedStrings #-}
 
 module Cardano.CLI.Parsers
@@ -19,6 +20,8 @@ import           Prettyprinter.Render.Util.SimpleDocTree
 
 import qualified Data.Text as T
 import qualified Options.Applicative as Opt
+import qualified System.Environment as IO
+import qualified System.IO.Unsafe as IO
 
 command' :: String -> String -> Parser a -> Mod CommandFields a
 command' c descr p =
@@ -41,20 +44,35 @@ pref = Opt.prefs $ mempty
   <> helpHangUsageOverflow 10
   <> helpRenderHelp customRenderHelp
 
+cliHelpTraceEnabled :: Bool
+cliHelpTraceEnabled = IO.unsafePerformIO $ do
+  mValue <- IO.lookupEnv "CLI_HELP_TRACE"
+  return $ mValue == Just "1"
+{-# NOINLINE cliHelpTraceEnabled #-}
+
 -- | Convert a help text to 'String'.
 customRenderHelp :: Int -> ParserHelp -> String
 customRenderHelp cols
   = T.unpack
-  . ("<html>\n" <>)
-  . ("<body>\n" <>)
-  . ("<pre>\n" <>)
-  . (<> "\n</html>")
-  . (<> "\n</body>")
-  . (<> "\n</pre>")
-  . renderSimplyDecorated id (\(AnnTrace _ name) x -> "<span name=" <> show name <> ">" <> x <> "</span>")
+  . wrapper
+  . renderSimplyDecorated id renderElement
   . treeForm
   . layoutSmart (LayoutOptions (AvailablePerLine cols 1.0))
   . helpText
+  where
+    renderElement = if cliHelpTraceEnabled
+      then \(AnnTrace _ name) x -> "<span name=" <> show name <> ">" <> x <> "</span>"
+      else flip const
+    wrapper = if cliHelpTraceEnabled
+      then id
+        . ("<html>\n" <>)
+        . ("<body>\n" <>)
+        . ("<pre>\n" <>)
+        . (<> "\n</html>")
+        . (<> "\n</body>")
+        . (<> "\n</pre>")
+      else id
+
 
 parseClientCommand :: Parser ClientCommand
 parseClientCommand =

diff --git a/cardano-cli/src/Cardano/CLI/Render.hs b/cardano-cli/src/Cardano/CLI/Render.hs
diff --git a/criterion b/criterion
diff --git a/optparse-applicative b/optparse-applicative