aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/vendors/compile-xilinx-ise.sh
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/vendors/compile-xilinx-ise.sh')
-rwxr-xr-xlibraries/vendors/compile-xilinx-ise.sh35
1 files changed, 19 insertions, 16 deletions
diff --git a/libraries/vendors/compile-xilinx-ise.sh b/libraries/vendors/compile-xilinx-ise.sh
index 2d62ea8ba..7aeee0bf5 100755
--- a/libraries/vendors/compile-xilinx-ise.sh
+++ b/libraries/vendors/compile-xilinx-ise.sh
@@ -62,7 +62,7 @@ VHDLStandard=93
GHDLBinDir=""
DestDir=""
SrcDir=""
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
case "$1" in
-c|--clean)
COMMAND=3
@@ -182,7 +182,7 @@ if [[ $COMMAND -le 1 ]]; then
echo "Verbosity:"
echo " -v --verbose Print verbose messages."
echo " -d --debug Print debug messages."
-# echo " -n --no-filter Disable output filtering scripts."
+ echo " -n --no-filter Disable output filtering scripts."
echo " -N --no-warnings Suppress all warnings. Show only error messages."
echo ""
exit $COMMAND
@@ -196,22 +196,31 @@ if [[ $COMMAND -eq 2 ]]; then
COMPILE_SECUREIP=1
fi
+
+# Source configuration file from GHDL's 'vendors' library directory
+echo -e "${ANSI_MAGENTA}Loading environment...${ANSI_NOCOLOR}"
+source $ScriptDir/config.sh
+if [[ $? -ne 0 ]]; then echo 1>&2 -e "${COLORED_ERROR} While loading configuration.${ANSI_NOCOLOR}" ; exit 1; fi
+source $ScriptDir/shared.sh
+if [[ $? -ne 0 ]]; then echo 1>&2 -e "${COLORED_ERROR} While loading further procedures.${ANSI_NOCOLOR}"; exit 1; fi
+
+# Warn that some files might not be VHDL-2008 ready. Thus enabled continue on error.
if [[ $VHDLStandard -eq 2008 ]]; then
echo -e "${ANSI_RED}Not all Xilinx primitives are VHDL-2008 compatible! Setting CONTINUE_ON_ERROR to TRUE.${ANSI_NOCOLOR}"
CONTINUE_ON_ERROR=1
fi
-
-DefaultDirectories=("/opt/Xilinx" "/opt/xilinx")
+# Search Xilinx ISE in default installation locations
+DefaultDirectories=("/opt/Xilinx" "/opt/xilinx" "/c/Xilinx")
if [ ! -z $XILINX ]; then
- EnvSourceDir=$XILINX/${SourceDirectories[XilinxISE]}
+ EnvSourceDir=$XILINX/${Xilinx_ISE_Settings[SourceDirectory]}
else
- for DefaultDir in ${DefaultDirectories[@]}; do
+ for DefaultDir in "${DefaultDirectories[@]}"; do
for Major in 14 13; do
for Minor in 7 6 5 4 3 2 1 0; do
- Dir=$DefaultDir/${Major}.${Minor}/ISE_DS/ISE
+ Dir=$DefaultDir/${Major}.${Minor}/ISE_DS
if [ -d $Dir ]; then
- EnvSourceDir=$Dir/${SourceDirectories[XilinxISE]}
+ EnvSourceDir=$Dir/${Xilinx_ISE_Settings[SourceDirectory]}
break 3
fi
done
@@ -219,12 +228,6 @@ else
done
fi
-# Source configuration file from GHDL's 'vendors' library directory
-echo -e "${ANSI_MAGENTA}Loading environment...${ANSI_NOCOLOR}"
-source $ScriptDir/config.sh
-if [[ $? -ne 0 ]]; then echo 1>&2 -e "${COLORED_ERROR} While loading configuration.${ANSI_NOCOLOR}" ; exit 1; fi
-source $ScriptDir/shared.sh
-if [[ $? -ne 0 ]]; then echo 1>&2 -e "${COLORED_ERROR} While loading further procedures.${ANSI_NOCOLOR}"; exit 1; fi
# <= $VHDLVersion
# <= $VHDLStandard
@@ -238,7 +241,7 @@ GHDLSetup $VHDLStandard
# -> $DestDir
# <= $SourceDirectory
# <= $DestinationDirectory
-SetupDirectories XilinxISE "Xilinx ISE"
+SetupDirectories Xilinx_ISE "Xilinx ISE"
# create "xilinx-ise" directory and change to it
# => $DestinationDirectory
@@ -246,7 +249,7 @@ CreateDestinationDirectory
cd $DestinationDirectory
-# Extend global GHDL Options
+# Extend global GHDL Options TODO: move to GHDLSetup TODO: move to GHDLSetup
Analyze_Parameters+=(
-fexplicit
-Wbinding