aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorUK992 <urbankrajnc92@gmail.com>2018-12-01 23:01:20 +0100
committerUK992 <urbankrajnc92@gmail.com>2018-12-01 23:54:57 +0100
commitd9294282a9e8166a636446de6c7ca05fda5be5bb (patch)
treea3731b211e5d64bf78cfaa91a0d562ccc0fd97d9 /python/servo
parent06910456e296689706127d42334a5c99aca4d70a (diff)
downloadservo-d9294282a9e8166a636446de6c7ca05fda5be5bb.tar.gz
servo-d9294282a9e8166a636446de6c7ca05fda5be5bb.zip
Remove GStreamer installer from Servo bundle
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/package_commands.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
index 661e805a1c4..83f308f1816 100644
--- a/python/servo/package_commands.py
+++ b/python/servo/package_commands.py
@@ -19,7 +19,6 @@ import shutil
import subprocess
import sys
import tempfile
-import urllib
from mach.decorators import (
CommandArgument,
@@ -415,14 +414,7 @@ class PackageCommands(CommandBase):
dir_to_installer = path.join(dir_to_msi, "Installer.msi")
print("Packaged Servo into " + dir_to_installer)
- # Download GStreamer installer. Only once.
- 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.
+ # Generate bundle with Servo installer.
print("Creating bundle")
shutil.copy(path.join(dir_to_root, 'support', 'windows', 'Servo.wxs'), dir_to_msi)
bundle_wxs_path = path.join(dir_to_msi, 'Servo.wxs')
@@ -439,7 +431,7 @@ class PackageCommands(CommandBase):
except subprocess.CalledProcessError as e:
print("WiX light exited with return value %d" % 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")
zip_path = path.join(dir_to_msi, "Servo.zip")