[applocal.ps1] Keep global set of searched binaries and avoid excessive recursion.

1 files changed, 15 insertions, 5 deletions

diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index 55680c1f6..b2523a4d1 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -1,7 +1,10 @@
 [cmdletbinding()]
 param([string]$targetBinary, [string]$installedDir, [string]$tlogFile)
 
+$g_searched = @{}
+
 function resolve($targetBinary) {
+    Write-Verbose "Resolving $targetBinary..."
     try
     {
         $targetBinaryPath = Resolve-Path $targetBinary -erroraction stop
@@ -15,23 +18,30 @@ function resolve($targetBinary) {
     $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^    [^ ].*\.dll" } | % { $_ -replace "^    ","" })
     $a | % {
         if ([string]::IsNullOrEmpty($_)) {
-            continue
+            return
+        }
+        if ($g_searched.ContainsKey($_)) {
+            Write-Verbose "  ${_}: previously searched - Skip"
+            return
         }
+        $g_searched.Set_Item($_, $true)
         if (Test-Path "$installedDir\$_") {
             if (Test-Path "$targetBinaryDir\$_") {
-                Write-Verbose "$_ is already present"
+                Write-Verbose "  ${_}: already present - Only recurse"
             }
             else {
                 Copy-Item $installedDir\$_ $targetBinaryDir
-                Write-Verbose "Copying $installedDir\$_ -> $_"
+                Write-Verbose "  ${_}: Copying $installedDir\$_"
             }
             "$targetBinaryDir\$_"
             if ($tlogFile) { Add-Content $tlogFile "$targetBinaryDir\$_" }
             resolve("$targetBinaryDir\$_")
         } else {
-            Write-Verbose "$installedDir\$_ not found"
+            Write-Verbose "  ${_}: $installedDir\$_ not found"
         }
     }
+    Write-Verbose "Done Resolving $targetBinary."
 }
 
-resolve($targetBinary)
\ No newline at end of file
+resolve($targetBinary)
+Write-Verbose $($g_searched | out-string)
\ No newline at end of file