Merge pull request #502 from GameTechDev/bug/installer-build-clean-up

Library and merge module build cleanup

Author: planetchili

IntelPresentMon/PMInstaller/PMInstaller.wixproj

@@ -30,6 +30,9 @@
     </LinkerAdditionalOptions>
     <SuppressIces>ICE60</SuppressIces>
   </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>$(DefineConstants);PM.ServiceDirId=service_folder</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="CefBinaries.wxs" />
     <Compile Include="CefResources.wxs" />
@@ -50,7 +53,7 @@
     <WixExtension Include="WixUtilExtension">
       <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
       <Name>WixUtilExtension</Name>
-    </WixExtension>      
+    </WixExtension>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Provider\Provider.vcxproj">
@@ -93,6 +96,14 @@
       <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
+    <ProjectReference Include="..\PMInstallerLib\PMInstallerLib.wixproj">
+      <Name>PMInstallerLib</Name>
+      <Project>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
     <ProjectReference Include="..\PresentMonAPI2Loader\PresentMonAPI2Loader.vcxproj">
       <Name>PresentMonAPI2Loader</Name>
       <Project>{8f86d067-2437-46fc-8f82-4d7155ceced7}</Project>
@@ -118,15 +129,27 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-      <WixLibrary Include="..\PMInstallerLib\bin\PMService.wixlib" />
-  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
-  <!--
+
+  <Target Name="AddReferencedWixLibs" BeforeTargets="Link">
+    <!-- Build the wixlib first -->
+    <MSBuild Projects="..\PMInstallerLib\PMInstallerLib.wixproj"
+             Targets="Build"
+             Properties="Configuration=$(Configuration);Platform=$(Platform)" />
+    <ItemGroup>
+      <WixLibrary Include="$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib"
+                  Condition="Exists('$(SolutionDir)build\$(Configuration)\PMInstallerLib.wixlib')" />
+    </ItemGroup>
+      <Message Text="@@ Linking wixlibs: @(WixLibrary)" Importance="High" />
+      <Error Condition="'@(WixLibrary)' == ''"
+             Text="No wixlib found under $(SolutionDir)build\$(Configuration)\ (or ...\en-us\). Build produced nothing." />
+  </Target>
+
+    <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.
 	<Target Name="BeforeBuild">

IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj

@@ -2,9 +2,9 @@
   <PropertyGroup>
     <!-- WiX 3.x library output -->
     <OutputType>Library</OutputType>
-    <OutputName>PMService</OutputName>
-    <IntermediateOutputPath>obj\</IntermediateOutputPath>
-    <OutputPath>bin\</OutputPath>
+    <OutputName>PMInstallerLib</OutputName>
+    <IntermediateOutputPath>$(SolutionDir)build\obj\$(MSBuildProjectName)-$(Platform)-$(Configuration)</IntermediateOutputPath>
+    <OutputPath>$(SolutionDir)build\$(Configuration)</OutputPath>
     <!-- Point these at YOUR WiX 3.x install -->
     <WixToolPath>$(WIX)bin\</WixToolPath>
     <WixTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>

IntelPresentMon/ServiceMergeModule/ServiceMergeModule.wixproj

@@ -3,7 +3,7 @@
     <!-- Build a MERGE MODULE -->
     <OutputType>Module</OutputType>
     <OutputName>PresentMonSharedService</OutputName>
-    <IntermediateOutputPath>obj\</IntermediateOutputPath>
+    <IntermediateOutputPath>$(SolutionDir)build\obj\$(MSBuildProjectName)-$(Platform)-$(Configuration)</IntermediateOutputPath>
     <OutputPath>$(SolutionDir)build\$(Configuration)\en-us\</OutputPath>
     <!-- Point to your WiX 3.11 install -->
     <WixToolPath>$(WIX)bin\</WixToolPath>
@@ -16,12 +16,18 @@
     <!-- The module authoring file -->
     <Compile Include="ServiceMergeModule.wxs" />
     <!-- Link your existing wixlib so we get ComponentGroup Id='service_files' -->
-    <WixLibrary Include="PMService">
-      <HintPath>..\PMInstallerLib\bin\PMService.wixlib</HintPath>
-      <Name>PMService</Name>
-    </WixLibrary>
     <!-- Add extensions only if your wixlib uses them -->
     <!-- <WixExtension Include="WixUtilExtension" /> -->
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\PMInstallerLib\PMInstallerLib.wixproj">
+      <Name>PMInstallerLib</Name>
+      <Project>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</Project>
+      <Private>True</Private>
+      <DoNotHarvest>True</DoNotHarvest>
+      <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
+      <RefTargetDir>INSTALLFOLDER</RefTargetDir>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
 </Project>