mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Remove GStreamer installer from Servo bundle
This commit is contained in:
parent
06910456e2
commit
d9294282a9
3 changed files with 3 additions and 22 deletions
|
@ -19,7 +19,6 @@ import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import sys
|
import sys
|
||||||
import tempfile
|
import tempfile
|
||||||
import urllib
|
|
||||||
|
|
||||||
from mach.decorators import (
|
from mach.decorators import (
|
||||||
CommandArgument,
|
CommandArgument,
|
||||||
|
@ -415,14 +414,7 @@ class PackageCommands(CommandBase):
|
||||||
dir_to_installer = path.join(dir_to_msi, "Installer.msi")
|
dir_to_installer = path.join(dir_to_msi, "Installer.msi")
|
||||||
print("Packaged Servo into " + dir_to_installer)
|
print("Packaged Servo into " + dir_to_installer)
|
||||||
|
|
||||||
# Download GStreamer installer. Only once.
|
# Generate bundle with Servo installer.
|
||||||
gstreamer_msi_path = path.join(dir_to_msi, 'Gstreamer.msi')
|
|
||||||
if not os.path.exists(gstreamer_msi_path):
|
|
||||||
print('Fetching GStreamer installer. This may take a while...')
|
|
||||||
gstreamer_url = 'https://gstreamer.freedesktop.org/data/pkg/windows/1.14.2/gstreamer-1.0-x86-1.14.2.msi'
|
|
||||||
urllib.urlretrieve(gstreamer_url, gstreamer_msi_path)
|
|
||||||
|
|
||||||
# Generate bundle with GStreamer and Servo installers.
|
|
||||||
print("Creating bundle")
|
print("Creating bundle")
|
||||||
shutil.copy(path.join(dir_to_root, 'support', 'windows', 'Servo.wxs'), dir_to_msi)
|
shutil.copy(path.join(dir_to_root, 'support', 'windows', 'Servo.wxs'), dir_to_msi)
|
||||||
bundle_wxs_path = path.join(dir_to_msi, 'Servo.wxs')
|
bundle_wxs_path = path.join(dir_to_msi, 'Servo.wxs')
|
||||||
|
@ -439,7 +431,7 @@ class PackageCommands(CommandBase):
|
||||||
except subprocess.CalledProcessError as e:
|
except subprocess.CalledProcessError as e:
|
||||||
print("WiX light exited with return value %d" % e.returncode)
|
print("WiX light exited with return value %d" % e.returncode)
|
||||||
return e.returncode
|
return e.returncode
|
||||||
print("Packaged Servo into " + path.join(dir_to_msi, "Servo.msi"))
|
print("Packaged Servo into " + path.join(dir_to_msi, "Servo.exe"))
|
||||||
|
|
||||||
print("Creating ZIP")
|
print("Creating ZIP")
|
||||||
zip_path = path.join(dir_to_msi, "Servo.zip")
|
zip_path = path.join(dir_to_msi, "Servo.zip")
|
||||||
|
|
|
@ -5,10 +5,6 @@
|
||||||
UpgradeCode="91b09c7e-6c0d-4166-b806-1dc724acf728">
|
UpgradeCode="91b09c7e-6c0d-4166-b806-1dc724acf728">
|
||||||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" />
|
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense" />
|
||||||
<Chain>
|
<Chain>
|
||||||
<MsiPackage
|
|
||||||
SourceFile="Gstreamer.msi"
|
|
||||||
DisplayName="GStreamer"
|
|
||||||
ForcePerMachine="yes"/>
|
|
||||||
<MsiPackage
|
<MsiPackage
|
||||||
SourceFile="Installer.msi"
|
SourceFile="Installer.msi"
|
||||||
Compressed="yes"
|
Compressed="yes"
|
||||||
|
|
|
@ -20,12 +20,6 @@
|
||||||
<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">
|
||||||
|
@ -45,8 +39,7 @@
|
||||||
Icon="servo.exe"
|
Icon="servo.exe"
|
||||||
Advertise="yes"/>
|
Advertise="yes"/>
|
||||||
</File>
|
</File>
|
||||||
${include_dependencies()}
|
${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>
|
</Component>
|
||||||
|
|
||||||
${include_directory(resources_path, "resources")}
|
${include_directory(resources_path, "resources")}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue