Reworked standard libraries compile flow (std, ieee, ...). Fixed GHDL version test issue. Extended .gitignore to exclude generated files on Windows and Linux.

1 files changed, 17 insertions, 22 deletions

diff --git a/dist/mcode/winbuild.ps1 b/dist/mcode/winbuild.ps1
index 19accd514..0c4c83d44 100644
--- a/dist/mcode/winbuild.ps1
+++ b/dist/mcode/winbuild.ps1
@@ -3,12 +3,12 @@
 # kate: tab-width 2; replace-tabs off; indent-width 2;

 # 

 # ==============================================================================

-#	PowerShell Script:	Script to compile GHDL for Windows

-# 

 #	Authors:						Patrick Lehmann	(ported batch file to PowerShell)

 #											Brian Davis			(contributions to the batch file)

 #											Tristan Gingold	(initial batch file for compilations on Windows)

 # 

+#	PowerShell Script:	Script to compile GHDL for Windows

+# 

 # Description:

 # ------------------------------------

 #	This is a PowerShell script (executable) which:

@@ -18,6 +18,7 @@
 #

 # ==============================================================================

 #	Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold

+#	Copyright (C) 2015-2016 Patrick Lehmann

 #	

 #	GHDL is free software; you can redistribute it and/or modify it under

 #	the terms of the GNU General Public License as published by the Free

@@ -66,8 +67,6 @@ Param(
 	[switch]$CreatePackage,

 		# creates a zip-file for xcopy deployment

 		[switch]$Zip,

-		# creates a exe-file (installer generated by NSIS)

-		[switch]$Nsis,

 	

 	# install all files into a directory (xcopy deployment)

 	[switch]$Install,

@@ -215,19 +214,19 @@ else
 				Write-Host "Removing all created files and directories..."

 		

 				if ($Script_ExitCode -eq 0)

-					{	$Script_Path = 				$GHDLWindowsDir + "\compile.ps1"

+					{	$Script_Path = 				$GHDLWindowsDir + "\compile-ghdl.ps1"

 						$Script_Parameters =	@('-Clean')

 						#$Script_Parameters +=	'-Clean'

 						if ($Script_EnableVerbose -eq $true)	{	$Script_Parameters += '-Verbose'	}

 						if ($Script_EnableDebug -eq $true)		{	$Script_Parameters += '-Debug'		}

 						

-						Write-Host "Running compile.ps1 ..."

+						Write-Host "Running compile-ghdl.ps1 ..."

 						Write-Host "--------------------------------------------------------------------------------"

 						Invoke-Expression "$Script_Path $($Script_Parameters -join " ")"

 						if ($LastExitCode -ne 0)

 							{	$Script_ExitCode = 1

 								Write-Host "--------------------------------------------------------------------------------"

-								Write-Host "ERROR while executing 'compile.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

+								Write-Host "ERROR while executing 'compile-ghdl.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

 							}

 						else

 							{	Write-Host "--------------------------------------------------------------------------------"

@@ -238,19 +237,19 @@ else
 					}

 				

 				if ($Script_ExitCode -eq 0)

-					{	$Script_Path = 				$GHDLWindowsDir + "\compile.ps1"

+					{	$Script_Path = 				$GHDLWindowsDir + "\compile-ghdl.ps1"

 						$Script_Parameters =	@()

 						$Script_Parameters +=	'-Clean'

 						if ($Script_EnableVerbose -eq $true)	{	$Script_Parameters += '-Verbose'	}

 						if ($Script_EnableDebug -eq $true)		{	$Script_Parameters += '-Debug'		}

 						

-						Write-Host "Running complib.ps1 ..."

+						Write-Host "Running compile-libraries.ps1 ..."

 						Write-Host "--------------------------------------------------------------------------------"

 						Invoke-Expression "$Script_Path $($Script_Parameters -join " ")"

 						if ($LastExitCode -ne 0)

 							{	$Script_ExitCode = 1

 								Write-Host "--------------------------------------------------------------------------------"

-								Write-Host "ERROR while executing 'complib.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

+								Write-Host "ERROR while executing 'compile-libraries.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

 							}

 						else

 							{	Write-Host "--------------------------------------------------------------------------------"

@@ -282,19 +281,19 @@ else
 				Write-Host "Compiling GHDL $GHDLVersion for Windows"

 				

 				if ($Script_ExitCode -eq 0)

-					{	$Script_Path = 				$GHDLWindowsDir + "\compile.ps1"

+					{	$Script_Path = 				$GHDLWindowsDir + "\compile-ghdl.ps1"

 						$Script_Parameters =	@()

 						$Script_Parameters +=	'-All'

 						if ($Script_EnableVerbose -eq $true)	{	$Script_Parameters += '-Verbose'	}

 						if ($Script_EnableDebug -eq $true)		{	$Script_Parameters += '-Debug'		}

 						

-						Write-Host "Running compile.ps1 ..."

+						Write-Host "Running compile-ghdl.ps1 ..."

 						Write-Host "--------------------------------------------------------------------------------"

 						Invoke-Expression "$Script_Path $($Script_Parameters -join " ")"

 						if ($LastExitCode -ne 0)

 							{	$Script_ExitCode = 1

 								Write-Host "--------------------------------------------------------------------------------"

-								Write-Host "ERROR while executing 'compile.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

+								Write-Host "ERROR while executing 'compile-ghdl.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

 							}

 						else

 							{	Write-Host "--------------------------------------------------------------------------------"

@@ -305,19 +304,21 @@ else
 					}

 				

 				if ($Script_ExitCode -eq 0)

-					{	$Script_Path = 				$GHDLWindowsDir + "\complib.ps1"

+					{	$Script_Path = 				$GHDLWindowsDir + "\compile-libraries.ps1"

 						$Script_Parameters =	@()

 						$Script_Parameters +=	'-Compile'

 						if ($Script_EnableVerbose -eq $true)	{	$Script_Parameters += '-Verbose'	}

 						if ($Script_EnableDebug -eq $true)		{	$Script_Parameters += '-Debug'		}

 						

-						Write-Host "Running complib.ps1 ..."

+						$env:GHDL = "$GHDLBuildDir\ghdl.exe"

+						

+						Write-Host "Running compile-libraries.ps1 ..."

 						Write-Host "--------------------------------------------------------------------------------"

 						Invoke-Expression "$Script_Path $($Script_Parameters -join " ")"

 						if ($LastExitCode -ne 0)

 							{	$Script_ExitCode = 1

 								Write-Host "--------------------------------------------------------------------------------"

-								Write-Host "ERROR while executing 'complib.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

+								Write-Host "ERROR while executing 'compile-libraries.ps1 $($Script_Paramters -join " ")'" -ForegroundColor Red

 							}

 						else

 							{	Write-Host "--------------------------------------------------------------------------------"

@@ -373,12 +374,6 @@ else
 						$file = Get-ChildItem $GHDLZipPackageDir -Recurse | Write-Zip -IncludeEmptyDirectories -EntryPathRoot $GHDLZipPackageDir -OutputPath $GHDLZipPackageFile

 						Write-Host "  $([math]::round(($file.Length / 1MB), 3)) MiB written to disk"

 					}

-				elseif (($Script_ExitCode -eq 0) -and $Nsis)

-					{	Write-Host "Output format: exe-file (created by NSIS)"

-						

-						$Script_ExitCode = 1

-						Write-Host "ERROR: Not Implemented." -ForegroundColor RED	

-					}

 				else

 					{	$Script_ExitCode = 1

 						Write-Host "No package format selected." -ForegroundColor Red