Updated installation scripts and Dockerfiles to include necessary dep…

…endencies for Cap'n Proto and other tools
verilog-to-routing · Dec 9, 2024 · 6cf731f · 6cf731f
1 parent 4933b17
commit 6cf731f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.github/scripts/hostsetup.sh b/.github/scripts/hostsetup.sh
@@ -72,7 +72,8 @@ apt install -y \
   wget \
   libtbb-dev \
   ant \
-  cmake \
+  capnproto \
+  libcapnp-dev \
   default-jre \
   google-perftools \
   libfl-dev \

diff --git a/.github/scripts/install_dependencies.sh b/.github/scripts/install_dependencies.sh
@@ -59,10 +59,11 @@ sudo apt install -y \
   clang-format-14 \
   libtbb-dev \
   ant \
+  capnproto \
+  libcapnp-dev \
   default-jre \
   google-perftools \
   libfl-dev \
-  cmake \
   libgoogle-perftools-dev \
   python3-orderedmultidict \
   swig \

diff --git a/.github/scripts/install_noble_dependencies.sh b/.github/scripts/install_noble_dependencies.sh
@@ -58,7 +58,8 @@ sudo apt install -y \
   clang-format-14 \
   libtbb-dev \
   ant \
-  cmake \
+  capnproto \
+  libcapnp-dev \
   default-jre \
   google-perftools \
   libfl-dev \

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -31,20 +31,19 @@ RUN apt-get update \
   qt5-default \
   wget \
   ant \
+  capnproto \
+  libcapnp-dev \
   default-jre \
   google-perftools \
   libfl-dev \
-  cmake \
   libgoogle-perftools-dev \
   python3-orderedmultidict \
   swig \
   tcl-dev \
   tclsh \
   uuid \
   && apt-get clean \
-  && rm -rf /var/lib/apt/lists/* \
-  && apt-get install -y capnproto libcapnp-dev
-
+  && rm -rf /var/lib/apt/lists/*
 
 # set out workspace
 ENV VTR_ROOT=/workspace/vtr-verilog-to-routing

diff --git a/Dockerfile b/Dockerfile
@@ -21,18 +21,18 @@ RUN apt-get update -qq \
     git \
     time \
     ant \
+    capnproto \
+    libcapnp-dev \
     default-jre \
     google-perftools \
     libfl-dev \
-    cmake \
     libgoogle-perftools-dev \
     python3-orderedmultidict \
     swig \
     tcl-dev \
     tclsh \
     uuid \
 # Install python packages
-    && apt-get install -y capnproto libcapnp-dev \
     && pip install -r requirements.txt \
 # Cleanup
     && apt-get autoclean && apt-get clean && apt-get -y autoremove \

diff --git a/install_apt_packages.sh b/install_apt_packages.sh
@@ -36,7 +36,8 @@ sudo apt-get install -y \
     libboost-filesystem-dev \
     zlib1g-dev \
     ant \
-    cmake \
+    capnproto \
+    libcapnp-dev \
     default-jre \
     google-perftools \
     libfl-dev \