Add build-tool flag to omit tool and FV deps+modules from build

executables/Bench.hs

@@ -2,15 +2,15 @@
 
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
 import qualified Pact.Bench as Bench
 #endif
 
 
 main :: IO ()
 main =
-#if defined(ghcjs_HOST_OS)
-    error "Error: command line REPL does not exist in GHCJS mode"
-#else
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
     Bench.main
+#else
+    error "Error: command line REPL does not exist in GHCJS mode"
 #endif

executables/GasModel.hs

@@ -2,15 +2,15 @@
 
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
 import qualified Pact.GasModel.GasModel as GasModel
 #endif
 
 
 main :: IO ()
 main =
-#if defined(ghcjs_HOST_OS)
-    error "Error: gas model benchmarking does not exist in GHCJS mode"
-#else
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
     GasModel.main
+#else
+    error "Error: gas model benchmarking does not exist in GHCJS mode"
 #endif

executables/Repl.hs

@@ -7,14 +7,14 @@
 
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
 import qualified Pact.Main as Repl
 #endif
 
 main :: IO ()
 main =
-#if defined(ghcjs_HOST_OS)
-    error "Error: command line REPL does not exist in GHCJS mode"
-#else
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
     Repl.main
+#else
+    error "Error: command line REPL does not exist in GHCJS mode"
 #endif

pact.cabal

@@ -27,6 +27,11 @@ flag ghc-flags
   default:     False
   manual:      True
 
+flag build-tool
+  description: Include modules and deps for tests + executable
+  default:     True
+  manual:      False
+
 library
   exposed-modules:     Crypto.Hash.Blake2Native
                      , Pact.Analyze.Remote.Types
@@ -101,9 +106,10 @@ library
     exposed-modules:
       Pact.Analyze.Remote.Client
 
-  if !impl(ghcjs)
-    hs-source-dirs: src-ghc
+  if !impl(ghcjs) && flag(build-tool)
+    hs-source-dirs: src-tool
     exposed-modules:
+                    Pact.Docgen
                     Pact.Analyze
                     Pact.Analyze.Alloc
                     Pact.Analyze.Eval
@@ -139,37 +145,56 @@ library
                     Pact.Analyze.Types.Types
                     Pact.Analyze.Util
                     Pact.Analyze.Remote.Server
-                    Pact.ApiReq
                     Pact.Bench
-                    Pact.Coverage
-                    Pact.Coverage.Report
-                    Pact.Docgen
-                    Pact.Interpreter
                     Pact.Main
-                    Pact.MockDb
-                    Pact.Persist.MockPersist
-                    Pact.Persist.SQLite
-                    Pact.PersistPactDb.Regression
                     Pact.ReplTools
                     Pact.Server.ApiServer
                     Pact.Server.History.Persistence
                     Pact.Server.History.Service
                     Pact.Server.History.Types
-                    Pact.Server.PactService
                     Pact.Server.Server
                     Pact.Server.Test
-                    Pact.Types.Crypto
-                    Pact.Types.ECDSA
-                    Pact.Types.Server
-                    Pact.Types.SQLite
                     Pact.GasModel.GasModel
                     Pact.GasModel.Types
                     Pact.GasModel.Utils
                     Pact.GasModel.GasTests
 
+    build-depends:
+                  algebraic-graphs >= 0.2 && < 0.6
+                , cassava >= 0.5
+                , constraints
+                , fast-logger
+                , haskeline >= 0.7.3 && < 0.8
+                , mmorph >= 1.1 && < 1.2
+                , neat-interpolation >= 0.4
+                , optparse-applicative >= 0.12.1.0 && < 0.16
+                , sbv >= 8.8
+                , wai-cors
+                , warp
+
+
+    cpp-options: -DBUILD_TOOL
+
+
+  if !impl(ghcjs)
+    hs-source-dirs: src-ghc
+    exposed-modules:
+                    Pact.ApiReq
+                    Pact.Coverage
+                    Pact.Coverage.Report
+                    Pact.Interpreter
+                    Pact.MockDb
+                    Pact.Persist.MockPersist
+                    Pact.Persist.SQLite
+                    Pact.PersistPactDb.Regression
+                    Pact.Server.PactService
+                    Pact.Types.Crypto
+                    Pact.Types.ECDSA
+                    Pact.Types.Server
+                    Pact.Types.SQLite
+
   build-depends:       Decimal >= 0.4.2 && < 0.6
                      , aeson >= 0.11.3.0 && < 1.5
-                     , algebraic-graphs >= 0.2 && < 0.6
                      , prettyprinter >= 1.2 && < 1.6.1
                      , prettyprinter-ansi-terminal >= 1.1 && < 1.2
                      , attoparsec >= 0.13.0.2 && < 0.14
@@ -180,7 +205,6 @@ library
                      , base64-bytestring >= 1.0.0.1 && < 1.2.0.0
                      , bound >= 2 && < 2.1
                      , bytestring >=0.10.8.1 && < 0.11
-                     , cassava >= 0.5
                      , cereal >=0.5.4.0 && < 0.6
                      , containers >= 0.5.7 && < 0.7
                      , data-default >= 0.7.1.1 && < 0.8
@@ -196,6 +220,7 @@ library
                      , megaparsec >= 9
                      , mtl >= 2.2.1 && < 2.3
                      , optparse-applicative >= 0.12.1.0 && < 0.16
+                     , pact-time >= 0.2
                      , parsers >= 0.12.4 && < 0.13
                      , QuickCheck >= 2.12.6.1
                      , quickcheck-instances >= 0.3
@@ -211,10 +236,7 @@ library
                      , vector >= 0.11.0.0 && < 0.13
                      , vector-algorithms >= 0.7
                      , vector-space >= 0.10.4 && < 0.17
-                     , mmorph >= 1.1 && < 1.2
-                     , constraints
                      , servant
-                     , pact-time >= 0.2
 
   if impl(ghcjs)
     build-depends:
@@ -227,21 +249,23 @@ library
                 , criterion >= 1.1.4 && < 1.6
                 , cryptonite
                 , direct-sqlite
-                , fast-logger
-                , haskeline >= 0.7.3 && < 0.8
                 , http-client
                 , memory
-                , neat-interpolation >= 0.4
                 , safe-exceptions >= 0.1.5.0 && < 0.2
                 , sbv >= 8.8
                 , servant-client
                 , servant-client-core
                 , servant-server
                 , statistics >= 0.13.3 && < 0.16
-                , wai-cors
-                , warp
                 , yaml
 
+
+  if impl(ghcjs)
+    build-depends:
+                  ghcjs-base,
+                  ghcjs-prim
+
+
   if !impl(ghcjs) && !os(windows)
     build-depends: unix
 
@@ -292,7 +316,7 @@ executable gasmodel
   default-language:    Haskell2010
 
 test-suite hspec
-  if !impl(ghcjs)
+  if !impl(ghcjs) && flag(build-tool)
     main-is:          hspec.hs
     type:             exitcode-stdio-1.0
   else
@@ -334,7 +358,7 @@ test-suite hspec
                 Blake2Spec
                 KeysetSpec
                 TypesSpec
-  if !impl(ghcjs)
+  if !impl(ghcjs) && flag(build-tool)
     build-depends:
                   neat-interpolation
                 , sbv

src/Pact/Repl/Lib.hs

@@ -35,7 +35,6 @@ import qualified Data.Map.Strict as M
 import Data.Semigroup (Endo(..))
 import qualified Data.Set as S
 import Data.Text (Text, unpack)
-import qualified Data.Text as Text
 import Data.Text.Encoding
 import Pact.Time
 import qualified Data.Vector as V
@@ -52,7 +51,9 @@ import Criterion.Types
 
 import Statistics.Types (Estimate(..))
 
+# ifdef BUILD_TOOL
 import qualified Pact.Analyze.Check as Check
+# endif
 import qualified Pact.Types.Crypto as Crypto
 #endif
 
@@ -209,9 +210,11 @@ replDefs = ("Repl",
       ["(env-exec-config ['DisableHistoryInTransactionalMode]) (env-exec-config)"]
       ("Queries, or with arguments, sets execution config flags. Valid flags: " <>
        tShow (M.keys flagReps))
+#ifdef BUILD_TOOL
      ,defZRNative "verify" verify (funType tTyString [("module",tTyString)])
        []
        "Verify MODULE, checking that all properties hold."
+#endif
 
      ,defZRNative "sig-keyset" sigKeyset (funType tTyKeySet [])
        []
@@ -608,32 +611,33 @@ tc i as = case as of
             setop $ TcErrors $ map (\(TC.Failure ti s) -> renderInfo (TC._tiInfo ti) ++ ":Warning: " ++ s) fails
             return $ tStr $ "Typecheck " <> modname <> ": Unable to resolve all types"
 
+#ifdef BUILD_TOOL
 verify :: RNativeFun LibState
 verify i as = case as of
   [TLitString modName] -> do
     md <- getModule i (ModuleName modName Nothing)
     -- reading all modules from db here, but should be fine in repl
     modules <- getAllModules i
     let failureMessage = tStr $ "Verification of " <> modName <> " failed"
-#if defined(ghcjs_HOST_OS)
+# if defined(ghcjs_HOST_OS)
     uri <- fromMaybe "localhost" <$> viewLibState (view rlsVerifyUri)
     renderedLines <- liftIO $
                      RemoteClient.verifyModule modules md uri
-    setop $ TcErrors $ Text.unpack <$> renderedLines
+    setop $ TcErrors $ unpack <$> renderedLines
     return failureMessage
-#else
+# else
     modResult <- liftIO $ Check.verifyModule modules md
     let renderedLines = Check.renderVerifiedModule modResult
     case modResult of
       Right modResult'
         | not (Check.hasVerificationError modResult')
         -> return $ tStr $ mconcat renderedLines
       _ -> do
-        setop $ TcErrors $ Text.unpack <$> renderedLines
+        setop $ TcErrors $ unpack <$> renderedLines
         return failureMessage
-#endif
-
+# endif
   _ -> argsError i as
+#endif
 
 sigKeyset :: RNativeFun LibState
 sigKeyset _ _ = view eeMsgSigs >>= \ss ->

src/Pact/Server/API.hs

@@ -22,16 +22,20 @@ module Pact.Server.API
   , ApiPoll
   , ApiListen
   , ApiLocal
+#ifdef BUILD_TOOL
   , ApiVerify
+#endif
   , ApiVersion
 #if !defined(ghcjs_HOST_OS)
   -- | client
   , sendClient
   , pollClient
   , listenClient
   , localClient
-  , verifyClient
   , versionClient
+# ifdef BUILD_TOOL
+  , verifyClient
+# endif
 #endif
   ) where
 
@@ -43,7 +47,9 @@ import Servant.Client
 import Servant.Client.Core
 #endif
 
+#ifdef BUILD_TOOL
 import qualified Pact.Analyze.Remote.Types as Analyze
+#endif
 import Pact.Types.API
 import Pact.Types.Command
 import Pact.Types.Hash
@@ -70,15 +76,21 @@ type ApiLocal = "local"
   :> ReqBody '[JSON] (Command Text)
   :> Post '[JSON] (CommandResult Hash)
 
+#ifdef BUILD_TOOL
 type ApiVerify = "verify"
   :> ReqBody '[JSON] Analyze.Request
   :> Post '[JSON] Analyze.Response
+#endif
 
 type ApiVersion = "version"
   :> Get '[PlainText] Text
 
 -- | "pact -s" REST API.
+#ifdef BUILD_TOOL
 type PactServerAPI = ApiV1API :<|> ApiVerify :<|> ApiVersion
+#else
+type PactServerAPI = ApiV1API :<|> ApiVersion
+#endif
 
 pactServerAPI :: Proxy PactServerAPI
 pactServerAPI = Proxy
@@ -105,15 +117,21 @@ listenClient = v1Listen apiV1Client
 localClient :: Command Text -> ClientM (CommandResult Hash)
 localClient = v1Local apiV1Client
 
+# ifdef BUILD_TOOL
 verifyClient :: Analyze.Request -> ClientM Analyze.Response
 verifyClient = client (Proxy @ApiVerify)
+# endif
 
 versionClient :: ClientM Text
 versionClient = client (Proxy @ApiVersion)
 
 apiV1Client :: forall m. RunClient m => ApiV1Client m
 apiV1Client = ApiV1Client send poll listen local
   where
-    (send :<|> poll :<|> listen :<|> local) :<|> _verify :<|> _version =
-      clientIn pactServerAPI (Proxy :: Proxy m)
+    (send :<|> poll :<|> listen :<|> local)
+# ifdef BUILD_TOOL
+      :<|> _verify
+# endif
+      :<|> _version =
+        clientIn pactServerAPI (Proxy :: Proxy m)
 #endif

src/Pact/Types/Info.hs

@@ -40,7 +40,7 @@ import Data.String
 import Data.Default
 import GHC.Generics (Generic)
 import Control.DeepSeq
-#if !defined(ghcjs_HOST_OS)
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
 import Data.SBV (Mergeable (symbolicMerge))
 #endif
 import qualified Data.Vector as V
@@ -109,7 +109,7 @@ mkInfo t = Info $ Just (Code t,Parsed delt len)
   where len = T.length t
         delt = Directed (encodeUtf8 t) 0 0 (fromIntegral len) (fromIntegral len)
 
-#if !defined(ghcjs_HOST_OS)
+#if !defined(ghcjs_HOST_OS) && defined(BUILD_TOOL)
 instance Mergeable Info where
   -- Because Info values have no effect on execution we just take the max
   -- (which could possibly have more info)