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

Package: Update Windows packaging

Browse source
This commit is contained in:
UK992 2018-10-16 23:53:53 +02:00
parent c4b5c944c0
commit 06910456e2
1 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

37
python/servo/package_commands.py
View file

@ -147,26 +147,9 @@ def copy_dependencies(binary_path, lib_path):
def copy_windows_dependencies(binary_path, destination): def copy_windows_dependencies(binary_path, destination):
deps = [ for f in os.listdir(binary_path):
"libcryptoMD.dll", if os.path.isfile(path.join(binary_path, f)) and f.endswith(".dll"):
"libsslMD.dll", shutil.copy(path.join(binary_path, f), destination)
]
for d in deps:
shutil.copy(path.join(binary_path, d), destination)
# Search for the generated nspr4.dll
build_path = path.join(binary_path, "build")
nspr4 = "nspr4.dll"
nspr4_path = None
for root, dirs, files in os.walk(build_path):
if nspr4 in files:
nspr4_path = path.join(root, nspr4)
break
if nspr4_path is None:
print("WARNING: could not find nspr4.dll")
else:
shutil.copy(nspr4_path, destination)
def change_prefs(resources_path, platform, vr=False): def change_prefs(resources_path, platform, vr=False):
@ -397,11 +380,10 @@ class PackageCommands(CommandBase):
print("Copying files") print("Copying files")
dir_to_temp = path.join(dir_to_msi, 'temp') dir_to_temp = path.join(dir_to_msi, 'temp')
dir_to_temp_servo = path.join(dir_to_temp, 'servo') dir_to_resources = path.join(dir_to_temp, 'resources')
dir_to_resources = path.join(dir_to_temp_servo, 'resources')
shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources) shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources)
shutil.copy(binary_path, dir_to_temp_servo) shutil.copy(binary_path, dir_to_temp)
copy_windows_dependencies(target_dir, dir_to_temp_servo) copy_windows_dependencies(target_dir, dir_to_temp)
change_prefs(dir_to_resources, "windows") change_prefs(dir_to_resources, "windows")
@ -412,7 +394,7 @@ class PackageCommands(CommandBase):
wxs_path = path.join(dir_to_msi, "Installer.wxs") wxs_path = path.join(dir_to_msi, "Installer.wxs")
open(wxs_path, "w").write(template.render( open(wxs_path, "w").write(template.render(
exe_path=target_dir, exe_path=target_dir,
dir_to_temp=dir_to_temp_servo, dir_to_temp=dir_to_temp,
resources_path=dir_to_resources)) resources_path=dir_to_resources))
# run candle and light # run candle and light
@ -460,8 +442,9 @@ class PackageCommands(CommandBase):
print("Packaged Servo into " + path.join(dir_to_msi, "Servo.msi")) print("Packaged Servo into " + path.join(dir_to_msi, "Servo.msi"))
print("Creating ZIP") print("Creating ZIP")
shutil.make_archive(path.join(dir_to_msi, "Servo"), "zip", dir_to_temp) zip_path = path.join(dir_to_msi, "Servo.zip")
print("Packaged Servo into " + path.join(dir_to_msi, "Servo.zip")) archive_deterministically(dir_to_temp, zip_path, prepend_path='servo/')
print("Packaged Servo into " + zip_path)
print("Cleaning up") print("Cleaning up")
delete(dir_to_temp) delete(dir_to_temp)