Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ PresentData/PresentData.args.json
# Make sure internal source isn't unintentionally committed to public repositories
IntelPresentMon/PresentMonAPI2/Internal.h

# PMInstallerLib heat output (see PMInstallerLib.wixproj GenerateUciDistFragment)
IntelPresentMon/PMInstallerLib/Generated/

# Reflector Tool
Reflector/bin/**
Reflector/obj/**
Expand Down
1 change: 1 addition & 0 deletions IntelPresentMon/ControlLib/uci/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
dist/
external/
external-off/
10 changes: 7 additions & 3 deletions IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<!-- WiX 3.x library output -->
<OutputType>Library</OutputType>
<OutputName>PMInstallerLib</OutputName>
Expand All @@ -14,10 +16,12 @@
<!-- Optional: ask lit.exe to embed files into the .wixlib -->
<BindFiles>true</BindFiles>
<ProjectGuid>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</ProjectGuid>
<!-- Keep generated authoring under the project dir so Visual Studio can load the wixproj. -->
<UciDistFragmentPath>Generated\UciDist.wxs</UciDistFragmentPath>
</PropertyGroup>
<ItemGroup>
<Compile Include="Library.wxs" />
<Compile Include="$(IntermediateOutputPath)\UciDist.wxs" />
<Compile Include="$(UciDistFragmentPath)" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
Expand All @@ -38,8 +42,8 @@
</ProjectReference>
</ItemGroup>
<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;" />
<MakeDir Directories="$(MSBuildProjectDirectory)\Generated" />
Comment thread
planetchili marked this conversation as resolved.
<Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(MSBuildProjectDirectory)\$(UciDistFragmentPath)&quot;" />
</Target>
<Import Project="$(WixTargetsPath)" />
</Project>