diff options
| author | Patrick Lehmann <Paebbels@gmail.com> | 2018-01-10 11:35:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-10 11:35:52 +0100 |
| commit | 1e0718e33573d3b855e4e57006c0293a2fe0f40b (patch) | |
| tree | a8de32f37f16070a443d1d674288e240dd5932b5 | |
| parent | 97813f901e260c3ae1506c272651da3b09e0dcf1 (diff) | |
| parent | 4f191200f609be5bec06662aac99bc5e25da4167 (diff) | |
| download | ghdl-1e0718e33573d3b855e4e57006c0293a2fe0f40b.tar.gz ghdl-1e0718e33573d3b855e4e57006c0293a2fe0f40b.tar.bz2 ghdl-1e0718e33573d3b855e4e57006c0293a2fe0f40b.zip | |
Merge pull request #517 from CraigNoble/master
Remove dependency on Get-DriveInfo for PowerShell pre-compile scripts.
| -rw-r--r-- | libraries/vendors/compile-altera.ps1 | 4 | ||||
| -rw-r--r-- | libraries/vendors/compile-intel.ps1 | 4 | ||||
| -rw-r--r-- | libraries/vendors/compile-lattice.ps1 | 4 | ||||
| -rw-r--r-- | libraries/vendors/compile-xilinx-ise.ps1 | 4 | ||||
| -rw-r--r-- | libraries/vendors/compile-xilinx-vivado.ps1 | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libraries/vendors/compile-altera.ps1 b/libraries/vendors/compile-altera.ps1 index a6b442926..e82985a0f 100644 --- a/libraries/vendors/compile-altera.ps1 +++ b/libraries/vendors/compile-altera.ps1 @@ -132,8 +132,8 @@ function Get-AlteraQuartusDirectory { return $QUARTUS_ROOTDIR + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in Get-DriveInfo) - { $Path = $Drive.Name + "Altera" + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Altera" if (Test-Path $Path -PathType Container) { foreach ($Major in 16..13) { foreach ($Minor in 3..0) diff --git a/libraries/vendors/compile-intel.ps1 b/libraries/vendors/compile-intel.ps1 index a5dd32302..ef071b64f 100644 --- a/libraries/vendors/compile-intel.ps1 +++ b/libraries/vendors/compile-intel.ps1 @@ -135,8 +135,8 @@ function Get-AlteraQuartusDirectory { return $QUARTUS_ROOTDIR + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in Get-DriveInfo) - { $Path = $Drive.Name + "Altera" + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Altera" if (Test-Path $Path -PathType Container) { foreach ($Major in 16..13) { foreach ($Minor in 3..0) diff --git a/libraries/vendors/compile-lattice.ps1 b/libraries/vendors/compile-lattice.ps1 index 2761bf816..43de58c29 100644 --- a/libraries/vendors/compile-lattice.ps1 +++ b/libraries/vendors/compile-lattice.ps1 @@ -157,8 +157,8 @@ function Get-LatticeDiamondDirectory { return $FOUNDRY + "\..\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in Get-DriveInfo) - { $Path = $Drive.Name + "Lattice\Diamond" + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Lattice\Diamond" if (Test-Path $Path -PathType Container) { foreach ($Major in 4..3) { foreach ($Minor in 9..0) diff --git a/libraries/vendors/compile-xilinx-ise.ps1 b/libraries/vendors/compile-xilinx-ise.ps1 index 42a54327e..8e30720bc 100644 --- a/libraries/vendors/compile-xilinx-ise.ps1 +++ b/libraries/vendors/compile-xilinx-ise.ps1 @@ -127,8 +127,8 @@ function Get-XilinxISEDirectory { return $XILINX + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in Get-DriveInfo) - { $Path = $Drive.Name + "Xilinx" + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Xilinx" if (Test-Path $Path -PathType Container) { foreach ($Major in 14..12) { foreach ($Minor in 7..1) diff --git a/libraries/vendors/compile-xilinx-vivado.ps1 b/libraries/vendors/compile-xilinx-vivado.ps1 index c25ab0c08..b212899fe 100644 --- a/libraries/vendors/compile-xilinx-vivado.ps1 +++ b/libraries/vendors/compile-xilinx-vivado.ps1 @@ -113,8 +113,8 @@ function Get-XilinxVivadoDirectory { return $XILINX_VIVADO + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in Get-DriveInfo) - { $Path = $Drive.Name + "Xilinx\Vivado" + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Xilinx\Vivado" if (Test-Path $Path -PathType Container) { foreach ($Major in 2018..2014) { foreach ($Minor in 4..1) |