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

Remove GStreamer installer from Servo bundle

Browse source
This commit is contained in:
UK992 2018-12-01 23:01:20 +01:00
parent 06910456e2
commit d9294282a9
3 changed files with 3 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
support/windows/Servo.wxs
View file

@ -5,10 +5,6 @@
UpgradeCode="91b09c7e-6c0d-4166-b806-1dc724acf728">
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" />
<Chain>
<MsiPackage
SourceFile="Gstreamer.msi"
DisplayName="GStreamer"
ForcePerMachine="yes"/>
<MsiPackage
SourceFile="Installer.msi"
Compressed="yes"

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

@ -20,12 +20,6 @@
<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">
@ -45,8 +39,7 @@
Icon="servo.exe"
Advertise="yes"/>
</File>
${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" />
${include_dependencies()}
</Component>
${include_directory(resources_path, "resources")}