mirror of
https://github.com/servo/servo.git
synced 2025-07-01 20:43:39 +01:00
Auto merge of #20316 - UK992:win32-icon, r=jdm
Windows: Add icon to servo.exe Based on https://github.com/servo/servo/pull/11969 --- - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/20316) <!-- Reviewable:end -->
This commit is contained in:
commit
840c44e2a8
7 changed files with 33 additions and 9 deletions
|
@ -354,9 +354,6 @@ class MachCommands(CommandBase):
|
|||
if status == 0:
|
||||
if sys.platform == "win32":
|
||||
servo_exe_dir = path.join(base_path, "debug" if dev else "release")
|
||||
# On windows, copy in our manifest
|
||||
shutil.copy(path.join(self.get_top_dir(), "components", "servo", "servo.exe.manifest"),
|
||||
servo_exe_dir)
|
||||
|
||||
msvc_x64 = "64" if "x86_64" in (target or host_triple()) else ""
|
||||
# on msvc builds, use editbin to change the subsystem to windows, but only
|
||||
|
|
|
@ -317,7 +317,6 @@ class PackageCommands(CommandBase):
|
|||
dir_to_resources = path.join(dir_to_temp_servo, 'resources')
|
||||
shutil.copytree(path.join(dir_to_root, 'resources'), dir_to_resources)
|
||||
shutil.copy(binary_path, dir_to_temp_servo)
|
||||
shutil.copy("{}.manifest".format(binary_path), dir_to_temp_servo)
|
||||
copy_windows_dependencies(target_dir, dir_to_temp_servo)
|
||||
|
||||
change_prefs(dir_to_resources, "windows")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue