winbuild: Fixed add and remove from PATH.

1 files changed, 123 insertions, 40 deletions

diff --git a/dist/mcode/winbuild.ps1 b/dist/mcode/winbuild.ps1
index de5198520..cccb2824d 100644
--- a/dist/mcode/winbuild.ps1
+++ b/dist/mcode/winbuild.ps1
@@ -45,13 +45,20 @@
 # # Normal flow

 # PS> .\winbuild.ps1 -Clean

 # PS> .\winbuild.ps1 -Compile

+# PS> .\winbuild.ps1 -Install

+# 

+# # Combine all commands in a single call

+# PS>.\winbuild.ps1 -Clean -Compile -Install "C:\Tools\GHDL"

+#

+# # Install to user defined dir

 # PS> .\winbuild.ps1 -Install "C:\Tools\GHDL"

+#

+# # Update or Uninstall

+# PS> .\winbuild.ps1 -Update

+# PS> .\winbuild.ps1 -Uninstall

 # 

 # # Create a Zip-file

 # PS>.\winbuild.ps1 -CreatePackage -Zip 

-# 

-# # combine all commands in a single call

-# PS>.\winbuild.ps1 -Clean -Compile -Install "C:\Tools\GHDL"

 #

 [CmdletBinding()]

 Param(

@@ -72,7 +79,8 @@ Param(
 	

 	# install all files into a directory (xcopy deployment)

 	[switch]$Install = $false,

-	[parameter(mandatory=$false, ValueFromRemainingArguments=$true)][string]$InstallDir = "",

+	[parameter(mandatory=$false, ValueFromRemainingArguments=$true)]

+	[string]$InstallDir = "",

 	# update files

 	[switch]$Update,

 	# uninstall all files from a directory

@@ -156,6 +164,11 @@ $GHDLZipPackageFile =					"$GHDLZipPackageDir\$ZipPackageFileName"
 # construct files

 $InstallDirFile =							"$GHDLBuildDir\InstallDir.conf"

 

+$EnvPath_ContainerMapping = @{

+	Machine =	[EnvironmentVariableTarget]::Machine

+	User =		[EnvironmentVariableTarget]::User

+}

+

 function Exit-Script

 {	[CmdletBinding()]

 	param(

@@ -168,51 +181,76 @@ function Exit-Script
 	exit $ExitCode

 }

 

-# Author:	Ed Wilson

-# Source:	https://blogs.technet.com/b/heyscriptingguy/archive/2011/07/23/use-powershell-to-modify-your-environmental-path.aspx

-function Add-Path

-	(	[parameter(Mandatory=$True,ValueFromPipeline=$True,Position=0)]

-		[string]$AddedFolder

+# GitHub user:            https://github.com/mkropat

+# Gist account at GitHub: https://gist.github.com/mkropat

+# Gist snippet URL:       https://gist.github.com/mkropat/c1226e0cc2ca941b23a9

+function Add-EnvPath

+{	param(

+		[Parameter(Mandatory=$true)]

+		[string] $Path,

+

+		[ValidateSet("Machine", "User", "Session")]

+		[string] $Container = "Session"

 	)

-# function body

-	{	# Get the current search path from the environment keys in the registry.

-		$OldPath = (Get-ItemProperty -Path "Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" -Name PATH).Path

 

-		# See if a new folder has been supplied.

-		if (!$AddedFolder)

-			{	return "No Folder Supplied. $ENV:PATH Unchanged"	}

+	if ($Container -ne "Session")

+	{	$containerType =	$EnvPath_ContainerMapping[$Container]

+		$persistedPaths =	[Environment]::GetEnvironmentVariable("Path", $containerType) -split ";"

+		if ($persistedPaths -notcontains $Path)

+		{	$persistedPaths = $persistedPaths + $Path | where { $_ }

+			[Environment]::SetEnvironmentVariable("Path", $persistedPaths -join ";", $containerType)

+		}

+	}

 

-		# See if the new folder exists on the file system.

-		if (!(Test-Path $AddedFolder))

-			{	return "Folder Does not Exist, Cannot be added to $ENV:PATH"	}

+	$envPaths = $env:Path -split ";"

+	if ($envPaths -notcontains $Path)

+	{	$envPaths = $envPaths + $Path | where { $_ }

+		$env:Path = $envPaths -join ";"

+	}

+}

 

-		# See if the new Folder is already in the path.

-		if ($ENV:Path | Select-String -SimpleMatch $AddedFolder)

-			{	return "Folder already within $ENV:PATH"	}

+# GitHub user:            https://github.com/mkropat

+# Gist account at GitHub: https://gist.github.com/mkropat

+# Gist snippet URL:       https://gist.github.com/mkropat/c1226e0cc2ca941b23a9

+function Remove-EnvPath

+{	param (

+		[Parameter(Mandatory=$true)]

+		[string] $Path,

 

-		# Set the New Path

-		$NewPath = $OldPath + ";" + $AddedFolder

+		[ValidateSet("Machine", "User", "Session")]

+		[string] $Container = "Session"

+	)

 

-		Set-ItemProperty -Path "Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" -Name PATH -Value $NewPath

+	if ($Container -ne "Session")

+	{	$containerType =	$EnvPath_ContainerMapping[$Container]

+		$persistedPaths =	[Environment]::GetEnvironmentVariable("Path", $containerType) -split ";"

+		if ($persistedPaths -contains $Path)

+		{	$persistedPaths = $persistedPaths | where { $_ -and $_ -ne $Path }

+			[Environment]::SetEnvironmentVariable("Path", $persistedPaths -join ";", $containerType)

+		}

+	}

+

+	$envPaths = $env:Path -split ";"

+	if ($envPaths -contains $Path)

+	{	$envPaths = $envPaths | where { $_ -and $_ -ne $Path }

+		$env:Path = $envPaths -join ";"

 	}

+}

 

-# Author:	Ed Wilson

-# Source:	https://blogs.technet.com/b/heyscriptingguy/archive/2011/07/23/use-powershell-to-modify-your-environmental-path.aspx

-function Remove-Path

-	(	[parameter(Mandatory=$True,ValueFromPipeline=$True,Position=0)]

-		[string]$RemovedFolder

+# GitHub user:            https://github.com/mkropat

+# Gist account at GitHub: https://gist.github.com/mkropat

+# Gist snippet URL:       https://gist.github.com/mkropat/c1226e0cc2ca941b23a9

+function Get-EnvPath

+{	param (

+		[Parameter(Mandatory=$true)]

+		[ValidateSet("Machine", "User")]

+		[string] $Container

 	)

-# function body

-	{	# Get the Current Search Path from the environment keys in the registry

-		$OldPath = (Get-ItemProperty -Path "Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" -Name PATH).Path

 

-		# Find the value to remove, replace it with $NULL. If it’s not found, nothing will change.

-		$NewPath = $OldPath -replace $RemovedFolder,$Null

+	$containerType = $EnvPath_ContainerMapping[$Container]

+	[Environment]::GetEnvironmentVariable('Path', $containerType) -split ";" | where { $_ }

+}

 

-		# Update the Environment Path

-		Set-ItemProperty -Path "Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment" -Name PATH -Value $NewPath

-	}

-	

 

 if ($false)

 {	# Write-Host "Uninstalling GHDL $GHDLVersion for Windows..."

@@ -444,7 +482,8 @@ else
 			{	$InstallPath = $DefaultInstallPath	}

 		}

 		else

-		{	$InstallPath = $InstallDir						}

+		{	$InstallPath = $InstallDir			}

+		$InstallPath = $InstallPath.TrimEnd("\")

 		

 		if ($Zip)

 		{	Write-Host "Loading PowerShell Community Extensions (PSCX) " -NoNewline

@@ -486,6 +525,16 @@ else
 			# pre-compiled libraries

 			Copy-Item $GHDLCompiledLibraryDir	-Recurse		"$InstallPath"							-Verbose:$EnableVerbose -ErrorAction SilentlyContinue

 

+			Write-Host "Install GHDL in PATH at machine level? " -NoNewline -ForegroundColor DarkCyan

+			Write-Host "[Y/n]" -NoNewline -ForegroundColor Cyan

+			Write-Host ":" -NoNewline -ForegroundColor DarkCyan

+			$InstallInPath = (Read-Host).ToLower()

+			if (($InstallInPath -eq "") -or ($InstallInPath -eq "y"))

+			{	Write-Host "  Adding GHDL to PATH at machine level."

+				Add-EnvPath -Path "$InstallPath\bin" -Container "Machine"

+				Add-EnvPath -Path "$InstallPath\bin" -Container "Session"

+			}

+			

 			Write-Host

 			Write-Host "Installing files " -NoNewline

 			Write-Host "[SUCCESSFUL]" -ForegroundColor Green

@@ -501,13 +550,26 @@ else
 			$InstallPath = Get-Content $InstallDirFile -Encoding Ascii

 		}

 		else

-		{	$InstallPath = $DefaultInstallPath		}

+		{	$InstallPath = $InstallDir			}

+		$InstallPath = $InstallPath.TrimEnd("\")

 		

 		Write-Host "  Install directory: $InstallPath"

 		if (Test-Path -Path $InstallPath)

 		{	Write-Host "  Cleaning up installation directory '$InstallPath'." -ForegroundColor Yellow

 			Get-ChildItem -Path $InstallPath -Depth 0 | foreach { Remove-Item $_ -ErrorAction SilentlyContinue }

 		}

+		

+		Write-Host "  Removing GHDL from PATH variables in Machine, User..." -ForegroundColor Yellow

+		foreach ($container in @("Machine", "User"))

+		{	foreach ($entry in (Get-EnvPath -Container $container))

+			{	if ($entry.ToLower().Contains("ghdl"))

+				{	Write-Host "    Removing '$entry' from $container level."

+					Remove-EnvPath -Path $entry -Container $container

+					Remove-EnvPath -Path $entry -Container "Session"

+				}

+			}

+		}

+		

 		Write-Host "  Creating directory sub-directories in '$InstallPath' ..."

 		# New-Item -ItemType directory -Path "$InstallPath"						-ErrorAction SilentlyContinue	| Out-Null

 		New-Item -ItemType directory -Path "$InstallPath\bin"				-ErrorAction SilentlyContinue	| Out-Null

@@ -524,6 +586,16 @@ else
 		# pre-compiled libraries

 		Copy-Item $GHDLCompiledLibraryDir	-Recurse		"$InstallPath"							-Verbose:$EnableVerbose -ErrorAction SilentlyContinue

 

+		Write-Host "Install GHDL in PATH at machine level? " -NoNewline -ForegroundColor DarkCyan

+		Write-Host "[Y/n]" -NoNewline -ForegroundColor Cyan

+		Write-Host ":" -NoNewline -ForegroundColor DarkCyan

+		$InstallInPath = (Read-Host).ToLower()

+		if (($InstallInPath -eq "") -or ($InstallInPath -eq "y"))

+		{	Write-Host "  Adding GHDL to PATH at machine level."

+			Add-EnvPath -Path "$InstallPath\bin" -Container "Machine"

+			Add-EnvPath -Path "$InstallPath\bin" -Container "Session"

+		}

+		

 		Write-Host

 		Write-Host "Updating files " -NoNewline

 		Write-Host "[SUCCESSFUL]" -ForegroundColor Green

@@ -545,6 +617,17 @@ else
 		{	Write-Host "  Removing installation directory '$InstallPath'." -ForegroundColor Yellow

 			Remove-Item $InstallPath -Recurse -ErrorAction SilentlyContinue

 		}

+		

+		Write-Host "  Removing GHDL from PATH variables in Machine, User..." -ForegroundColor Yellow

+		foreach ($container in @("Machine", "User"))

+		{	foreach ($entry in (Get-EnvPath -Container $container))

+			{	if ($entry.ToLower().Contains("ghdl"))

+				{	Write-Host "    Removing '$entry' from $container level."

+					Remove-EnvPath -Path $entry -Container $container

+					Remove-EnvPath -Path $entry -Container "Session"

+				}

+			}

+		}

 

 		Write-Host

 		Write-Host "Uninstalling files " -NoNewline