From 7dd52f2769d0db6a040e23de48f9f199f1eea168 Mon Sep 17 00:00:00 2001 From: John Demme Date: Thu, 30 Nov 2023 17:24:30 -0800 Subject: [PATCH] [Windows] Add zlib via vcpkg --- circt-windows/Dockerfile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/circt-windows/Dockerfile b/circt-windows/Dockerfile index 9147287..4e69b60 100644 --- a/circt-windows/Dockerfile +++ b/circt-windows/Dockerfile @@ -34,7 +34,11 @@ RUN C:\TEMP\git-install.exe /VERYSILENT /NORESTART RUN setx /M PATH "%PATH%;C:\Program Files\Git\bin" # Download and install python versions. -ADD https://www.python.org/ftp/python/3.11.0/python-3.11.0-amd64.exe C:\TEMP\python311-install.exe +ADD https://www.python.org/ftp/python/3.12.0/python-3.12.0-amd64.exe C:\TEMP\python312-install.exe +RUN C:\TEMP\python312-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 +RUN ("C:\Program Files\Python312/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil) + +ADD https://www.python.org/ftp/python/3.11.6/python-3.11.6-amd64.exe C:\TEMP\python311-install.exe RUN C:\TEMP\python311-install.exe /quiet InstallAllUsers=1 PrependPath=1 Include_test=0 RUN ("C:\Program Files\Python311/python.exe" -m pip install wheel numpy pyyaml pybind11 cocotb cocotb-test jinja2 psutil) @@ -65,6 +69,9 @@ RUN msiexec /i C:\TEMP\pwsh-install.msi # Clone and bootstrap vcpkg. RUN cd c:\ && git clone https://github.com/Microsoft/vcpkg.git && .\vcpkg\bootstrap-vcpkg.bat +# Install zlib via vcpkg. +RUN c:\vcpkg\vcpkg install zlib:x64-windows-static + # Install capnproto via vcpkg. RUN c:\vcpkg\vcpkg install capnproto:x64-windows