From 600a563255fe9e7441fda359cb96f475e3a15930 Mon Sep 17 00:00:00 2001
From: Daniel van der Schuur <schuur@astron.nl>
Date: Mon, 5 Jan 2015 12:45:13 +0000
Subject: [PATCH] -Modified paths to point to new versions: . Quartus 14.1 .
Modelsim 10.4 . Modelsim 6.6c path now includes '6.6c' as subdir. -Note:
dop233 has local mods that point to its own install dirs.
---
tools/hdltool.cfg | 2 +-
tools/modelsim/modelsim_version.sh | 8 ++++----
tools/modelsim/set_modelsim | 4 ++--
tools/quartus/set_quartus | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/hdltool.cfg b/tools/hdltool.cfg
index 81dbecad87..104a3fe1f1 100644
--- a/tools/hdltool.cfg
+++ b/tools/hdltool.cfg
@@ -1,3 +1,3 @@
tool_name_sim = modelsim
tool_name_synth = quartus
-model_tech_dir = /home/software/Mentor/modeltech
+model_tech_dir = /home/software/Mentor/6.6c/modeltech
diff --git a/tools/modelsim/modelsim_version.sh b/tools/modelsim/modelsim_version.sh
index 7dcf5a96d0..00b6efe0e2 100755
--- a/tools/modelsim/modelsim_version.sh
+++ b/tools/modelsim/modelsim_version.sh
@@ -23,11 +23,11 @@
MODELSIM_VERSION=${1}
echo "Select Modelsim version: ${MODELSIM_VERSION}"
-# First modelsim 6.6c,f was stored at /modeltech, subsequent versions are stored at their /<version number>/modeltech
+## First modelsim 6.6c,f was stored at /modeltech, subsequent versions are stored at their /<version number>/modeltech
MODELSIM_VERSION_DIR=${MODELSIM_VERSION}
-if [ "${MODELSIM_VERSION}" = "6.6c" ]; then
- MODELSIM_VERSION_DIR=""
-fi
+#if [ "${MODELSIM_VERSION}" = "6.6c" ]; then
+# MODELSIM_VERSION_DIR=""
+#fi
# Must not define MODEL_TECH, because it gets defined when the tool starts. Therefore define MODEL_TECH_DIR to denote the modeltech version directory
export MODEL_TECH_DIR=/home/software/Mentor/${MODELSIM_VERSION_DIR}/modeltech
diff --git a/tools/modelsim/set_modelsim b/tools/modelsim/set_modelsim
index 18553d8e17..779145c8f8 100755
--- a/tools/modelsim/set_modelsim
+++ b/tools/modelsim/set_modelsim
@@ -38,8 +38,8 @@ if [ "${TOOLSET}" = "unb1" ]; then
. ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6c
elif [ "${TOOLSET}" = "unb2" ]; then
#. ${RADIOHDL}/tools/quartus/quartus_version.sh 13.1
- . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.0a10
- . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.2c
+ . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
+ . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.4
else
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
exit 1
diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus
index 5bf890caac..8dc1f4ed31 100755
--- a/tools/quartus/set_quartus
+++ b/tools/quartus/set_quartus
@@ -36,7 +36,7 @@ echo "Make Quartus settings for RadioHDL with tool setting: ${TOOLSET}"
if [ "${TOOLSET}" = "unb1" ]; then
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1
elif [ "${TOOLSET}" = "unb2" ]; then
- . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.0a10
+ . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
else
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
exit 1
--
GitLab