diff options
| author | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-10-27 23:09:05 +0200 |
|---|---|---|
| committer | Patrick Lehmann <Patrick.Lehmann@tu-dresden.de> | 2016-10-28 02:39:09 +0200 |
| commit | 4d68bc3139f3fe6d6642b1d2df4bf9bf63711477 (patch) | |
| tree | 7f8d913183de6a3b1946b5048fc5602765857355 /libraries/vendors/shared.psm1 | |
| parent | de1c213c36101c80f961f2ba24d4188646de8cb5 (diff) | |
| download | ghdl-4d68bc3139f3fe6d6642b1d2df4bf9bf63711477.tar.gz ghdl-4d68bc3139f3fe6d6642b1d2df4bf9bf63711477.tar.bz2 ghdl-4d68bc3139f3fe6d6642b1d2df4bf9bf63711477.zip | |
VendorLib: Added switch to compile XilinxCoreLib for ISE. Adjusted behavior between PowerShell and Bash scripts. Updated embedded help pages.
Diffstat (limited to 'libraries/vendors/shared.psm1')
| -rw-r--r-- | libraries/vendors/shared.psm1 | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libraries/vendors/shared.psm1 b/libraries/vendors/shared.psm1 index c15439fdf..1c693af73 100644 --- a/libraries/vendors/shared.psm1 +++ b/libraries/vendors/shared.psm1 @@ -14,7 +14,7 @@ # output streams (stdout and stderr). # # ============================================================================== -# Copyright (C) 2015-2016 Patrick Lehmann +# Copyright (C) 2015-2016 Patrick Lehmann - Dresden, Germany # # GHDL is free software; you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free @@ -66,7 +66,7 @@ function Exit-CompileScript if ($ExitCode -eq 0) { exit 0 } else - { Write-Host "[DEBUG]: HARD EXIT" -ForegroundColor Cyan + { Write-Host "[DEBUG]: HARD EXIT" -ForegroundColor Red exit $ExitCode } } @@ -159,11 +159,11 @@ function Get-GHDLBinary ) if ($GHDL -ne "") - { $GHDLBinary = $GHDL } + { $GHDLBinary = $GHDL.TrimEnd("\") + "\ghdl.exe" } elseif (Test-Path env:GHDL) - { $GHDLBinary = $env:GHDL } + { $GHDLBinary = $env:GHDL.TrimEnd("\") + "\ghdl.exe" } else - { $GHDLBinary = "ghdl.exe" } + { $GHDLBinary = "ghdl.exe" } if (-not (Test-Path $GHDLBinary -PathType Leaf)) { Write-Host "Use adv. options '-GHDL' to set the GHDL executable." -ForegroundColor Red |