fix uci installer deployment

Author: planetchili

IntelPresentMon/PMInstaller/PMInstaller.wixproj

@@ -139,7 +139,7 @@
     <!-- Build the wixlib first -->
     <MSBuild Projects="..\PMInstallerLib\PMInstallerLib.wixproj"
              Targets="Build"
-             Properties="Configuration=$(Configuration);Platform=$(Platform)" />
+             Properties="Configuration=$(Configuration);Platform=$(Platform);PMON_UCI_SDK_DIR=$(PMON_UCI_SDK_DIR)" />
     <ItemGroup>
       <WixLibrary Include="$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib"
                   Condition="Exists('$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib')" />

IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj

@@ -17,7 +17,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Library.wxs" />
-    <Compile Include="UciDist.wxs" />
+    <Compile Include="$(IntermediateOutputPath)\UciDist.wxs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
@@ -37,8 +37,9 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <Target Name="BeforeBuild">
-    <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot;" />
+  <Target Name="GenerateUciDistFragment" BeforeTargets="Compile">
+    <MakeDir Directories="$(IntermediateOutputPath)" />
+    <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(IntermediateOutputPath)\UciDist.wxs&quot;" />
   </Target>
   <Import Project="$(WixTargetsPath)" />
 </Project>

IntelPresentMon/PMInstallerLib/UciDist.wxs

@@ -1,5 +1,8 @@
-[CmdletBinding()]
-param()
+[CmdletBinding()]
+param(
+    [string]$UciSdkDir,
+    [string]$OutPath = 'UciDist.wxs'
+)
 
 function Get-DeterministicGuid {
     param(
@@ -33,7 +36,7 @@ function Write-EmptyUciDistFragment {
     $settings.NewLineChars = "`r`n"
     $settings.NewLineHandling = [System.Xml.NewLineHandling]::Replace
 
-    $writer = [System.Xml.XmlWriter]::Create((Join-Path $PSScriptRoot $OutPath), $settings)
+    $writer = [System.Xml.XmlWriter]::Create($OutPath, $settings)
     try {
         $writer.WriteStartDocument()
         $writer.WriteStartElement('Wix', 'http://schemas.microsoft.com/wix/2006/wi')
@@ -50,27 +53,32 @@ function Write-EmptyUciDistFragment {
     }
 }
 
-Push-Location $PSScriptRoot
+if ([string]::IsNullOrWhiteSpace($UciSdkDir)) {
+    $UciSdkDir = $env:PMON_UCI_SDK_DIR
+}
+if ([string]::IsNullOrWhiteSpace($UciSdkDir)) {
+    $UciSdkDir = Join-Path $PSScriptRoot '..\ControlLib\uci\external'
+}
 
-$uciSdkDir = $env:PMON_UCI_SDK_DIR
-if ([string]::IsNullOrWhiteSpace($uciSdkDir)) {
-    $uciSdkDir = '..\ControlLib\uci\external'
+$distPath = Join-Path $UciSdkDir 'bin'
+$outDir = Split-Path -Parent $OutPath
+if (-not [string]::IsNullOrWhiteSpace($outDir) -and -not (Test-Path $outDir -PathType Container)) {
+    New-Item -Path $outDir -ItemType Directory -Force | Out-Null
 }
 
-$distPath = Join-Path $uciSdkDir 'bin'
-$outPath = 'UciDist.wxs'
+Push-Location $PSScriptRoot
 
 if (-not (Test-Path $distPath -PathType Container)) {
     Pop-Location
     Write-Warning "UCI dist directory '$distPath' was not found. Skipping UCI payload files."
-    Write-EmptyUciDistFragment -OutPath $outPath
+    Write-EmptyUciDistFragment -OutPath $OutPath
     exit 0
 }
 
 if ($null -eq (Get-ChildItem -Path $distPath -Recurse -File -Force | Select-Object -First 1)) {
     Pop-Location
     Write-Warning "UCI dist directory '$distPath' contains no files. Skipping UCI payload files."
-    Write-EmptyUciDistFragment -OutPath $outPath
+    Write-EmptyUciDistFragment -OutPath $OutPath
     exit 0
 }
 
@@ -93,7 +101,7 @@ if (-not (Test-Path $heatExe)) {
     -cg uci_dist_files `
     -var var.UciDistDir `
     -suid -g1 -ag `
-    -out $outPath
+    -out $OutPath
 
 $code = $LASTEXITCODE
 if ($code -ne 0) {
@@ -102,7 +110,7 @@ if ($code -ne 0) {
     exit $code
 }
 
-[xml]$doc = Get-Content $outPath
+[xml]$doc = Get-Content $OutPath
 $ns = New-Object System.Xml.XmlNamespaceManager($doc.NameTable)
 $ns.AddNamespace('w', 'http://schemas.microsoft.com/wix/2006/wi')
 
@@ -128,7 +136,7 @@ $settings.IndentChars = '    '
 $settings.NewLineChars = "`r`n"
 $settings.NewLineHandling = [System.Xml.NewLineHandling]::Replace
 
-$writer = [System.Xml.XmlWriter]::Create((Resolve-Path $outPath), $settings)
+$writer = [System.Xml.XmlWriter]::Create((Resolve-Path $OutPath), $settings)
 try {
     $doc.Save($writer)
 }