Auto merge of #21545 - ferjm:windows.nightly.gst.fix, r=Manishearth

Fix Windows nightly build

<!-- 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/21545)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-09-12 03:42:19 -04:00 committed by GitHub
commit 4c4c2515a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 64 additions and 1 deletions

19
support/windows/Servo.wxs Normal file
View file

@ -0,0 +1,19 @@
<?xml version="1.0"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Bundle Name="Servo"
Version="1.0"
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"
DisplayName="Servo"
ForcePerMachine="yes"/>
</Chain>
</Bundle>
</Wix>

View file

@ -40,6 +40,7 @@
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" />
</Component>
${include_directory(resources_path, "resources")}