From f9109850a6c8b5ac6ffc0532f4f0476fbf56c9ea Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Sun, 1 Aug 2021 22:23:56 -0400
Subject: [PATCH] Remove tools from install package so they can be split off
 into a separate download.

---
 ReleasePackageInstaller/Product.wxs       | 43 -----------------------
 ReleasePackageInstaller/Strings-en-us.wxl |  1 -
 2 files changed, 44 deletions(-)

diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 642c4cb..9c9f86a 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -38,7 +38,6 @@
             <Directory Id="AEROFOILHOUSESDIR" Name="Houses" />
           </Directory>
           <Directory Id="AEROFOILDOCUMENTATIONDIR" Name="Documentation" />
-          <Directory Id="AEROFOILTOOLSDIR" Name="Tools" />
         </Directory>
       </Directory>
 
@@ -82,36 +81,6 @@
       </Component>
     </DirectoryRef>
 
-    <DirectoryRef Id="AEROFOILTOOLSDIR">
-      <Component Id="bin2gp.exe" Guid="*">
-        <File Id="bin2gp.exe" Source="$(var.bin2gp.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="flattenmov.exe" Guid="*">
-        <File Id="flattenmov.exe" Source="$(var.flattenmov.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="FTagData.exe" Guid="*">
-        <File Id="FTagData.exe" Source="$(var.FTagData.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="gpr2gpa.exe" Guid="*">
-        <File Id="gpr2gpa.exe" Source="$(var.gpr2gpa.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="hqx2bin.exe" Guid="*">
-        <File Id="hqx2bin.exe" Source="$(var.hqx2bin.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="hqx2gp.exe" Guid="*">
-        <File Id="hqx2gp.exe" Source="$(var.hqx2gp.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="MakeTimestamp.exe" Guid="*">
-        <File Id="MakeTimestamp.exe" Source="$(var.MakeTimestamp.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="unpacktool.exe" Guid="*">
-        <File Id="unpacktool.exe" Source="$(var.unpacktool.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-      <Component Id="MergeGPF.exe" Guid="*">
-        <File Id="MergeGPF.exe" Source="$(var.MergeGPF.TargetPath)" KeyPath="yes" Checksum="yes"/>
-      </Component>
-    </DirectoryRef>
-
     <DirectoryRef Id="AEROFOILDOCUMENTATIONDIR">
       <Component Id="readme.txt" Guid="*">
         <File Id="readme.txt" Source="$(var.DocumentationDataDir)\readme.txt" KeyPath="yes" Checksum="yes"/>
@@ -170,18 +139,6 @@
       <Feature Id="HousePack1Feature" Title="Additional Houses" Level="1" Description="!(loc.HousePack1FeatureDescription)">
         <ComponentGroupRef Id="HousePack1ComponentGroup" />
       </Feature>
-
-      <Feature Id="ImportToolsFeature" Title="Data Import Utilities" Level="4" 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" />
-        <ComponentRef Id="MergeGPF.exe" />
-      </Feature>
     </Feature>
 
     <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)\LICENSE.rtf"/>
diff --git a/ReleasePackageInstaller/Strings-en-us.wxl b/ReleasePackageInstaller/Strings-en-us.wxl
index 4690eb3..d661543 100644
--- a/ReleasePackageInstaller/Strings-en-us.wxl
+++ b/ReleasePackageInstaller/Strings-en-us.wxl
@@ -2,5 +2,4 @@
 <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 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.</String>
 </WixLocalization>