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

.github/workflows/applications.yml

@@ -14,6 +14,7 @@ jobs:
         cabal: ['3.4']
         os: ['ubuntu-18.04', 'ubuntu-20.04', 'macOS-latest' ] # windows-latest is temporarily disabled
         cabalcache: ['true']
+        flags: ['+build-tool']
         exclude:
         - os: 'windows-latest'
           ghc: '8.6.5'
@@ -24,6 +25,12 @@ jobs:
           ghc: '8.10.4'
           cabal: '3.4'
           cabalcache: 'true'
+          flags: '+build-tool'
+        - os: 'ubuntu-20.04'
+          ghc: '8.10.5'
+          cabal: '3.4'
+          cabalcache: 'true'
+          flags: '-build-tool'
         # include:
         # - os: 'windows-latest'
         #   storepath: '--store-path=${HOME}/AppData/Roaming/cabal/store'
@@ -99,14 +106,19 @@ jobs:
           benchmarks: True
           documentation: False
           optimization: 1
+          flags: ${{ matrix.flags }}
         EOF
     - name: Add check for unused packages
+      shell: bash
       if: "! startsWith(matrix.ghc, '8.6') && ! startsWith(matrix.ghc, 8.8)"
       run: |
-        cat > cabal.project.local <<EOF
+        cat >> cabal.project.local <<EOF
         package pact
           ghc-options: -Wunused-packages
         EOF
+    - name: Print cabal.project.local
+      shell: bash
+      run: cat cabal.project.local
     - uses: actions/cache@v2
       name: Cache dist-newstyle
       with:
@@ -143,9 +155,11 @@ jobs:
       run: cabal build
     - name: Test
       shell: bash
+      if: "! contains(matrix.flags, '-build-tool')"
       run: cabal test
     - name: Benchmark
       shell: bash
+      if: "! contains(matrix.flags, '-build-tool')"
       run: cabal bench
 
     # Publish Artifacts

executables/Bench.hs

@@ -1,16 +1,6 @@
-{-# LANGUAGE CPP #-}
-
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
 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
-    Bench.main
-#endif
+main = Bench.main

executables/GasModel.hs

@@ -1,16 +1,6 @@
-{-# LANGUAGE CPP #-}
-
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
 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
-    GasModel.main
-#endif
+main = GasModel.main

executables/Repl.hs

@@ -1,20 +1,11 @@
-{-# LANGUAGE CPP #-}
-
 -- |
 -- Copyright   :  (C) 2016 Stuart Popejoy
 -- License     :  BSD-style (see the file LICENSE)
 --
 
 module Main where
 
-#if !defined(ghcjs_HOST_OS)
 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
-    Repl.main
-#endif
+main = Repl.main