From ab24ac2b8a07c008b61e3baca558793761eb6267 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Thu, 9 Nov 2017 07:29:02 -0800 Subject: [PATCH] Use simplified names for compliance folders (#5388) --- tools/releaseBuild/createComplianceFolder.ps1 | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/createComplianceFolder.ps1 b/tools/releaseBuild/createComplianceFolder.ps1 index 31b972b9bc..8e7dd922b0 100644 --- a/tools/releaseBuild/createComplianceFolder.ps1 +++ b/tools/releaseBuild/createComplianceFolder.ps1 @@ -13,7 +13,23 @@ foreach($folder in $ArtifactFolder) # Find Symbols zip which contains compliance files Write-Host "ArtifactFolder: $folder" $filename = Join-Path -Path $folder -ChildPath 'symbols.zip' - $name = Split-Path -Path $folder -Leaf + + $parentName = Split-Path -Path $folder -Leaf + + # Use simplified names because some of the compliance tools didn't like the full names + # decided not to use hashes because the names need to be consistent otherwise the tool also has issues + # which is another problem with the full name, it includes version. + if ($parentName -match 'x64' -or $parentName -match 'amd64') + { + $name = 'x64' + } + elseif ($parentName -match 'x86') { + $name = 'x86' + } + else + { + throw "$parentName could not be classified as x86 or x64" + } # Throw is compliance zip does not exist if (!(Test-Path $filename))