diff options
author | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-11-10 19:49:11 +0100 |
---|---|---|
committer | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-11-10 19:49:11 +0100 |
commit | 6904a5ac645bacf910b4e771fcb2983215b9c69f (patch) | |
tree | 6b97e912b7b8474bd935723b11f8db7e9eb654b6 /libraries/vendors/compile-xilinx-vivado.sh | |
parent | f903ccc342e1448b38c83dfd7322b28f6121c111 (diff) | |
download | ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.tar.gz ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.tar.bz2 ghdl-6904a5ac645bacf910b4e771fcb2983215b9c69f.zip |
Fixed bugs in compile-xilinx-***.sh files. Added support for the unifast library in Vivado.
Diffstat (limited to 'libraries/vendors/compile-xilinx-vivado.sh')
-rwxr-xr-x | libraries/vendors/compile-xilinx-vivado.sh | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/libraries/vendors/compile-xilinx-vivado.sh b/libraries/vendors/compile-xilinx-vivado.sh index 64e48c2b0..5d14e8110 100755 --- a/libraries/vendors/compile-xilinx-vivado.sh +++ b/libraries/vendors/compile-xilinx-vivado.sh @@ -76,6 +76,10 @@ while [[ $# > 0 ]]; do COMPILE_UNIMACRO=TRUE NO_COMMAND=0 ;; + --unifast) + COMPILE_UNIFAST=TRUE + NO_COMMAND=0 + ;; --secureip) COMPILE_SECUREIP=TRUE ;; @@ -146,6 +150,7 @@ if [ "$HELP" == "TRUE" ]; then echo " -a --all Compile all Xilinx simulation libraries." echo " --unisim Compile the unisim library." echo " --unimacro Compile the unimacro library." + echo " --unifast Compile the unifast library." echo " --secureip Compile the secureip library." echo "" echo "Library compile options:" @@ -169,6 +174,7 @@ fi if [ "$COMPILE_ALL" == "TRUE" ]; then COMPILE_UNISIM=TRUE COMPILE_UNIMACRO=TRUE + COMPILE_UNIFAST=TRUE COMPILE_SECUREIP=TRUE fi @@ -266,7 +272,10 @@ fi # compile unisim primitives if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNISIM" == "TRUE" ]; then Library="unisim" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/${Library}s/primitive/*.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/${Library}s/primitive/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}s/primitive/vhdl_analyze_order") GHDLCompileLibrary fi @@ -307,14 +316,26 @@ fi # compile unimacro macros if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNIMACRO" == "TRUE" ]; then Library="unimacro" - SourceFiles="$(LC_COLLATE=C ls $SourceDirectory/$Library/*_MACRO.vhd)" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/${Library}/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}/vhdl_analyze_order") GHDLCompileLibrary fi # Library UNIFAST # ============================================================================== -# TODO: +# compile unisim primitives +if [ $STOPCOMPILING -eq 0 ] && [ "$COMPILE_UNIFAST" == "TRUE" ]; then + Library="unifast" + SourceFiles=() + while IFS= read -r File; do + SourceFiles+=("$SourceDirectory/${Library}/primitive/$File") + done < <(grep --no-filename -R '^[a-zA-Z]' "$SourceDirectory/${Library}/primitive/vhdl_analyze_order") + + GHDLCompileLibrary +fi echo "--------------------------------------------------------------------------------" echo -n "Compiling Xilinx Vivado libraries " |