hdl-dev-repos: Added pyvcd dependency (for normal and virtualenv scripts)

install-hdl-apt-reqs: Added python3-toml dependency

diff --git a/hdl-dev-repos b/hdl-dev-repos
index ca691db2a7845c30b84bffaff43e261d0ebe996c..ca27341ecf4d87b54ef896f7a3b7d29fadd64f41 100755 (executable)
--- a/hdl-dev-repos
+++ b/hdl-dev-repos
@@ -8,6 +8,7 @@ runuser $SUDO_USER --preserve-environment -c '
 cd /home/$SUDO_USER
 mkdir -p src
 cd src
+git clone https://github.com/westerndigitalcorporation/pyvcd.git
 git clone https://gitlab.com/nmigen/nmigen-boards.git
 git clone https://gitlab.com/nmigen/nmigen.git
 git clone https://git.libre-soc.org/git/c4m-jtag.git
@@ -18,6 +19,11 @@ git clone https://gitlab.com/nmigen/nmigen-soc.git
 git clone https://gitlab.com/nmigen/nmigen-stdio.git
 git clone https://git.libre-soc.org/git/soc.git
 '
+# pyvcd - needed for nmigen
+cd pyvcd
+git checkout 0.4.0 # latest version tested
+python3 setup.py develop --no-deps
+
 # nmigen
 cd /home/$SUDO_USER/src/nmigen
 git tag | xargs git tag -d # very annoying

diff --git a/hdl-dev-repos-virtualenv b/hdl-dev-repos-virtualenv
index 321321c610c33a3d8387aa2adc54722a8427631b..6099712c89c31ddd8fe4a1f732e258b3de47ca0a 100755 (executable)
--- a/hdl-dev-repos-virtualenv
+++ b/hdl-dev-repos-virtualenv
@@ -3,6 +3,7 @@ python3 -m venv .env
 . .env/bin/activate
 pip3 install nose
 
+git clone https://github.com/westerndigitalcorporation/pyvcd.git
 git clone https://gitlab.com/nmigen/nmigen-boards.git
 git clone https://gitlab.com/nmigen/nmigen.git
 git clone https://git.libre-soc.org/git/c4m-jtag.git
@@ -12,6 +13,11 @@ git clone https://git.libre-soc.org/git/ieee754fpu.git
 git clone https://gitlab.com/nmigen/nmigen-soc.git
 git clone https://git.libre-soc.org/git/soc.git
 
+# pyvcd - needed for nmigen
+cd pyvcd
+git checkout 0.4.0 # latest version tested
+python3 setup.py develop --no-deps
+
 # nmigen
 cd /home/$SUDO_USER/src/nmigen
 git tag | xargs git tag -d # very annoying

diff --git a/install-hdl-apt-reqs b/install-hdl-apt-reqs
index ab5c568f460bdbbcb311bf67555cccc93b1f89d4..52ab63268a615288f55fbaa921e34802c11a99b9 100755 (executable)
--- a/install-hdl-apt-reqs
+++ b/install-hdl-apt-reqs
@@ -51,6 +51,7 @@ apt-get install -y autoconf \
     python3-sphinx-rtd-theme \
     python3-recommonmark \
     python3-pandocfilters \
+    python3-toml \
     pandoc \
     texstudio \
     texlive \