Browse Source

MSI: moved the component definitions to the Directory elements

master
Reece H. Dunn 9 years ago
parent
commit
3b1f91352d
1 changed files with 15 additions and 12 deletions
  1. 15
    12
      src/windows/installer/Product.wxs

+ 15
- 12
src/windows/installer/Product.wxs View File

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


<Feature Id="Core" Title="eSpeak NG" Level="1">
<ComponentGroupRef Id="CoreComponents" />
<Feature Id="All" Title="eSpeak NG" Level="1">
<ComponentGroupRef Id="CoreComponents"/>
</Feature> </Feature>
</Product> </Product>


<Fragment> <Fragment>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)"> <Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="INSTALLDIR" Name="eSpeak NG" />
<Directory Id="INSTALLDIR" Name="eSpeak NG">
<Component Id="espeak_ng_EXE" Win64="$(var.Win64)" Guid="220D42BC-89CD-4230-A458-CD31285EB152">
<File Name="$(var.espeak-ng.TargetFileName)" Source="$(var.espeak-ng.TargetPath)" KeyPath="yes"/>
</Component>
<Component Id="libespeak_ng_DLL" Win64="$(var.Win64)" Guid="AFDF57DE-D7E9-4781-BA0F-5D92FD56B045">
<File Name="$(var.libespeak-ng.TargetFileName)" Source="$(var.libespeak-ng.TargetPath)" KeyPath="yes"/>
<RegistryKey Root="HKLM" Key="SOFTWARE\eSpeak NG">
<RegistryValue Name="Path" Type="string" Value="[INSTALLDIR]"/>
</RegistryKey>
</Component>
</Directory>
</Directory> </Directory>
</Directory> </Directory>
</Fragment> </Fragment>


<Fragment> <Fragment>
<ComponentGroup Id="CoreComponents" Directory="INSTALLDIR"> <ComponentGroup Id="CoreComponents" Directory="INSTALLDIR">
<Component Win64="$(var.Win64)" Guid="220D42BC-89CD-4230-A458-CD31285EB152">
<File Name="$(var.espeak-ng.TargetFileName)" Source="$(var.espeak-ng.TargetPath)" KeyPath="yes"/>
</Component>
<Component Win64="$(var.Win64)" Guid="AFDF57DE-D7E9-4781-BA0F-5D92FD56B045">
<File Name="$(var.libespeak-ng.TargetFileName)" Source="$(var.libespeak-ng.TargetPath)" KeyPath="yes"/>
<RegistryKey Root="HKLM" Key="SOFTWARE\eSpeak NG" Action="createAndRemoveOnUninstall">
<RegistryValue Name="Path" Type="string" Value="[INSTALLDIR]"/>
</RegistryKey>
</Component>
<ComponentRef Id="espeak_ng_EXE"/>
<ComponentRef Id="libespeak_ng_DLL"/>
</ComponentGroup> </ComponentGroup>
</Fragment> </Fragment>
</Wix> </Wix>

Loading…
Cancel
Save