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

Make tidy happy

Browse source
This commit is contained in:
Fernando Jiménez Moreno 2018-09-11 17:51:46 +02:00
parent a56dc489d5
commit 8416061341
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
python/servo/package_commands.py
View file

@ -160,6 +160,7 @@ def copy_windows_dependencies(binary_path, destination):
else: else:
shutil.copy(nspr4_path, destination) shutil.copy(nspr4_path, destination)
def change_prefs(resources_path, platform): def change_prefs(resources_path, platform):
print("Swapping prefs") print("Swapping prefs")
prefs_path = path.join(resources_path, "prefs.json") prefs_path = path.join(resources_path, "prefs.json")
@ -368,19 +369,19 @@ class PackageCommands(CommandBase):
print("Packaged Servo into " + path.join(dir_to_msi, "Installer.msi")) print("Packaged Servo into " + path.join(dir_to_msi, "Installer.msi"))
# Download GStreamer installer. Only once. # Download GStreamer installer. Only once.
dir_to_gst_deps = path.join(dir_to_msi, 'Gstreamer.msi'); dir_to_gst_deps = path.join(dir_to_msi, 'Gstreamer.msi')
gstreamer_msi_path = path.join(target_dir, 'Gstreamer.msi'); gstreamer_msi_path = path.join(target_dir, 'Gstreamer.msi')
if os.path.exists(gstreamer_msi_path): if os.path.exists(gstreamer_msi_path):
shutil.copy(gstreamer_msi_path, dir_to_gst_deps) shutil.copy(gstreamer_msi_path, dir_to_gst_deps)
else: else:
print('Fetching GStreamer installer. This may take a while...') print('Fetching GStreamer installer. This may take a while...')
urllib.urlretrieve('https://gstreamer.freedesktop.org/data/pkg/windows/1.14.2/gstreamer-1.0-x86-1.14.2.msi', gstreamer_msi_path) 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 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')
dir_to_bundle_msi = path.join(dir_to_msi, 'Servo.msi')
try: try:
with cd(dir_to_msi): with cd(dir_to_msi):
subprocess.check_call(['candle', bundle_wxs_path, '-ext', 'WixBalExtension']) subprocess.check_call(['candle', bundle_wxs_path, '-ext', 'WixBalExtension'])