Fine tuning.

10 files changed, 63 insertions, 67 deletions

diff --git a/libraries/vendors/README.md b/libraries/vendors/README.md
index f177afc9d..93a7c8a48 100644
--- a/libraries/vendors/README.md
+++ b/libraries/vendors/README.md
@@ -84,6 +84,14 @@ documentation on how to use [Precompile Scripts](https://ghdl.github.io/ghdl/get
 
 ---------------------------------------------------------------------
 
+## Usage
+
+*TODO*
+
+
+
+---------------------------------------------------------------------
+
 ## Options
 
 Each script has an integrated help. Use `script.sh --help` (Bash) or
@@ -108,9 +116,6 @@ For a detailed documentation and all command line options see
 - OSVVM
   - switch / search directories if normal OSVVM or OsvvmLibraries is specified as source
 
-- Bash scripts
-  - Verify `--source` is used instead of `--src`
-
 - Missing features
   - Implement `--clean` commands
 
@@ -118,6 +123,8 @@ For a detailed documentation and all command line options see
 
 - document offered procedures and functions
 
+- don't enforce `--output` if `--source` is used.
+
 ------------------------
 Author: Patrick Lehmann  
 Last update: 14.01.2020
diff --git a/libraries/vendors/compile-altera.sh b/libraries/vendors/compile-altera.sh
index 227e67d8e..00e0fbd5d 100755
--- a/libraries/vendors/compile-altera.sh
+++ b/libraries/vendors/compile-altera.sh
@@ -3,15 +3,13 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:
-#    Script to compile the simulation libraries from Altera
-#    Quartus for GHDL on Linux
+#  Bash Script (executable):
+#    Script to compile the simulation libraries from Altera Quartus for GHDL on
+#    Linux
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all Altera Quartus-II simulation libraries and packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all Altera Quartus-II simulation libraries and packages
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -32,7 +30,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/compile-intel.sh b/libraries/vendors/compile-intel.sh
index d9e0721fd..b1810e166 100755
--- a/libraries/vendors/compile-intel.sh
+++ b/libraries/vendors/compile-intel.sh
@@ -3,15 +3,13 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:
-#    Script to compile the simulation libraries from Altera
-#    Quartus for GHDL on Linux
+#  Bash Script (executable):
+#    Script to compile the simulation libraries from Altera Quartus for GHDL on
+#    Linux
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all Altera Quartus-II simulation libraries and packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all Altera Quartus-II simulation libraries and packages
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -32,7 +30,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/compile-lattice.sh b/libraries/vendors/compile-lattice.sh
index 8fe94de9b..ac5a04b1e 100755
--- a/libraries/vendors/compile-lattice.sh
+++ b/libraries/vendors/compile-lattice.sh
@@ -4,15 +4,13 @@
 #    Markus Koch
 #    Patrick Lehmann
 #
-#  Bash Script:
-#    Script to compile the simulation libraries from Lattice
-#    Diamond for GHDL on Linux
+#  Bash Script (executable):
+#    Script to compile the simulation libraries from Lattice Diamond for GHDL on
+#    Linux
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all Lattice Diamond simulation libraries and packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all Lattice Diamond simulation libraries and packages
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -34,7 +32,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
@@ -156,7 +154,7 @@ if [[ $COMMAND -le 1 ]]; then
 	echo "Libraries:"
 	echo "  -a --all                     Compile all Lattice simulation libraries."
 	for Device in $DeviceList; do
-	  printf "     --%-19s Device primitives for '%s'.\n" "${Device,,}" "$Device"
+	  printf "     --%-23s Device primitives for '%s'.\n" "${Device,,}" "$Device"
 	done
 	echo ""
 	echo "Library compile options:"
diff --git a/libraries/vendors/compile-osvvm.sh b/libraries/vendors/compile-osvvm.sh
index 02baf80c3..adac92ae5 100755
--- a/libraries/vendors/compile-osvvm.sh
+++ b/libraries/vendors/compile-osvvm.sh
@@ -3,13 +3,12 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:  Script to compile the OSVVM library for GHDL on Linux.
+#  Bash Script (executable):
+#    Script to compile the OSVVM library for GHDL on Linux.
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all OSVVM packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all OSVVM packages and verification IPs
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -30,7 +29,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/compile-uvvm.sh b/libraries/vendors/compile-uvvm.sh
index aae1d2dc9..8a4a64116 100755
--- a/libraries/vendors/compile-uvvm.sh
+++ b/libraries/vendors/compile-uvvm.sh
@@ -3,13 +3,12 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:  Script to compile the UVVM library for GHDL on Linux.
+#  Bash Script (executable):
+#    Script to compile the UVVM library for GHDL on Linux.
 #
-# Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all UVVM packages
+#  Description:
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all UVVM packages and verification IPs
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -30,7 +29,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
@@ -74,7 +73,7 @@ SUPPRESS_WARNINGS=0
 HALT_ON_ERROR=0
 DestDir=""
 SrcDir=""
-while [[ $# > 0 ]]; do
+while [[ $# -gt 0 ]]; do
 	case "$1" in
 		-c|--clean)
 			COMMAND=3
diff --git a/libraries/vendors/compile-xilinx-ise.sh b/libraries/vendors/compile-xilinx-ise.sh
index 7aeee0bf5..f6f628597 100755
--- a/libraries/vendors/compile-xilinx-ise.sh
+++ b/libraries/vendors/compile-xilinx-ise.sh
@@ -3,15 +3,13 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:
-#    Script to compile the simulation libraries from Xilinx ISE
-#    for GHDL on Linux
+#  Bash Script (executable):
+#    Script to compile the simulation libraries from Xilinx ISE for GHDL on
+#    Linux
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all Xilinx ISE simulation libraries and packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all Xilinx ISE simulation libraries and packages
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -32,7 +30,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/compile-xilinx-vivado.sh b/libraries/vendors/compile-xilinx-vivado.sh
index b0ce19f0e..4e7c6687e 100755
--- a/libraries/vendors/compile-xilinx-vivado.sh
+++ b/libraries/vendors/compile-xilinx-vivado.sh
@@ -3,15 +3,13 @@
 #  Authors:
 #    Patrick Lehmann
 #
-#  Bash Script:
-#    Script to compile the simulation libraries from Xilinx Vivado
-#    for GHDL on Linux
+#  Bash Script (executable):
+#    Script to compile the simulation libraries from Xilinx Vivado for GHDL on
+#    Linux
 #
 # Description:
-# ------------------------------------
-#  This is a Bash script (executable) which:
-#    - creates a subdirectory in the current working directory
-#    - compiles all Xilinx Vivado simulation libraries and packages
+#    - Creates a subdirectory in the current working directory
+#    - Compiles all Xilinx Vivado simulation libraries and packages
 #
 # ==============================================================================
 #  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
@@ -32,7 +30,7 @@
 # ==============================================================================
 
 # Work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/filter.analyze.sh b/libraries/vendors/filter.analyze.sh
index 7c8db88e7..dfb99eaa9 100644
--- a/libraries/vendors/filter.analyze.sh
+++ b/libraries/vendors/filter.analyze.sh
@@ -30,7 +30,7 @@
 # ==============================================================================
 
 # work around for Darwin (Mac OS)
-READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 
 # Save working directory
 WorkingDir=$(pwd)
diff --git a/libraries/vendors/shared.sh b/libraries/vendors/shared.sh
index f489283e6..1b03572b3 100755
--- a/libraries/vendors/shared.sh
+++ b/libraries/vendors/shared.sh
@@ -1,15 +1,16 @@
 # ==============================================================================
-#	Authors:						Patrick Lehmann
+#  Authors:
+#    Patrick Lehmann
 #
-#	Bash Script:				This is a Bash resource file.
+#	 Bash Script:
+#	   This is a Bash resource file for sourcing.
 #
-# Description:
-# ------------------------------------
-#		TODO
+#  Description:
+#	   Provide Bash procedures to easily use GHDL in Bash scripts.
 #
 # ==============================================================================
-#	Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
-#	Copyright (C) 2015-2016 Patrick Lehmann - Dresden, Germany
+#  Copyright (C) 2017-2021 Patrick Lehmann - Boetzingen, Germany
+#  Copyright (C) 2015-2016 Patrick Lehmann - Dresden, Germany
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -100,7 +101,7 @@ SetupDirectories() {
 	fi
 
 	# Resolve paths to an absolute paths
-	READLINK=readlink; if [[ $(uname) == "Darwin" ]]; then READLINK=greadlink; fi
+	test greadlink --version > /dev/null 2>&1 && READLINK=greadlink || READLINK=readlink
 	SourceDirectory=$($READLINK -f $SourceDirectory)
 	if [[ ! "$DestinationDirectory" = /* ]]; then
 		DestinationDirectory=$WorkingDir/$DestinationDirectory