From 2c13b6dd9af18273c1f4e38a51acb7ea745324c1 Mon Sep 17 00:00:00 2001
From: Patrick Lehmann <Patrick.Lehmann@tu-dresden.de>
Date: Sat, 10 Dec 2016 22:09:35 +0100
Subject: Updated compile order in compile-osvvm.* files.

---
 libraries/vendors/compile-osvvm.ps1 | 21 ++++++++++-----------
 libraries/vendors/compile-osvvm.sh  |  9 ++++++---
 2 files changed, 16 insertions(+), 14 deletions(-)

(limited to 'libraries')

diff --git a/libraries/vendors/compile-osvvm.ps1 b/libraries/vendors/compile-osvvm.ps1
index 9617f2f3f..8b047adfd 100644
--- a/libraries/vendors/compile-osvvm.ps1
+++ b/libraries/vendors/compile-osvvm.ps1
@@ -72,23 +72,19 @@ param(
 $WorkingDir =		Get-Location
 
 # 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 'vendors' library directory
 Import-Module $PSScriptRoot\config.psm1 -Verbose:$false -Debug:$false -ArgumentList "OSVVM"
 Import-Module $PSScriptRoot\shared.psm1 -Verbose:$false -Debug:$false -ArgumentList @("OSVVM", "$WorkingDir")
 
 # Display help if no command was selected
-$Help = $Help -or (-not ($All -or $OSVVM -or $Clean))
-
-if ($Help)
+if ($Help -or (-not ($All -or $OSVVM -or $Clean)))
 {	Get-Help $MYINVOCATION.InvocationName -Detailed
 	Exit-CompileScript
 }
+
 if ($All)
 {	$OSVVM =			$true
 }
@@ -132,18 +128,21 @@ if ((-not $StopCompiling) -and $OSVVM)
 	$Files = @(
 		"NamePkg.vhd",
 		"OsvvmGlobalPkg.vhd",
-		"TextUtilPkg.vhd",
+		"VendorCovApiPkg.vhd",
 		"TranscriptPkg.vhd",
+		"TextUtilPkg.vhd",
 		"AlertLogPkg.vhd",
-		"MemoryPkg.vhd",
 		"MessagePkg.vhd",
 		"SortListPkg_int.vhd",
 		"RandomBasePkg.vhd",
 		"RandomPkg.vhd",
 		"CoveragePkg.vhd",
+		"MemoryPkg.vhd",
 		"ScoreboardGenericPkg.vhd",
-		"ScoreboardPkg_int.vhd",
 		"ScoreboardPkg_slv.vhd",
+		"ScoreboardPkg_int.vhd",
+		"ResolutionPkg.vhd",
+		"TbUtilPkg.vhd",
 		"OsvvmContext.vhd"
 	)
 	$SourceFiles = $Files | % { "$SourceDirectory\$_" }
diff --git a/libraries/vendors/compile-osvvm.sh b/libraries/vendors/compile-osvvm.sh
index 38541aca2..9d2070c59 100755
--- a/libraries/vendors/compile-osvvm.sh
+++ b/libraries/vendors/compile-osvvm.sh
@@ -193,18 +193,21 @@ if [ "$COMPILE_OSVVM" == "TRUE" ]; then
 	Files=(
 		NamePkg.vhd
 		OsvvmGlobalPkg.vhd
-		TextUtilPkg.vhd
+		VendorCovApiPkg.vhd
 		TranscriptPkg.vhd
+		TextUtilPkg.vhd
 		AlertLogPkg.vhd
-		MemoryPkg.vhd
 		MessagePkg.vhd
 		SortListPkg_int.vhd
 		RandomBasePkg.vhd
 		RandomPkg.vhd
 		CoveragePkg.vhd
+		MemoryPkg.vhd
 		ScoreboardGenericPkg.vhd
-		ScoreboardPkg_int.vhd
 		ScoreboardPkg_slv.vhd
+		ScoreboardPkg_int.vhd
+		ResolutionPkg.vhd
+		TbUtilPkg.vhd
 		OsvvmContext.vhd
 	)
 
-- 
cgit v1.2.3