Skip to content

Commit a7b009f

Browse files
No need for CVC in Dockerfile anymore
1 parent 918670e commit a7b009f

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ for hosting the ECE 270 simulator developed for Purdue University"
66
# Update container
77
ARG DEBIAN_FRONTEND=noninteractive
88
ARG INSIDE_DOCKER=YES
9-
RUN apt-get update
10-
RUN apt-get upgrade
9+
RUN apt-get update -y
10+
RUN apt-get upgrade -y
1111
# Install git
1212
RUN apt-get install -y git wget
1313
# Download simulator codebase

setup/setup.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ then
55
fi
66
printf "ECE 270 simulator setup\n\n"
77

8-
declare -A gitlinks=( ["verilator"]="https://github.com/verilator/verilator" ["yosys"]="https://github.com/YosysHQ/yosys" ["cvc64"]="https://github.com/CambridgeHackers/open-src-cvc" ["iverilog"]="https://github.com/steveicarus/iverilog" )
8+
declare -A gitlinks=( ["verilator"]="https://github.com/verilator/verilator" ["yosys"]="https://github.com/YosysHQ/yosys" ["iverilog"]="https://github.com/steveicarus/iverilog" )
99

10-
declare -A foldernames=( ["verilator"]="verilator" ["yosys"]="yosys" ["cvc64"]="open-src-cvc" ["iverilog"]="iverilog" )
10+
declare -A foldernames=( ["verilator"]="verilator" ["yosys"]="yosys" ["iverilog"]="iverilog" )
1111

1212
echo "Setting up folders..."
1313
for folder in ../error_log /tmp/tmpcode
@@ -61,12 +61,6 @@ do
6161
make install
6262
cd -
6363
;;
64-
"cvc64")
65-
cd open-src-cvc/src
66-
make -f makefile.cvc64 || (echo "Compiling cvc failed. Please post an issue with the output of the command 'uname -a' on the simulator's GitHub page as well as the output produced above." && exit 1)
67-
cp cvc64 /usr/bin/cvc64
68-
cd -
69-
;;
7064
"iverilog")
7165
cd iverilog
7266
apt-get install -y gperf

0 commit comments

Comments
 (0)