Use <toolset> in build dir path.

tools/modelsim/commands.do

@@ -59,6 +59,11 @@ proc hdl_build {} {
     return $env(HDL_BUILD_DIR)
 }
 
+proc hdl_toolset {} {
+    global env
+    return $env(TOOLSET)
+}
+
 #-------------------------------------------------------------------------------
 # LP = Load project
 #-------------------------------------------------------------------------------
@@ -324,7 +329,7 @@ proc mk_test {arg_lib} {
 #-------------------------------------------------------------------------------
 
 proc read_modelsim_project_files_file {} {
-    set fp [open [hdl_build]/modelsim/modelsim_project_files.txt]
+    set fp [open [hdl_build]/[hdl_toolset]/modelsim/modelsim_project_files.txt]
     set data [read $fp]
     close $fp
     set lines [split $data \n]

tools/quartus/run_all_qsys

@@ -75,7 +75,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  

tools/quartus/run_all_sopc

@@ -76,7 +76,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  

tools/quartus/run_app

@@ -123,7 +123,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -138,7 +138,7 @@ if [ -z "${app}" ]; then
 fi
 
 # Generate the paths we need
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 builddir="${quartusdir}/software"
 bspdstdir="${builddir}/bsp"
 unbsrcdir="${UNB}/Firmware/software/modules/src"

tools/quartus/run_app_clean

@@ -83,7 +83,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -103,7 +103,7 @@ fi
 #            situations (exist + clean) vs (!exist + !clean).
 # For now I (H. Verkouter) lean towards the logical clause since I think
 # a non-fatal failure at this stage should not break other scripts
-appdir="${PRJ}/build/quartus/${project}/software/${app}"
+appdir="${PRJ}/build/${toolset}/quartus/${project}/software/${app}"
 
 if [ -d "${appdir}" ]; then
     unb_exec $0 msg=no rm -Rf ${appdir}

tools/quartus/run_bsp

@@ -81,7 +81,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -90,7 +90,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
 fi
 
 # now we can generate paths
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 builddir="${quartusdir}/software"
 bspdir="${builddir}/bsp"
 

tools/quartus/run_mif

@@ -83,7 +83,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -91,7 +91,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
     unb_error $0 "Please enter a valid project name as parameter"
 fi
 
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 builddir="${quartusdir}/software"
 bspdstdir="${builddir}/bsp"
 

tools/quartus/run_qcomp

@@ -86,7 +86,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -95,7 +95,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
 fi
 
 # check if the quartus project directory is there
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 unb_exec $0 msg=no test -d ${quartusdir}
 
 if [ -z "${rev}" ]; then

tools/quartus/run_qsys

@@ -72,7 +72,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -81,7 +81,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
 fi
 
 # Form name of quartusdir and check if it indeed exists
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 unb_exec $0 msg=no test -d ${quartusdir}
 
 # the QSYS file is optional. If it is omitted choose the first

tools/quartus/run_rbf

@@ -78,7 +78,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -86,7 +86,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
     unb_error $0 "Please enter a valid project name as parameter"
 fi
 
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 
 if [ -z "${rev}" ]; then
   project_rev="${project}"

tools/quartus/run_reg

@@ -78,7 +78,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -86,7 +86,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
     unb_error $0 "Please enter a valid project name as parameter"
 fi
 
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 builddir="${quartusdir}/software"
 bspdstdir="${builddir}/bsp"
 

tools/quartus/run_sof

@@ -147,7 +147,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -162,7 +162,7 @@ fi
 # check if the quartusdirectory does exist 
 # (such that it won't fail with a cryptic error but with
 #  a readable one
-quartusdir[1]="${PRJ}/build/quartus/${project}"
+quartusdir[1]="${PRJ}/build/${toolset}/quartus/${project}"
 unb_exec $0 msg=no test -d ${quartusdir[1]}
 
 if [ -z "${rev}" ]; then

tools/quartus/run_sopc

@@ -74,7 +74,7 @@ PRJS="${RADIOHDL}"
 PRJ=
 for prj in ${PRJS}
     do
-        if [ -d "${prj}/build/quartus/${project}" ]; then
+        if [ -d "${prj}/build/${toolset}/quartus/${project}" ]; then
             PRJ=${prj}
         fi  
     done  
@@ -83,7 +83,7 @@ if [ -z "${project}" -o -z "${PRJ}" ]; then
 fi
 
 # Form name of quartusdir and check if it indeed exists
-quartusdir="${PRJ}/build/quartus/${project}"
+quartusdir="${PRJ}/build/${toolset}/quartus/${project}"
 unb_exec $0 msg=no test -d ${quartusdir}
 
 # the SOPC file is optional. If it is omitted choose the first