Simplify MSI projects.
diff --git a/Tools/msi/launcher/launcher.props b/Tools/msi/launcher/launcher.props
deleted file mode 100644
index b145efe..0000000
--- a/Tools/msi/launcher/launcher.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\msi.props" />
- <ItemGroup>
- <Compile Include="*.wxs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="*.wxl" />
- </ItemGroup>
-
- <Import Project="..\msi.targets" />
-</Project>
\ No newline at end of file
diff --git a/Tools/msi/launcher/launcher.wixproj b/Tools/msi/launcher/launcher.wixproj
index 2d06df0..73f26a8 100644
--- a/Tools/msi/launcher/launcher.wixproj
+++ b/Tools/msi/launcher/launcher.wixproj
@@ -5,7 +5,16 @@
<SchemaVersion>2.0</SchemaVersion>
<OutputName>launcher</OutputName>
<OutputType>Package</OutputType>
- <DefineConstants>IncludeDefaultFeature=1;$(DefineConstants)</DefineConstants>
</PropertyGroup>
- <Import Project="launcher.props" />
+ <Import Project="..\msi.props" />
+ <ItemGroup>
+ <Compile Include="launcher.wxs" />
+ <Compile Include="launcher_files.wxs" />
+ <Compile Include="launcher_reg.wxs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="*.wxl" />
+ </ItemGroup>
+
+ <Import Project="..\msi.targets" />
</Project>
\ No newline at end of file
diff --git a/Tools/msi/launcher/launcher.wxs b/Tools/msi/launcher/launcher.wxs
index fe88ba5..b20cff8 100644
--- a/Tools/msi/launcher/launcher.wxs
+++ b/Tools/msi/launcher/launcher.wxs
@@ -8,7 +8,6 @@
<PropertyRef Id="UpgradeTable" />
<PropertyRef Id="ARPPRODUCTICON" />
- <?ifdef IncludeDefaultFeature ?>
<Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
<ComponentGroupRef Id="launcher_exe" Primary="yes" />
</Feature>
@@ -16,12 +15,6 @@
<ComponentGroupRef Id="launcher_exe" />
<ComponentGroupRef Id="launcher_reg" />
</Feature>
- <?endif ?>
- <?ifdef IncludeSymbols ?>
- <Feature Id="Symbols" AllowAdvertise="no" Title="!(loc.TitlePdb)" Description="!(loc.DescriptionPdb)">
- <ComponentGroupRef Id="launcher_pdb" />
- </Feature>
- <?endif ?>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="LauncherInstallDirectory" />
diff --git a/Tools/msi/launcher/launcher_files.wxs b/Tools/msi/launcher/launcher_files.wxs
index 65f1193..9606dc6 100644
--- a/Tools/msi/launcher/launcher_files.wxs
+++ b/Tools/msi/launcher/launcher_files.wxs
@@ -21,15 +21,4 @@
</Component>
</ComponentGroup>
</Fragment>
-
- <Fragment>
- <ComponentGroup Id="launcher_pdb">
- <Component Id="py.pdb" Directory="LauncherInstallDirectory" Guid="*">
- <File Id="py.pdb" Name="py.pdb" Source="py.pdb" />
- </Component>
- <Component Id="pyw.pdb" Directory="LauncherInstallDirectory" Guid="*">
- <File Id="pyw.pdb" Name="pyw.pdb" Source="pyw.pdb" />
- </Component>
- </ComponentGroup>
- </Fragment>
</Wix>
diff --git a/Tools/msi/launcher/launcher_pdb.wixproj b/Tools/msi/launcher/launcher_pdb.wixproj
deleted file mode 100644
index 3efdd7f..0000000
--- a/Tools/msi/launcher/launcher_pdb.wixproj
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectGuid>{A21D4A23-483F-4822-A0B1-FCB14D8CEBA7}</ProjectGuid>
- <SchemaVersion>2.0</SchemaVersion>
- <OutputName>launcher_pdb</OutputName>
- <OutputType>Package</OutputType>
- <DefineConstants>IncludeSymbols=1;$(DefineConstants)</DefineConstants>
- </PropertyGroup>
- <Import Project="launcher.props" />
-</Project>
\ No newline at end of file