From d0a1a156d4eb8c2a732dbe963aba0ac4613698e0 Mon Sep 17 00:00:00 2001
From: Joe Hendrix <jhendrix@galois.com>
Date: Tue, 14 May 2019 18:59:09 -0700
Subject: [PATCH] Change stack files and travis to stop failing on Crucible
 warnings.

---
 .travis.yml    |  2 --
 stack-8.4.yaml | 34 ++++++++++++----------------------
 stack-8.6.yaml | 36 +++++++++++++-----------------------
 3 files changed, 25 insertions(+), 47 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 35131769..bd72603c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,6 @@ install:
 
 # Here starts the actual work to be performed for the package under test;
 # any command which exits with a non-zero exit code causes the build to fail.
- # Build packages that we do not want to check warnings on.
- - stack build crucible
  # Build packages
  - stack build --ghc-options="-Wall -Werror"
  # Run tests
diff --git a/stack-8.4.yaml b/stack-8.4.yaml
index b147ace8..e9fe20c5 100644
--- a/stack-8.4.yaml
+++ b/stack-8.4.yaml
@@ -7,32 +7,10 @@ resolver: lts-12.26
 packages:
 - base
 - symbolic
-- deps/crucible/what4
-- deps/crucible/crucible
-- deps/crucible/crucible-llvm
-- deps/dwarf
-- deps/elf-edit
-- deps/flexdis86
-- deps/flexdis86/binary-symbols
-- deps/llvm-pretty
-- deps/llvm-pretty-bc-parser
-- deps/parameterized-utils
-- submodules/macaw-loader/macaw-loader
 # X86 specific repos
 - x86
 - x86/support
 - x86_symbolic
-# - submodules/dismantle/dismantle-tablegen
-# - macaw-semmc
-# - submodules/semmc/semmc
-# - macaw-ppc
-# - submodules/macaw-loader/macaw-loader-ppc
-# - submodules/semmc/semmc-ppc
-# - submodules/dismantle/dismantle-ppc
-# - macaw-arm
-# - submodules/semmc/semmc-arm
-# - submodules/dismantle/dismantle-arm
-# - submodules/dismantle/dismantle-thumb
 extra-deps:
 - boomerang-1.4.5.6@sha256:4f8407b9482a500ef9f8dc3fa13f9615d4d33a7c530b67c1ca27535e136a152d
 - dotgen-0.4.2@sha256:309b7cc8a3593a8e48bee7b53020d5f72db156d58edf78a0214f58fbb84b292b
@@ -44,3 +22,15 @@ extra-deps:
 - panic-0.4.0.1@sha256:fb46577c9e0ca38c37960572f958a8469f2b577e963ed4f3ea1904d8400d828b
 - s-cargot-0.1.4.0@sha256:61ea1833fbb4c80d93577144870e449d2007d311c34d74252850bb48aa8c31fb
 - s-cargot-letbind-0.2.3.0@sha256:238100aa0badc2f285fb7e5bf423b2f3465562061dcce0f8ecca45aa6f279ef6
+
+# Submodules added to extra-deps so that we do not fail on warnings.
+- ./deps/crucible/what4
+- ./deps/crucible/crucible
+- ./deps/crucible/crucible-llvm
+- ./deps/dwarf
+- ./deps/elf-edit
+- ./deps/flexdis86
+- ./deps/flexdis86/binary-symbols
+- ./deps/llvm-pretty
+- ./deps/llvm-pretty-bc-parser
+- ./deps/parameterized-utils
diff --git a/stack-8.6.yaml b/stack-8.6.yaml
index 6ad5cd4b..8aa276a4 100644
--- a/stack-8.6.yaml
+++ b/stack-8.6.yaml
@@ -3,32 +3,10 @@ resolver: lts-13.21
 packages:
 - base
 - symbolic
-- deps/crucible/what4
-- deps/crucible/crucible
-- deps/crucible/crucible-llvm
-- deps/dwarf
-- deps/elf-edit
-- deps/flexdis86
-- deps/flexdis86/binary-symbols
-- deps/llvm-pretty
-- deps/llvm-pretty-bc-parser
-- deps/parameterized-utils
-- submodules/macaw-loader/macaw-loader
 # X86 specific repos
 - x86
 - x86/support
 - x86_symbolic
-# - submodules/dismantle/dismantle-tablegen
-# - macaw-semmc
-# - submodules/semmc/semmc
-# - macaw-ppc
-# - submodules/macaw-loader/macaw-loader-ppc
-# - submodules/semmc/semmc-ppc
-# - submodules/dismantle/dismantle-ppc
-# - macaw-arm
-# - submodules/semmc/semmc-arm
-# - submodules/dismantle/dismantle-arm
-# - submodules/dismantle/dismantle-thumb
 extra-deps:
 - boomerang-1.4.5.6@sha256:4f8407b9482a500ef9f8dc3fa13f9615d4d33a7c530b67c1ca27535e136a152d
 - fgl-visualize-0.1.0.1@sha256:e682066053a6e75478a08fd6822dd0143a3b8ea23244bdb01dd389a266447c5e
@@ -37,4 +15,16 @@ extra-deps:
 - monadLib-3.9@sha256:dc0d8579840968be03fc2ce1c21d5af055fe5a38b65b99793dd720f5e07aaa34
 - panic-0.4.0.1@sha256:fb46577c9e0ca38c37960572f958a8469f2b577e963ed4f3ea1904d8400d828b
 - s-cargot-0.1.4.0@sha256:61ea1833fbb4c80d93577144870e449d2007d311c34d74252850bb48aa8c31fb
-- s-cargot-letbind-0.2.3.0@sha256:238100aa0badc2f285fb7e5bf423b2f3465562061dcce0f8ecca45aa6f279ef6
\ No newline at end of file
+- s-cargot-letbind-0.2.3.0@sha256:238100aa0badc2f285fb7e5bf423b2f3465562061dcce0f8ecca45aa6f279ef6
+
+# Submodules added to extra-deps so that we do not fail on warnings.
+- ./deps/crucible/what4
+- ./deps/crucible/crucible
+- ./deps/crucible/crucible-llvm
+- ./deps/llvm-pretty
+- ./deps/llvm-pretty-bc-parser
+- ./deps/parameterized-utils
+- ./deps/dwarf
+- ./deps/elf-edit
+- ./deps/flexdis86
+- ./deps/flexdis86/binary-symbols