diff options
| author | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2021-09-22 23:45:01 +0200 |
|---|---|---|
| committer | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2021-09-22 23:45:01 +0200 |
| commit | 3a018ce83a92999ebba6a05cc1fbc32c705493c4 (patch) | |
| tree | 2a4fb08b7ff81d16e273d5cc47da94440fe1aecb /scripts | |
| parent | 703253e522b68f7ab739a11befc72377ef0ab526 (diff) | |
| download | ghdl-3a018ce83a92999ebba6a05cc1fbc32c705493c4.tar.gz ghdl-3a018ce83a92999ebba6a05cc1fbc32c705493c4.tar.bz2 ghdl-3a018ce83a92999ebba6a05cc1fbc32c705493c4.zip | |
Fixed it also in other vendor scripts. Fixed verbosity level.
Diffstat (limited to 'scripts')
| -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-xilinx-ise.ps1 | 2 | ||||
| -rw-r--r-- | scripts/vendors/shared.psm1 | 10 |
5 files changed, 9 insertions, 9 deletions
diff --git a/scripts/vendors/compile-altera.ps1 b/scripts/vendors/compile-altera.ps1 index 2ca3116fc..4efa91b78 100644 --- a/scripts/vendors/compile-altera.ps1 +++ b/scripts/vendors/compile-altera.ps1 @@ -147,7 +147,7 @@ New-DestinationDirectory $DestinationDirectory cd $DestinationDirectory -$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 +$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL93:$VHDL93 -VHDL2008:$VHDL2008 # define global GHDL Options $Analyze_Parameters = @( diff --git a/scripts/vendors/compile-intel.ps1 b/scripts/vendors/compile-intel.ps1 index c6b5dfedc..e2bd259d0 100644 --- a/scripts/vendors/compile-intel.ps1 +++ b/scripts/vendors/compile-intel.ps1 @@ -147,7 +147,7 @@ New-DestinationDirectory $DestinationDirectory cd $DestinationDirectory -$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 +$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL93:$VHDL93 -VHDL2008:$VHDL2008 # define global GHDL Options $Analyze_Parameters = @( diff --git a/scripts/vendors/compile-lattice.ps1 b/scripts/vendors/compile-lattice.ps1 index 873af8880..ca002be4e 100644 --- a/scripts/vendors/compile-lattice.ps1 +++ b/scripts/vendors/compile-lattice.ps1 @@ -174,7 +174,7 @@ $GHDLBinary = Get-GHDLBinary $GHDL New-DestinationDirectory $DestinationDirectory cd $DestinationDirectory -$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 +$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL93:$VHDL93 -VHDL2008:$VHDL2008 # define global GHDL Options $Analyze_Parameters = @( diff --git a/scripts/vendors/compile-xilinx-ise.ps1 b/scripts/vendors/compile-xilinx-ise.ps1 index cec4c6cf0..947d70fd9 100644 --- a/scripts/vendors/compile-xilinx-ise.ps1 +++ b/scripts/vendors/compile-xilinx-ise.ps1 @@ -140,7 +140,7 @@ if ($VHDL2008) { Write-Host "Not all Xilinx primitives are VHDL-2008 compatible! Setting HaltOnError to FALSE." -ForegroundColor Red $HaltOnError = $false } -$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables $VHDL93 $VHDL2008 +$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL93:$VHDL93 -VHDL2008:$VHDL2008 # define global GHDL Options $Analyze_Parameters = @( diff --git a/scripts/vendors/shared.psm1 b/scripts/vendors/shared.psm1 index eb3c4c037..bc6f6f93c 100644 --- a/scripts/vendors/shared.psm1 +++ b/scripts/vendors/shared.psm1 @@ -285,16 +285,16 @@ function Start-PackageCompilation Write-Host "Compiling library '$Library' ..." -ForegroundColor Yellow $LibraryDirectory= "$DestinationDirectory/$Library/$VHDLVersion" - $EnableVerbose -and (Write-Host " Creating library $Library ..." -ForegroundColor Gray ) | Out-Null - $EnableDebug -and (Write-Host " mkdir $LibraryDirectory" -ForegroundColor DarkGray ) | Out-Null + $EnableVerbose -and (Write-Host " Creating library $Library ..." -ForegroundColor Gray ) | Out-Null + $EnableDebug -and (Write-Host " mkdir $LibraryDirectory" -ForegroundColor DarkGray ) | Out-Null mkdir $LibraryDirectory -ErrorAction SilentlyContinue | Out-Null - $EnableDebug -and (Write-Host " cd $LibraryDirectory" -ForegroundColor DarkGray ) | Out-Null + $EnableDebug -and (Write-Host " cd $LibraryDirectory" -ForegroundColor DarkGray ) | Out-Null cd $LibraryDirectory $ErrorCount = 0 foreach ($File in $SourceFiles) - { Write-Host " Analyzing package file '$File'" -ForegroundColor DarkCyan + { $EnableVerbose -and (Write-Host " Analyzing package file '$File'" -ForegroundColor DarkCyan ) | Out-Null $InvokeExpr = "& '$GHDLBinary' -a " + ($Parameters -join " ") + " --work=$Library " + $File + " 2>&1" - $EnableDebug -and (Write-Host " $InvokeExpr" -ForegroundColor DarkGray ) | Out-Null + $EnableDebug -and (Write-Host " $InvokeExpr" -ForegroundColor DarkGray ) | Out-Null $ErrorRecordFound = Invoke-Expression $InvokeExpr | Restore-NativeCommandStream | Write-ColoredGHDLLine $SuppressWarnings -Indent:"$Indent" if (($LastExitCode -ne 0) -or $ErrorRecordFound) { $ErrorCount += 1 |