Skip to content

Commit

Permalink
Add installer for PDBs for better stack traces
Browse files Browse the repository at this point in the history
  • Loading branch information
barnson committed Feb 22, 2015
1 parent ecfe55e commit fee3e49
Show file tree
Hide file tree
Showing 7 changed files with 324 additions and 0 deletions.
82 changes: 82 additions & 0 deletions src/Setup/PdbMsi/Extensions.wxs
@@ -0,0 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<copyright file="Extensions.wxs" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<ComponentGroup Id="ExtensionPdbs" Directory="BinFolder">
<Component>
<File Source="WixBalExtension.pdb" />
</Component>

<Component>
<File Source="WixComPlusExtension.pdb" />
</Component>

<Component>
<File Source="WixDependencyExtension.pdb" />
</Component>

<Component>
<File Source="WixDifxAppExtension.pdb" />
</Component>

<Component>
<File Source="WixDirectXExtension.pdb" />
</Component>

<Component>
<File Source="WixFirewallExtension.pdb" />
</Component>

<Component>
<File Source="WixGamingExtension.pdb" />
</Component>

<Component>
<File Source="WixHttpExtension.pdb" />
</Component>

<Component>
<File Source="WixIIsExtension.pdb" />
</Component>

<Component>
<File Source="WixMsmqExtension.pdb" />
</Component>

<Component>
<File Source="WixNetFxExtension.pdb" />
</Component>

<Component>
<File Source="WixPSExtension.pdb" />
</Component>

<Component>
<File Source="WixSqlExtension.pdb" />
</Component>

<Component>
<File Source="WixTagExtension.pdb" />
</Component>

<Component>
<File Source="WixUIExtension.pdb" />
</Component>

<Component>
<File Source="WixUtilExtension.pdb" />
</Component>

<Component>
<File Source="WixVSExtension.pdb" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
33 changes: 33 additions & 0 deletions src/Setup/PdbMsi/Lux.wxs
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<copyright file="Lux.wxs" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->

<?include WixVer.wxi ?>

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<ComponentGroup Id="LuxPdbs" Directory="BinFolder">
<Component>
<File Source="lux.pdb" />
</Component>

<Component>
<File Source="LuxTasks.pdb" />
</Component>

<Component>
<File Source="nit.pdb" />
</Component>

<Component>
<File Source="WixLuxExtension.pdb" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
43 changes: 43 additions & 0 deletions src/Setup/PdbMsi/PdbMsi.wixproj
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8" ?>
<!--
<copyright file="PdbMsi.wixproj" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>F9A67AEE-4292-4F3A-B025-4B3B71CB4520</ProjectGuid>
<OutputName>pdbs</OutputName>
<OutputType>Package</OutputType>
<Cultures>en-us</Cultures>
<DefineConstants>$(DefineConstants);BuildVotive2010=$(VS2010SdkAvailable)</DefineConstants>
</PropertyGroup>

<ItemGroup>
<Compile Include="PdbMsi.wxs" />
<Compile Include="Extensions.wxs" />
<Compile Include="Lux.wxs" />
<Compile Include="Toolset.wxs" />
<Compile Include="Votive.wxs" />
</ItemGroup>

<ItemGroup>
<BindInputPaths Include="$(WixRoot)bin" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\CommonLib\CommonLib.wixproj" />
</ItemGroup>

<ItemGroup>
<WixExtension Include="WixTagExtension">
<HintPath>$(OutputPath_x86)WixTagExtension.dll</HintPath>
</WixExtension>
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
</Project>
30 changes: 30 additions & 0 deletions src/Setup/PdbMsi/PdbMsi.wxs
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<copyright file="PdbMsi.wxs" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->

<?include WixVer.wxi ?>

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:swid="http://schemas.microsoft.com/wix/TagExtension">
<Product Id="*" Name="!(loc.ShortProduct) v$(var.WixMajorMinor) PDBs" Language="1033" Manufacturer="!(loc.Company)"
Version="$(var.WixMsiProductVersion)" UpgradeCode="3618724B-2523-44F9-A908-866AA619504D">
<Package Compressed="yes" InstallerVersion="200" SummaryCodepage="1252" InstallScope="perMachine" />
<swid:Tag Regid="regid.2008-09.org.wixtoolset" Type="component" />

<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed." />

<MediaTemplate CabinetTemplate="pdbs{0}.cab" />

<Feature Id="Feature_PDBs" Title="WiX Toolset PDBs" Level="1">
<ComponentGroupRef Id="ToolsetPdbs" />
<ComponentGroupRef Id="ExtensionPdbs" />
<ComponentGroupRef Id="LuxPdbs" />
<ComponentGroupRef Id="VotivePdbs" />
</Feature>
</Product>
</Wix>
112 changes: 112 additions & 0 deletions src/Setup/PdbMsi/Toolset.wxs
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<copyright file="Toolset.wxs" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<ComponentGroup Id="ToolsetPdbs" Directory="BinFolder">
<Component>
<File Source="candle.pdb" />
</Component>

<Component>
<File Source="dark.pdb" />
</Component>

<Component>
<File Source="heat.pdb" />
</Component>

<Component>
<File Source="insignia.pdb" />
</Component>

<Component>
<File Source="light.pdb" />
</Component>

<Component>
<File Source="lit.pdb" />
</Component>

<Component>
<File Source="melt.pdb" />
</Component>

<Component>
<File Source="pyro.pdb" />
</Component>

<Component>
<File Source="shine.pdb" />
</Component>

<Component>
<File Source="smoke.pdb" />
</Component>

<Component>
<File Source="torch.pdb" />
</Component>

<Component>
<File Source="wconsole.pdb" />
</Component>

<Component>
<File Source="winterop.pdb" />
</Component>

<Component>
<File Source="wix.pdb" />
</Component>

<Component>
<File Source="WixCop.pdb" />
</Component>

<Component>
<File Source="WixTasks.pdb" />
</Component>

<Component>
<File Source="Microsoft.Deployment.Compression.pdb" />
</Component>

<Component>
<File Source="Microsoft.Deployment.Compression.Cab.pdb" />
</Component>

<Component>
<File Source="Microsoft.Deployment.Resources.pdb" />
</Component>

<Component>
<File Source="Microsoft.Deployment.WindowsInstaller.pdb" />
</Component>

<Component>
<File Source="Microsoft.Deployment.WindowsInstaller.Package.pdb" />
</Component>

<Component>
<File Source="ThmViewer.pdb" />
</Component>

<ComponentGroupRef Id="BurnPdbs" />
</ComponentGroup>
</Fragment>

<Fragment>
<ComponentGroup Id="BurnPdbs">
<Component Directory="BurnX86Folder">
<File Source="burn.pdb" />
</Component>
</ComponentGroup>
</Fragment>
</Wix>
23 changes: 23 additions & 0 deletions src/Setup/PdbMsi/Votive.wxs
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
<copyright file="2010.wxs" company="Outercurve Foundation">
Copyright (c) 2004, Outercurve Foundation.
This software is released under Microsoft Reciprocal License (MS-RL).
The license and further copyright text can be found in the file
LICENSE.TXT at the root directory of the distribution.
</copyright>
-->

<?include WixVer.wxi ?>

<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<ComponentGroup Id="VotivePdbs" Directory="BinFolder">
<?if $(var.BuildVotive2010)=true ?>
<Component>
<File Source="votive2010.pdb" />
</Component>
<?endif?>
</ComponentGroup>
</Fragment>
</Wix>
1 change: 1 addition & 0 deletions src/Setup/setup.proj
Expand Up @@ -14,6 +14,7 @@
</ProjectReference>

<ProjectReference Include="Bundle\Bundle.wixproj" />
<ProjectReference Include="PdbMsi\PdbMsi.wixproj" />
</ItemGroup>

<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\Traversal.targets" />
Expand Down

0 comments on commit fee3e49

Please sign in to comment.