From 0f31d907f1984d9f536c73a1feec42806116898b Mon Sep 17 00:00:00 2001 From: Craig Noble Date: Mon, 8 Jan 2018 12:18:42 +0000 Subject: Remove dependency on Get-DriveInfo for powershell compile scripts --- libraries/vendors/compile-altera.ps1 | 4 ++-- libraries/vendors/compile-intel.ps1 | 4 ++-- libraries/vendors/compile-lattice.ps1 | 4 ++-- libraries/vendors/compile-xilinx-ise.ps1 | 4 ++-- 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..f797ce155 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 gdr -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..db0504b54 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 gdr -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..847e5b1e5 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 gdr -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..d92fc51a8 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 gdr -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..1338048d5 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 gdr -PSProvider 'FileSystem') + { $Path = $Drive.Name + ":\" + "Xilinx\Vivado" if (Test-Path $Path -PathType Container) { foreach ($Major in 2018..2014) { foreach ($Minor in 4..1) -- cgit v1.2.3 From 4f191200f609be5bec06662aac99bc5e25da4167 Mon Sep 17 00:00:00 2001 From: Craig Noble Date: Wed, 10 Jan 2018 10:03:24 +0000 Subject: Change gdr to Get-PSDrive in vendor compile scripts --- libraries/vendors/compile-altera.ps1 | 2 +- libraries/vendors/compile-intel.ps1 | 2 +- libraries/vendors/compile-lattice.ps1 | 2 +- libraries/vendors/compile-xilinx-ise.ps1 | 2 +- libraries/vendors/compile-xilinx-vivado.ps1 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/vendors/compile-altera.ps1 b/libraries/vendors/compile-altera.ps1 index f797ce155..e82985a0f 100644 --- a/libraries/vendors/compile-altera.ps1 +++ b/libraries/vendors/compile-altera.ps1 @@ -132,7 +132,7 @@ function Get-AlteraQuartusDirectory { return $QUARTUS_ROOTDIR + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in gdr -PSProvider 'FileSystem') + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') { $Path = $Drive.Name + ":\" + "Altera" if (Test-Path $Path -PathType Container) { foreach ($Major in 16..13) diff --git a/libraries/vendors/compile-intel.ps1 b/libraries/vendors/compile-intel.ps1 index db0504b54..ef071b64f 100644 --- a/libraries/vendors/compile-intel.ps1 +++ b/libraries/vendors/compile-intel.ps1 @@ -135,7 +135,7 @@ function Get-AlteraQuartusDirectory { return $QUARTUS_ROOTDIR + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in gdr -PSProvider 'FileSystem') + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') { $Path = $Drive.Name + ":\" + "Altera" if (Test-Path $Path -PathType Container) { foreach ($Major in 16..13) diff --git a/libraries/vendors/compile-lattice.ps1 b/libraries/vendors/compile-lattice.ps1 index 847e5b1e5..43de58c29 100644 --- a/libraries/vendors/compile-lattice.ps1 +++ b/libraries/vendors/compile-lattice.ps1 @@ -157,7 +157,7 @@ function Get-LatticeDiamondDirectory { return $FOUNDRY + "\..\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in gdr -PSProvider 'FileSystem') + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') { $Path = $Drive.Name + ":\" + "Lattice\Diamond" if (Test-Path $Path -PathType Container) { foreach ($Major in 4..3) diff --git a/libraries/vendors/compile-xilinx-ise.ps1 b/libraries/vendors/compile-xilinx-ise.ps1 index d92fc51a8..8e30720bc 100644 --- a/libraries/vendors/compile-xilinx-ise.ps1 +++ b/libraries/vendors/compile-xilinx-ise.ps1 @@ -127,7 +127,7 @@ function Get-XilinxISEDirectory { return $XILINX + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in gdr -PSProvider 'FileSystem') + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') { $Path = $Drive.Name + ":\" + "Xilinx" if (Test-Path $Path -PathType Container) { foreach ($Major in 14..12) diff --git a/libraries/vendors/compile-xilinx-vivado.ps1 b/libraries/vendors/compile-xilinx-vivado.ps1 index 1338048d5..b212899fe 100644 --- a/libraries/vendors/compile-xilinx-vivado.ps1 +++ b/libraries/vendors/compile-xilinx-vivado.ps1 @@ -113,7 +113,7 @@ function Get-XilinxVivadoDirectory { return $XILINX_VIVADO + "\" + (Get-VendorToolSourceDirectory) } else { $EnvSourceDir = "" - foreach ($Drive in gdr -PSProvider 'FileSystem') + foreach ($Drive in Get-PSDrive -PSProvider 'FileSystem') { $Path = $Drive.Name + ":\" + "Xilinx\Vivado" if (Test-Path $Path -PathType Container) { foreach ($Major in 2018..2014) -- cgit v1.2.3