From 703253e522b68f7ab739a11befc72377ef0ab526 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 22 Sep 2021 23:19:08 +0200 Subject: Fixed parameter types and how to pass boolean/switch parameters from PoSh script to PoSh script. --- scripts/vendors/compile-uvvm.ps1 | 2 +- scripts/vendors/compile-xilinx-vivado.ps1 | 2 +- scripts/vendors/shared.psm1 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/vendors/compile-uvvm.ps1 b/scripts/vendors/compile-uvvm.ps1 index e1e57f7ac..a8960be85 100644 --- a/scripts/vendors/compile-uvvm.ps1 +++ b/scripts/vendors/compile-uvvm.ps1 @@ -167,7 +167,7 @@ New-DestinationDirectory $DestinationDirectory cd $DestinationDirectory -$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables +$VHDLVersion,$VHDLStandard,$VHDLFlavor = Get-VHDLVariables -VHDL2008 # define global GHDL Options $Analyze_Parameters = @( diff --git a/scripts/vendors/compile-xilinx-vivado.ps1 b/scripts/vendors/compile-xilinx-vivado.ps1 index f336a8994..790dd09a5 100644 --- a/scripts/vendors/compile-xilinx-vivado.ps1 +++ b/scripts/vendors/compile-xilinx-vivado.ps1 @@ -131,7 +131,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 0c15ef53f..eb3c4c037 100644 --- a/scripts/vendors/shared.psm1 +++ b/scripts/vendors/shared.psm1 @@ -188,8 +188,8 @@ function Get-VHDLVariables #> [CmdletBinding()] param( - [bool]$VHDL93 = $false, - [bool]$VHDL2008 = $true + [switch]$VHDL93 = $false, + [switch]$VHDL2008 = $true ) if ($VHDL93) -- cgit v1.2.3 From 3a018ce83a92999ebba6a05cc1fbc32c705493c4 Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Wed, 22 Sep 2021 23:45:01 +0200 Subject: Fixed it also in other vendor scripts. Fixed verbosity level. --- scripts/vendors/compile-altera.ps1 | 2 +- scripts/vendors/compile-intel.ps1 | 2 +- scripts/vendors/compile-lattice.ps1 | 2 +- scripts/vendors/compile-xilinx-ise.ps1 | 2 +- scripts/vendors/shared.psm1 | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) (limited to 'scripts') 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 -- cgit v1.2.3