aboutsummaryrefslogtreecommitdiffstats
path: root/libraries/vendors
diff options
context:
space:
mode:
authorPatrick Lehmann <Patrick.Lehmann@tu-dresden.de>2016-08-08 17:44:14 +0200
committerPatrick Lehmann <Patrick.Lehmann@tu-dresden.de>2016-08-08 17:44:14 +0200
commit70b634cf20c1f7a6d2b6439d94899e3ff0a43344 (patch)
tree626d3911006952087944b886d29204b2a2ff8056 /libraries/vendors
parent275123c3bca2e1058c31ec6d2dbb175d6b3aae40 (diff)
downloadghdl-70b634cf20c1f7a6d2b6439d94899e3ff0a43344.tar.gz
ghdl-70b634cf20c1f7a6d2b6439d94899e3ff0a43344.tar.bz2
ghdl-70b634cf20c1f7a6d2b6439d94899e3ff0a43344.zip
Silenced Import-Module and Remove-Module CmdLets, if verbose mode is active.
Diffstat (limited to 'libraries/vendors')
-rw-r--r--libraries/vendors/compile-altera.ps14
-rw-r--r--libraries/vendors/compile-lattice.ps14
-rw-r--r--libraries/vendors/compile-osvvm.ps14
-rw-r--r--libraries/vendors/compile-vunit.ps14
-rw-r--r--libraries/vendors/compile-xilinx-ise.ps14
-rw-r--r--libraries/vendors/compile-xilinx-vivado.ps14
-rw-r--r--libraries/vendors/shared.psm116
7 files changed, 21 insertions, 19 deletions
diff --git a/libraries/vendors/compile-altera.ps1 b/libraries/vendors/compile-altera.ps1
index e4275e622..e45812538 100644
--- a/libraries/vendors/compile-altera.ps1
+++ b/libraries/vendors/compile-altera.ps1
@@ -103,8 +103,8 @@ param(
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "AlteraQuartus"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("Altera Quartus", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "AlteraQuartus"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("Altera Quartus", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or $Altera -or $Max -or $Cyclone -or $Arria -or $Stratix -or $Nanometer))
diff --git a/libraries/vendors/compile-lattice.ps1 b/libraries/vendors/compile-lattice.ps1
index 462685018..c2c6069ca 100644
--- a/libraries/vendors/compile-lattice.ps1
+++ b/libraries/vendors/compile-lattice.ps1
@@ -114,8 +114,8 @@ param(
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "LatticeDiamond"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("Lattice Diamond", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "LatticeDiamond"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("Lattice Diamond", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or
diff --git a/libraries/vendors/compile-osvvm.ps1 b/libraries/vendors/compile-osvvm.ps1
index 470fcf6aa..e732d87ff 100644
--- a/libraries/vendors/compile-osvvm.ps1
+++ b/libraries/vendors/compile-osvvm.ps1
@@ -72,8 +72,8 @@ param(
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "OSVVM"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("OSVVM", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "OSVVM"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("OSVVM", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or $OSVVM))
diff --git a/libraries/vendors/compile-vunit.ps1 b/libraries/vendors/compile-vunit.ps1
index 75bf97cd5..f17d151f8 100644
--- a/libraries/vendors/compile-vunit.ps1
+++ b/libraries/vendors/compile-vunit.ps1
@@ -72,8 +72,8 @@ param(
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "VUnit"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("VUnit", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "VUnit"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("VUnit", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or $VUnit))
diff --git a/libraries/vendors/compile-xilinx-ise.ps1 b/libraries/vendors/compile-xilinx-ise.ps1
index fce3de9e3..1e47ea9fe 100644
--- a/libraries/vendors/compile-xilinx-ise.ps1
+++ b/libraries/vendors/compile-xilinx-ise.ps1
@@ -95,8 +95,8 @@ if ($Help)
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "XilinxISE"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("Xilinx ISE", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "XilinxISE"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("Xilinx ISE", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or $Unisim -or $Simprim -or $Unimacro))
diff --git a/libraries/vendors/compile-xilinx-vivado.ps1 b/libraries/vendors/compile-xilinx-vivado.ps1
index ff135315e..63ab5be76 100644
--- a/libraries/vendors/compile-xilinx-vivado.ps1
+++ b/libraries/vendors/compile-xilinx-vivado.ps1
@@ -86,8 +86,8 @@ param(
$WorkingDir = Get-Location
# load modules from GHDL's 'vendors' library directory
-Import-Module $PSScriptRoot\config.psm1 -ArgumentList "XilinxVivado"
-Import-Module $PSScriptRoot\shared.psm1 -ArgumentList @("Xilinx Vivado", "$WorkingDir")
+Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -ArgumentList "XilinxVivado"
+Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -ArgumentList @("Xilinx Vivado", "$WorkingDir")
# Display help if no command was selected
$Help = $Help -or (-not ($All -or $Unisim -or $Simprim -or $Unimacro))
diff --git a/libraries/vendors/shared.psm1 b/libraries/vendors/shared.psm1
index 52dd206da..c15439fdf 100644
--- a/libraries/vendors/shared.psm1
+++ b/libraries/vendors/shared.psm1
@@ -3,11 +3,11 @@
# kate: tab-width 2; replace-tabs off; indent-width 2;
#
# ==============================================================================
+# Authors: Patrick Lehmann
+#
# PowerShell Module: The module provides common CmdLets for the library
# pre-compilation process.
#
-# Authors: Patrick Lehmann
-#
# Description:
# ------------------------------------
# This PowerShell module provides CommandLets (CmdLets) to handle the GHDL.exe
@@ -60,8 +60,8 @@ function Exit-CompileScript
cd $Module_WorkingDir
# unload modules
- Remove-Module config
- Remove-Module shared
+ Remove-Module config -Verbose:$false
+ Remove-Module shared -Verbose:$false
if ($ExitCode -eq 0)
{ exit 0 }
@@ -201,7 +201,7 @@ function Get-VHDLVariables
elseif ($VHDL2008)
{ $VHDLVersion = "v08"
$VHDLStandard = "08"
- $VHDLFlavor = "standard"
+ $VHDLFlavor = "synopsys"
}
else
{ $VHDLVersion = "v93"
@@ -275,8 +275,9 @@ function Start-PackageCompilation
Write-Host "Compiling library '$Library' ..." -ForegroundColor Yellow
$ErrorCount = 0
foreach ($File in $SourceFiles)
- { Write-Host "Analyzing package file '$File'" -ForegroundColor Cyan
+ { Write-Host "Analyzing package file '$File'" -ForegroundColor DarkCyan
$InvokeExpr = "$GHDLBinary " + ($GHDLOptions -join " ") + " --work=$Library " + $File + " 2>&1"
+ # Write-Host " $InvokeExpr" -ForegroundColor DarkGray
$ErrorRecordFound = Invoke-Expression $InvokeExpr | Restore-NativeCommandStream | Write-ColoredGHDLLine $SuppressWarnings
if ($LastExitCode -ne 0)
{ $ErrorCount += 1
@@ -325,8 +326,9 @@ function Start-PrimitiveCompilation
Write-Host "Compiling library '$Library' ..." -ForegroundColor Yellow
$ErrorCount = 0
foreach ($File in $SourceFiles)
- { Write-Host "Analyzing primitive file '$File'" -ForegroundColor Cyan
+ { Write-Host "Analyzing primitive file '$File'" -ForegroundColor DarkCyan
$InvokeExpr = "$GHDLBinary " + ($GHDLOptions -join " ") + " --work=$Library " + $File + " 2>&1"
+ # Write-Host " $InvokeExpr" -ForegroundColor DarkGray
$ErrorRecordFound = Invoke-Expression $InvokeExpr | Restore-NativeCommandStream | Write-ColoredGHDLLine $SuppressWarnings
if ($LastExitCode -ne 0)
{ $ErrorCount += 1