From 07b5bce96ba949040ba6eb3e23ed8a0ad2fc3ed2 Mon Sep 17 00:00:00 2001
From: Dumez <dumez>
Date: Thu, 15 Oct 2015 09:12:46 +0000
Subject: [PATCH] Update tool versions for USN Change svn:mime-type property to
'text/plain' so diff tools can work
---
tools/modelsim/set_modelsim | 2 +-
tools/quartus/set_quartus | 2 +-
tools/setup_unb.sh | 7 +++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/tools/modelsim/set_modelsim b/tools/modelsim/set_modelsim
index eca67c9fb0..af667dd4a5 100755
--- a/tools/modelsim/set_modelsim
+++ b/tools/modelsim/set_modelsim
@@ -40,7 +40,7 @@ if [ "${SITE-}" = "USN" ]; then
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1sp2
. ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6d
elif [ "${TOOLSET}" = "unb2" ]; then
- . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
+ . ${RADIOHDL}/tools/quartus/quartus_version.sh 15.0
. ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.4
else
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus
index 26cfc1ec59..e451273576 100755
--- a/tools/quartus/set_quartus
+++ b/tools/quartus/set_quartus
@@ -53,7 +53,7 @@ if [ "${SITE-}" = "USN" ]; then
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1sp2
elif [ "${TOOLSET}" = "unb2" ]; then
- . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
+ . ${RADIOHDL}/tools/quartus/quartus_version.sh 15.0
else
echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
exit 1
diff --git a/tools/setup_unb.sh b/tools/setup_unb.sh
index 1bd3a2e7c6..56c13ae314 100755
--- a/tools/setup_unb.sh
+++ b/tools/setup_unb.sh
@@ -36,8 +36,11 @@ echo "Setup old UniBoard environment for Modelsim and Quartus"
. ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1
. ${RADIOHDL}/tools/quartus/quartus_generic.sh
-. ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6c
-
+if [ "${SITE-}" = "USN" ]; then
+ . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6d
+else
+ . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6c
+fi
# 3) Synthesis
--
GitLab