Skip to content

Commit

Permalink
Remove crucible-server and crucible-saw from the cabal.project
Browse files Browse the repository at this point in the history
…file.

This prevents them from being built as part of `cabal build all`.
Those packages are in the process of being phased out, but we'll leave
the code in place for now.  The submodules necessary to build those
packages are also removed.
  • Loading branch information
robdockins committed Jan 29, 2021
1 parent c5a39e5 commit b6e6ccd
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 36 deletions.
1 change: 0 additions & 1 deletion .github/Dockerfile-crux-llvm
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ ARG DIR=/crux-llvm
RUN mkdir -p ${DIR}/build
ADD crucible ${DIR}/build/crucible
ADD crucible-llvm ${DIR}/build/crucible-llvm
ADD crucible-saw ${DIR}/build/crucible-saw
ADD crux ${DIR}/build/crux
ADD crux-llvm ${DIR}/build/crux-llvm
ADD dependencies ${DIR}/build/dependencies
Expand Down
1 change: 0 additions & 1 deletion .github/Dockerfile-crux-mir
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ ENV LANG=C.UTF-8 \
ARG DIR=/crux-mir
RUN mkdir -p ${DIR}/build
ADD crucible ${DIR}/build/crucible
ADD crucible-saw ${DIR}/build/crucible-saw
ADD crux ${DIR}/build/crux
ADD crux-mir ${DIR}/build/crux-mir
ADD dependencies ${DIR}/build/dependencies
Expand Down
6 changes: 0 additions & 6 deletions .github/cabal.project.crux-llvm
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
packages:
crucible/
crucible-llvm/
crucible-saw/
crux/
crux-llvm/

Expand All @@ -10,9 +9,4 @@ optional-packages:
dependencies/abcBridge/
dependencies/llvm-pretty/
dependencies/llvm-pretty-bc-parser/
dependencies/saw-core/saw-core/
dependencies/saw-core/saw-core-aig/
dependencies/saw-core/saw-core-sbv/
dependencies/saw-core/saw-core-what4/
dependencies/saw-core/cryptol-saw-core/
dependencies/what4/what4/
6 changes: 0 additions & 6 deletions .github/cabal.project.crux-mir
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
packages:
crucible/
crucible-saw/
crux/
crux-mir/

optional-packages:
dependencies/aig/
dependencies/abcBridge/
dependencies/saw-core/saw-core/
dependencies/saw-core/saw-core-aig/
dependencies/saw-core/saw-core-sbv/
dependencies/saw-core/saw-core-what4/
dependencies/saw-core/cryptol-saw-core/
dependencies/what4/what4/
9 changes: 0 additions & 9 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
[submodule "dependencies/blt"]
path = dependencies/blt
url =https://github.com/GaloisInc/blt.git
[submodule "dependencies/cryptol"]
path = dependencies/cryptol
url = https://github.com/GaloisInc/cryptol.git
[submodule "dependencies/golang"]
path = dependencies/golang
url = https://github.com/GaloisInc/golang.git
Expand All @@ -22,12 +19,6 @@
[submodule "dependencies/llvm-pretty-bc-parser"]
path = dependencies/llvm-pretty-bc-parser
url = https://github.com/GaloisInc/llvm-pretty-bc-parser.git
[submodule "dependencies/hpb"]
path = dependencies/hpb
url = https://github.com/GaloisInc/hpb.git
[submodule "dependencies/saw-core"]
path = dependencies/saw-core
url = https://github.com/GaloisInc/saw-core.git
[submodule "dependencies/what4"]
path = dependencies/what4
url = https://github.com/GaloisInc/what4.git
Expand Down
9 changes: 0 additions & 9 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ packages:
crucible-jvm/
crucible-llvm/
crucible-wasm/
crucible-saw/
crucible-server/
crucible-syntax/
crux/
crux-llvm/
Expand All @@ -28,13 +26,6 @@ optional-packages:
dependencies/hpb/
dependencies/llvm-pretty/
dependencies/llvm-pretty-bc-parser/
dependencies/saw-core/rme/
dependencies/saw-core/saw-core/
dependencies/saw-core/saw-core-aig/
dependencies/saw-core/saw-core-sbv/
dependencies/saw-core/saw-core-what4/
dependencies/saw-core/cryptol-saw-core/
dependencies/cryptol/
dependencies/what4/what4/
dependencies/what4/what4-abc/
dependencies/what4/what4-blt/
1 change: 0 additions & 1 deletion crux-llvm/crux-llvm.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ test-suite crux-llvm-test
filepath,
parsec,
process,
saw-core,
QuickCheck,
tasty >= 0.10,
tasty-hunit >= 0.10,
Expand Down
1 change: 0 additions & 1 deletion dependencies/cryptol
Submodule cryptol deleted from 608ae9
1 change: 0 additions & 1 deletion dependencies/hpb
Submodule hpb deleted from 60485a
1 change: 0 additions & 1 deletion dependencies/saw-core
Submodule saw-core deleted from 13995d

0 comments on commit b6e6ccd

Please sign in to comment.