Remove GStreamer installer from Servo bundle

servo · Dec 1, 2018 · d929428 · d929428
1 parent 0691045
commit d929428
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/python/servo/package_commands.py b/python/servo/package_commands.py
@@ -19,7 +19,6 @@
 import subprocess
 import sys
 import tempfile
-import urllib
 
 from mach.decorators import (
     CommandArgument,
@@ -415,14 +414,7 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug=
             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 @@ def package(self, release=False, dev=False, android=None, magicleap=None, debug=
             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")

diff --git a/support/windows/Servo.wxs b/support/windows/Servo.wxs
@@ -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"

diff --git a/support/windows/Servo.wxs.mako b/support/windows/Servo.wxs.mako
@@ -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")}