Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Windows installer: set GStreamer installation path based on registry search

Browse source
This commit is contained in:
Fernando Jimenez Moreno 2018-10-10 15:35:06 +02:00
parent d048aa9c51
commit 593f69c348
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
support/windows/Servo.wxs.mako
View file

@ -20,6 +20,12 @@
<Media Id="1" <Media Id="1"
Cabinet="Servo.cab" Cabinet="Servo.cab"
EmbedCab="yes"/> EmbedCab="yes"/>
<Property Id="GSTINSTALLDIR">
<RegistrySearch Id="GStreamerRegistry" Type="raw" Root="HKLM" Key="SOFTWARE\WOW6432Node\GStreamer1.0\x86" Name="InstallDir"/>
</Property>
<Property Id="GSTINSTALLDIR64">
<RegistrySearch Id="GStreamerRegistry64" Type="raw" Root="HKLM" Key="SOFTWARE\WOW6432Node\GStreamer1.0\x86_64" Name="InstallDir"/>
</Property>
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="PFiles"> <Directory Id="ProgramFiles64Folder" Name="PFiles">
<Directory Id="MozResearch" Name="Mozilla Research"> <Directory Id="MozResearch" Name="Mozilla Research">
@ -40,7 +46,7 @@
Advertise="yes"/> Advertise="yes"/>
</File> </File>
${include_dependencies()} ${include_dependencies()}
<Environment Id="PATH" Name="PATH" Value="C:\gstreamer\1.0\x86\bin;C:\gstreamer\1.0\x86_64\bin" Permanent="yes" Part="last" Action="set" System="yes" /> <Environment Id="PATH" Name="PATH" Value="[GSTINSTALLDIR]\1.0\x86\bin;[GSTINSTALLDIR64]\1.0\x86_64\bin" Permanent="yes" Part="last" Action="set" System="yes" />
</Component> </Component>
${include_directory(resources_path, "resources")} ${include_directory(resources_path, "resources")}