Skip to content

Commit 6cf731f

Browse files
committed
Updated installation scripts and Dockerfiles to include necessary dependencies for Cap'n Proto and other tools
1 parent 4933b17 commit 6cf731f

File tree

6 files changed

+13
-10
lines changed

6 files changed

+13
-10
lines changed

.github/scripts/hostsetup.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ apt install -y \
7272
wget \
7373
libtbb-dev \
7474
ant \
75-
cmake \
75+
capnproto \
76+
libcapnp-dev \
7677
default-jre \
7778
google-perftools \
7879
libfl-dev \

.github/scripts/install_dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ sudo apt install -y \
5959
clang-format-14 \
6060
libtbb-dev \
6161
ant \
62+
capnproto \
63+
libcapnp-dev \
6264
default-jre \
6365
google-perftools \
6466
libfl-dev \
65-
cmake \
6667
libgoogle-perftools-dev \
6768
python3-orderedmultidict \
6869
swig \

.github/scripts/install_noble_dependencies.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ sudo apt install -y \
5858
clang-format-14 \
5959
libtbb-dev \
6060
ant \
61-
cmake \
61+
capnproto \
62+
libcapnp-dev \
6263
default-jre \
6364
google-perftools \
6465
libfl-dev \

.gitpod.Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,19 @@ RUN apt-get update \
3131
qt5-default \
3232
wget \
3333
ant \
34+
capnproto \
35+
libcapnp-dev \
3436
default-jre \
3537
google-perftools \
3638
libfl-dev \
37-
cmake \
3839
libgoogle-perftools-dev \
3940
python3-orderedmultidict \
4041
swig \
4142
tcl-dev \
4243
tclsh \
4344
uuid \
4445
&& apt-get clean \
45-
&& rm -rf /var/lib/apt/lists/* \
46-
&& apt-get install -y capnproto libcapnp-dev
47-
46+
&& rm -rf /var/lib/apt/lists/*
4847

4948
# set out workspace
5049
ENV VTR_ROOT=/workspace/vtr-verilog-to-routing

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,18 @@ RUN apt-get update -qq \
2121
git \
2222
time \
2323
ant \
24+
capnproto \
25+
libcapnp-dev \
2426
default-jre \
2527
google-perftools \
2628
libfl-dev \
27-
cmake \
2829
libgoogle-perftools-dev \
2930
python3-orderedmultidict \
3031
swig \
3132
tcl-dev \
3233
tclsh \
3334
uuid \
3435
# Install python packages
35-
&& apt-get install -y capnproto libcapnp-dev \
3636
&& pip install -r requirements.txt \
3737
# Cleanup
3838
&& apt-get autoclean && apt-get clean && apt-get -y autoremove \

install_apt_packages.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ sudo apt-get install -y \
3636
libboost-filesystem-dev \
3737
zlib1g-dev \
3838
ant \
39-
cmake \
39+
capnproto \
40+
libcapnp-dev \
4041
default-jre \
4142
google-perftools \
4243
libfl-dev \

0 commit comments

Comments
 (0)