coriolis-install: Script working. Did one run with existing schroot. Will test with...

diff --git a/coriolis-install b/coriolis-install
index ef3ec5576b8503d6bb845de67fa62ac61f514898..9bdd491cccc693a85e6c73df4ba616af318d6083 100755 (executable)
--- a/coriolis-install
+++ b/coriolis-install
@@ -65,46 +65,53 @@ mkdir -p /home/$USER/coriolis-2.x/src
 cd /home/$USER/coriolis-2.x/src
 git clone https://gitlab.lip6.fr/vlsi-eda/coriolis.git
 cd coriolis
-# check out Libre-SOC 180nm ASIC version
+# check out Libre-SOC 180nm ASIC version - uses stable python2 version
 #git checkout devel
 git checkout LS180_RC7_FINAL
-# guaranteed to fail ./bootstrap/ccb.py --project=coriolis --make="-j$(nproc) install"
+# guaranteed to fail ./bootstrap/ccb.py --projecrt=coriolis --make="-j$(nproc) install"
 ./bootstrap/ccb.py --project=coriolis --make="-j1 install"
 
 # Setup and test coriolisenv
+# Have to use workaround as coriolisEnv.py can't detect the shell when ran inside a script.
+/bin/bash << EOF
 /home/$USER/coriolis-2.x/src/coriolis/bootstrap/coriolisEnv.py > /home/$USER/coriolisenv
-source /home/$USER/.bash_profile
+EOF
+
+# Set the environment variables needed for Coriolis2 and Alliance
+# coriolisenv overwrites env vars, so should occur first
 source /home/$USER/coriolisenv
+source /home/$USER/.bash_profile
 
 # Install alliance from source
 cd /home/$USER
-source coriolisenv
 git clone https://gitlab.lip6.fr/vlsi-eda/alliance.git
 mkdir -p /home/$USER/alliance/build /home/$USER/alliance/install
 mv alliance/alliance/src alliance
 rm -rf alliance/alliance
+# Compile Alliance
 cd alliance/src
 ./autostuff
 cd /home/$USER/alliance/build
 ../src/configure --prefix=/home/$USER/alliance/install --enable-alc-shared
-
-cd /home/$USER/alliance/build
-source /home/$USER/coriolisenv
-#make and install locally as local user
+# Make/Install as local user
 make -j1 install
 
 # Install and configure alliance-check-toolkit
 cd /home/$USER
 git clone https://gitlab.lip6.fr/vlsi-eda/alliance-check-toolkit.git
-source coriolisenv
 touch alliance-check-toolkit/etc/mk/users.d/user-$USER.mk
-cat <<EOG >>alliance-check-toolkit/etc/mk/users.d/user-$USER.mk
-export CORIOLIS_TOP=/home/$USER/coriolis-2.x/Linux.x86_64/Release.Shared/install
+
+# Environment variables for alliance-check-toolkit in a single script variable
+vars_for_alliance_check="export CORIOLIS_TOP=/home/$USER/coriolis-2.x/Linux.x86_64/Release.Shared/install
 export ALLIANCE_TOP=/home/$USER/alliance/install
 export CHECK_TOOLKIT=/home/$USER/alliance-check-toolkit
-export YOSYS_TOP=/home/$USER/yosys
-EOG
-source /home/$USER/.bash_profile
+export YOSYS_TOP=/home/$USER/yosys"
+
+echo -e "$vars_for_alliance_check" > /home/$USER/alliance-check-toolkit/etc/mk/users.d/user-$USER.mk
+
+echo "Setting /home/$USER/alliance-check-toolkit/etc/mk/users.d/user-$USER.mk file to:
+$vars_for_alliance_check"
+
 cd alliance-check-toolkit/benchs/adder/cmos
 make lvx
 echo -e "