diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/vendors/README.md | 6 | ||||
-rw-r--r-- | scripts/vendors/compile-altera.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-intel.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-lattice.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-osvvm.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-uvvm.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-xilinx-ise.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/compile-xilinx-vivado.ps1 | 2 | ||||
-rw-r--r-- | scripts/vendors/shared.psm1 | 11 |
9 files changed, 17 insertions, 14 deletions
diff --git a/scripts/vendors/README.md b/scripts/vendors/README.md index 4b3e90ec9..50018242c 100644 --- a/scripts/vendors/README.md +++ b/scripts/vendors/README.md @@ -8,7 +8,7 @@ vendor libraries, if the vendor tool is present on the computer. There are also popular simulation and verification libraries like [OSVVM][osvvm] and [UVVM][uvvm], which can be pre-compile, too. -The compilation scripts are writen in the shell languages: PowerShell for Windows +The compilation scripts are written in the shell languages: PowerShell for Windows and Bash for Linux, MacOS, MSYS2/MinGW. The compile scripts can colorize the GHDL warning and error lines with the help of grc/grcat ([generic colourizer][grc]). @@ -17,7 +17,7 @@ warning and error lines with the help of grc/grcat ([generic colourizer][grc]). [grc]: http://kassiopeia.juls.savba.sk/~garabik/software/grc.html See the [GHDL Documentation](https://ghdl.github.io/ghdl) for a detailed -documentation on how to use [Precompile Scripts](https://ghdl.github.io/ghdl/getting/PrecompileVendorPrimitives.html) +documentation on how to use [Precompile Scripts](https://ghdl.github.io/ghdl/getting.html#precompile-vendor-primitives) --------------------------------------------------------------------- @@ -106,7 +106,7 @@ the path to the GHDL executable can be specified with `--ghdl` (Bash) or `-GHDL` (PoSh). For a detailed documentation and all command line options see -[Precompile Scripts](https://ghdl.github.io/ghdl/getting/PrecompileVendorPrimitives.html) +[Precompile Scripts](https://ghdl.github.io/ghdl/getting.html#precompile-vendor-primitives) --------------------------------------------------------------------- diff --git a/scripts/vendors/compile-altera.ps1 b/scripts/vendors/compile-altera.ps1 index 0c1f948cf..9587d3b86 100644 --- a/scripts/vendors/compile-altera.ps1 +++ b/scripts/vendors/compile-altera.ps1 @@ -81,7 +81,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/compile-intel.ps1 b/scripts/vendors/compile-intel.ps1 index 0e3ba781c..711daa80d 100644 --- a/scripts/vendors/compile-intel.ps1 +++ b/scripts/vendors/compile-intel.ps1 @@ -81,7 +81,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/compile-lattice.ps1 b/scripts/vendors/compile-lattice.ps1 index 7e36c322d..6fba8af9c 100644 --- a/scripts/vendors/compile-lattice.ps1 +++ b/scripts/vendors/compile-lattice.ps1 @@ -94,7 +94,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/compile-osvvm.ps1 b/scripts/vendors/compile-osvvm.ps1 index d93ca2d1d..93bb0babe 100644 --- a/scripts/vendors/compile-osvvm.ps1 +++ b/scripts/vendors/compile-osvvm.ps1 @@ -62,7 +62,7 @@ param( [string]$Source = "",
# Set output directory name.
[string]$Output = "",
- # Set GHDL binary directory.
+ # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe
[string]$GHDL = ""
)
diff --git a/scripts/vendors/compile-uvvm.ps1 b/scripts/vendors/compile-uvvm.ps1 index a8960be85..85f7a6046 100644 --- a/scripts/vendors/compile-uvvm.ps1 +++ b/scripts/vendors/compile-uvvm.ps1 @@ -95,7 +95,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/compile-xilinx-ise.ps1 b/scripts/vendors/compile-xilinx-ise.ps1 index 39b363117..0d5730c0c 100644 --- a/scripts/vendors/compile-xilinx-ise.ps1 +++ b/scripts/vendors/compile-xilinx-ise.ps1 @@ -72,7 +72,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/compile-xilinx-vivado.ps1 b/scripts/vendors/compile-xilinx-vivado.ps1 index a411ababa..bdf9c8b3d 100644 --- a/scripts/vendors/compile-xilinx-vivado.ps1 +++ b/scripts/vendors/compile-xilinx-vivado.ps1 @@ -64,7 +64,7 @@ param( [string]$Source = "", # Set output directory name. [string]$Output = "", - # Set GHDL binary directory. + # Set path to GHDL's executable, e.g. <MyGHDLPath>/bin/ghdl.exe [string]$GHDL = "" ) diff --git a/scripts/vendors/shared.psm1 b/scripts/vendors/shared.psm1 index bc6f6f93c..51f492874 100644 --- a/scripts/vendors/shared.psm1 +++ b/scripts/vendors/shared.psm1 @@ -156,16 +156,19 @@ function Get-GHDLBinary { $GHDLBinary = $env:GHDL } else { try - { write-host "calling which ..." - $GHDLBinary = (Get-Command "ghdl.exe").Source } + { Write-host "Calling Get-Command ..." + $GHDLBinary = (Get-Command "ghdl.exe" -ErrorAction Stop).Source } catch - { Write-Host "Use adv. options '-GHDL' to set the GHDL executable." -ForegroundColor Red + { Write-Host "Cannot find ghdl.exe." -ForegroundColor Red + Write-Host "Use adv. options '-GHDL' to set the GHDL executable." -ForegroundColor Red Exit-CompileScript -1 } } if (-not (Test-Path $GHDLBinary -PathType Leaf)) - { Write-Host "Use adv. options '-GHDL' to set the GHDL executable." -ForegroundColor Red + { + Write-Host "$GHDLBinary is not a file." -ForegroundColor Red + Write-Host "Use adv. options '-GHDL' to set the GHDL executable." -ForegroundColor Red Exit-CompileScript -1 } |