diff options
| author | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2018-02-11 22:13:10 +0100 |
|---|---|---|
| committer | tgingold <tgingold@users.noreply.github.com> | 2018-02-12 07:34:04 +0100 |
| commit | 10ff67bab06f4f728a540c0e2a71bb55d21257eb (patch) | |
| tree | 377edd9732c920b9f930597bab109df20ebd44cc | |
| parent | 5e6eb5f1eacc3b3468eb3d4d3388ff4f8398564a (diff) | |
| download | ghdl-10ff67bab06f4f728a540c0e2a71bb55d21257eb.tar.gz ghdl-10ff67bab06f4f728a540c0e2a71bb55d21257eb.tar.bz2 ghdl-10ff67bab06f4f728a540c0e2a71bb55d21257eb.zip | |
Fixed library compilation on Windows due to changes in 7ef79a53.
Fixes #526.
(cherry picked from commit 621df2024e1d9f3990a058d1e3b6f4130a48a91b)
| -rw-r--r-- | dist/windows/compile-ghdl.ps1 | 7 | ||||
| -rw-r--r-- | dist/windows/compile-libraries.ps1 | 30 |
2 files changed, 14 insertions, 23 deletions
diff --git a/dist/windows/compile-ghdl.ps1 b/dist/windows/compile-ghdl.ps1 index 45e1d7c50..0f126e846 100644 --- a/dist/windows/compile-ghdl.ps1 +++ b/dist/windows/compile-ghdl.ps1 @@ -90,11 +90,8 @@ $Script_WorkingDir = Get-Location $GHDLRootDir = Convert-Path (Resolve-Path ($PSScriptRoot + "\" + $RelPathToRoot)) # set default values -$EnableVerbose = $PSCmdlet.MyInvocation.BoundParameters["Verbose"] -$EnableDebug = $PSCmdlet.MyInvocation.BoundParameters["Debug"] -if ($EnableVerbose -eq $null) { $EnableVerbose = $false } -if ($EnableDebug -eq $null) { $EnableDebug = $false } -if ($EnableDebug -eq $true) { $EnableVerbose = $true } +$EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"] +$EnableVerbose = [bool]$PSCmdlet.MyInvocation.BoundParameters["Verbose"] -or $EnableDebug # load modules from GHDL's 'libraries' directory Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -Debug:$false -ArgumentList "$Script_WorkingDir", $Hosted diff --git a/dist/windows/compile-libraries.ps1 b/dist/windows/compile-libraries.ps1 index c6898ca5e..95f793b8a 100644 --- a/dist/windows/compile-libraries.ps1 +++ b/dist/windows/compile-libraries.ps1 @@ -87,11 +87,8 @@ $Script_WorkingDir = Get-Location $GHDLRootDir = Convert-Path (Resolve-Path ($PSScriptRoot + "\" + $RelPathToRoot)) # set default values -$EnableVerbose = $PSCmdlet.MyInvocation.BoundParameters["Verbose"] -$EnableDebug = $PSCmdlet.MyInvocation.BoundParameters["Debug"] -if ($EnableVerbose -eq $null) { $EnableVerbose = $false } -if ($EnableDebug -eq $null) { $EnableDebug = $false } -if ($EnableDebug -eq $true) { $EnableVerbose = $true } +$EnableDebug = [bool]$PSCmdlet.MyInvocation.BoundParameters["Debug"] +$EnableVerbose = [bool]$PSCmdlet.MyInvocation.BoundParameters["Verbose"] -or $EnableDebug # load modules from GHDL's 'libraries' directory Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -Debug:$false -ArgumentList "$Script_WorkingDir", $Hosted @@ -254,7 +251,6 @@ if ($VHDL87 -or $VHDL93 -or $VHDL2008) # ============================================================================ if ($VHDL87) { $VHDLVersion = "87" - $VersionedDirectory = "$VHDLDestinationLibraryDirectory\v$VHDLVersion" Write-Host "Compiling libraries for VHDL-$VHDLVersion" -ForegroundColor Cyan # ---------------------------------------------------------------------- @@ -263,7 +259,7 @@ if ($VHDL87) $VHDLLibrary = "std" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLLibrary" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLLibrary\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -298,7 +294,7 @@ if ($VHDL87) $VHDLFlavor = "ieee" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -333,7 +329,7 @@ if ($VHDL87) $VHDLFlavor = "synopsys" Write-Host " Compiling library '$VHDLLibrary' ($VHDLFlavor)..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -412,7 +408,6 @@ if ($VHDL87) # ============================================================================ if ($VHDL93) { $VHDLVersion = "93" - $VersionedDirectory = "$VHDLDestinationLibraryDirectory\v$VHDLVersion" Write-Host "Compiling libraries for VHDL-$VHDLVersion" -ForegroundColor Cyan # ---------------------------------------------------------------------- @@ -421,7 +416,7 @@ if ($VHDL93) $VHDLLibrary = "std" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLLibrary" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLLibrary\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -456,7 +451,7 @@ if ($VHDL93) $VHDLFlavor = "ieee" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -515,7 +510,7 @@ if ($VHDL93) $VHDLFlavor = "synopsys" Write-Host " Compiling library '$VHDLLibrary' ($VHDLFlavor)..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -597,7 +592,7 @@ if ($VHDL93) $VHDLFlavor = "mentor" Write-Host " Compiling library '$VHDLLibrary' ($VHDLFlavor)..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -677,7 +672,6 @@ if ($VHDL93) # ============================================================================== if ($VHDL2008) { $VHDLVersion = "08" - $VersionedDirectory = "$VHDLDestinationLibraryDirectory\v$VHDLVersion" Write-Host "Compiling libraries for VHDL-$VHDLVersion" -ForegroundColor Cyan # ---------------------------------------------------------------------- @@ -686,7 +680,7 @@ if ($VHDL2008) $VHDLLibrary = "std" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLLibrary" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLLibrary\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -721,7 +715,7 @@ if ($VHDL2008) $VHDLFlavor = "ieee" Write-Host " Compiling library '$VHDLLibrary'..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory @@ -780,7 +774,7 @@ if ($VHDL2008) $VHDLFlavor = "synopsys" Write-Host " Compiling library '$VHDLLibrary' ($VHDLFlavor)..." -ForegroundColor DarkCyan - $LibraryDirectory = "$VersionedDirectory\$VHDLFlavor" + $LibraryDirectory = "$VHDLDestinationLibraryDirectory\$VHDLFlavor\v$VHDLVersion" New-LibraryDirectory $LibraryDirectory # $EnableVerbose Set-Location $LibraryDirectory |