mjohnson/espeak-ng
1
0
Fork 0
mirror of https://github.com/rhasspy/espeak-ng.git synced 2026-10-31 05:35:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

MSI: moved the component definitions to the Directory elements

Browse Source
This commit is contained in:
Reece H. Dunn
2016-01-30 20:13:41 +00:00
parent a3f0fea725
commit 3b1f91352d
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/windows/installer/Product.wxs
+15 -12
View File
@@ -16,30 +16,33 @@
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate />
<Feature Id="Core" Title="eSpeak NG" Level="1">
<ComponentGroupRef Id="CoreComponents" />
<Feature Id="All" Title="eSpeak NG" Level="1">
<ComponentGroupRef Id="CoreComponents"/>
</Feature>
</Product>
<Fragment>
<Directory Id="TARGETDIR" Name="SourceDir">
<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>
</Fragment>
<Fragment>
<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>
</Fragment>
</Wix>