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

Auto merge of #21902 - ferjm:windows.installer.locate.gst, r=jdm

Browse source 
Windows installer: set GStreamer installation path based on registry …

…search

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #21839

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21902)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-10-10 19:29:22 -04:00 • committed by GitHub
commit 48bb94ded8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,6 +20,12 @@
<Media Id="1"
Cabinet="Servo.cab"
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="ProgramFiles64Folder" Name="PFiles">
<Directory Id="MozResearch" Name="Mozilla Research">
@ -39,8 +45,8 @@
Icon="servo.exe"
Advertise="yes"/>
</File>
${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" />
${include_dependencies()}
<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>
${include_directory(resources_path, "resources")}