Installer improvements for 1.0b3

MakeRelease.bat

@@ -1,3 +1,5 @@
+rmdir /S /Q ReleasePkg
+
 mkdir ReleasePkg\Aerofoil
 mkdir ReleasePkg\Aerofoil\Packaged
 mkdir ReleasePkg\Aerofoil\Resources
@@ -25,6 +27,8 @@ xcopy /I /E /Y /K Documentation ReleasePkg\Aerofoil\Documentation
 
 attrib +R Packaged\Houses\*
 
+rmdir /S /Q InstallerPackages
+
 mkdir InstallerPackages
 mkdir InstallerPackages\DefaultHouses
 mkdir InstallerPackages\HousePack1

ReleasePackageInstaller/Product.wxs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Aerofoil" Language="1033" Version="0.2.2.0" Manufacturer="The Aerofoil Project" UpgradeCode="2ae0587c-2a5f-4299-b5a8-e6cfed7cd84c">
+	<Product Id="*" Name="Aerofoil" Language="1033" Version="0.2.3.0" Manufacturer="The Aerofoil Project" UpgradeCode="2ae0587c-2a5f-4299-b5a8-e6cfed7cd84c">
     <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine">
     </Package>
 
@@ -31,7 +31,6 @@
       </Directory>
     </Directory>
 
-
     <DirectoryRef Id="AEROFOILPRODUCTDIR">
       <Component Id="Aerofoil.exe" Guid="*">
         <File Id="Aerofoil.exe" Source="$(var.Aerofoil.TargetPath)" KeyPath="yes" Checksum="yes" />
@@ -109,22 +108,13 @@
       </Component>
     </DirectoryRef>
 
-    <Feature Id="AerofoilApplication" Title="Glider PRO Game Data" Level="1" Display="expand" ConfigurableDirectory="AEROFOILPRODUCTDIR">
+    <Feature Id="AerofoilApplicationFeature" Title="Glider PRO Game Data" Level="1" Display="expand" ConfigurableDirectory="AEROFOILPRODUCTDIR" Description="!(loc.AerofoilApplicationFeatureDescription)">
       <ComponentRef Id="Aerofoil.exe" />
       <ComponentRef Id="FreeType.dll" />
       <ComponentRef Id="GpApp.dll" />
       <ComponentRef Id="GpAudioDriver_XAudio2.dll" />
       <ComponentRef Id="GpDisplayDriver_D3D11.dll" />
       <ComponentRef Id="GpInputDriver_XInput.dll" />
-
-      <ComponentRef Id="bin2gp.exe" />
-      <ComponentRef Id="flattenmov.exe" />
-      <ComponentRef Id="FTagData.exe" />
-      <ComponentRef Id="gpr2gpa.exe" />
-      <ComponentRef Id="hqx2bin.exe" />
-      <ComponentRef Id="hqx2gp.exe" />
-      <ComponentRef Id="MakeTimestamp.exe" />
-      <ComponentRef Id="unpacktool.exe" />
       
       <ComponentRef Id="ApplicationResources" />
 
@@ -138,12 +128,25 @@
 
       <ComponentRef Id="StartMenuShortcuts" />
 
-      <Feature Id="HousePack1Feature" Title="Additional Houses" Level="1">
+      <Feature Id="HousePack1Feature" Title="Additional Houses" Level="1" Description="!(loc.HousePack1FeatureDescription)">
         <ComponentGroupRef Id="HousePack1ComponentGroup" />
       </Feature>
+
+      <Feature Id="ImportToolsFeature" Title="Data Import Utilities" Level="2" Description="!(loc.ImportToolsFeatureDescription)">
+        <ComponentRef Id="bin2gp.exe" />
+        <ComponentRef Id="flattenmov.exe" />
+        <ComponentRef Id="FTagData.exe" />
+        <ComponentRef Id="gpr2gpa.exe" />
+        <ComponentRef Id="hqx2bin.exe" />
+        <ComponentRef Id="hqx2gp.exe" />
+        <ComponentRef Id="MakeTimestamp.exe" />
+        <ComponentRef Id="unpacktool.exe" />
+      </Feature>
     </Feature>
 
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\LICENSE.rtf"/>
+    <WixVariable Id="WixUIDialogBmp" Value="$(var.ProjectDir)\DialogBanner.png"/>
+    <WixVariable Id="WixUIBannerBmp" Value="$(var.ProjectDir)\TopBanner.bmp"/>
 
     <DirectoryRef Id="TARGETDIR">
       <Merge Id="VCRedist" SourceFile="C:\Program Files (x86)\Common Files\Merge Modules\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" />

ReleasePackageInstaller/ReleasePackageInstaller.wixproj

@@ -18,6 +18,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
     <OutputPath>$(SolutionDir)ReleasePkg\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <Cultures>en-us</Cultures>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -146,6 +147,9 @@
       <Name>WixUIExtension</Name>
     </WixExtension>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Strings-en-us.wxl" />
+  </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' ">
@@ -216,12 +220,4 @@ PackagedDataDir=$(SolutionDir)\Packaged;
 call ConvertResources.bat
 call MakeRelease.bat</PreBuildEvent>
   </PropertyGroup>
-  <!--
-	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">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
 </Project>

ReleasePackageInstaller/Strings-en-us.wxl

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization">
+	<String Id="AerofoilApplicationFeatureDescription">Installs the base game and the main houses (Slumberland and Demo House)</String>
+  <String Id="HousePack1FeatureDescription">Installs additional houses from the Glider PRO&#8482; CD-ROM and the CD demo house from the open source release.</String>
+  <String Id="ImportToolsFeatureDescription">Installs tools for importing houses created by the original Macintosh version of Glider PRO&#8482;.</String>
+</WixLocalization>