build: perform all .tiff copying in macdeployqtplus

By copying the .tiff earlier in the macdeploy process, we can unify the logic in
the deploy script.
This commit is contained in:
fanquake
2022-01-05 12:37:09 +08:00
parent f421de5be6
commit dac6936719
2 changed files with 11 additions and 14 deletions

View File

@@ -544,6 +544,16 @@ ds.close()
if platform.system() == "Darwin":
subprocess.check_call(f"codesign --deep --force --sign - {target}", shell=True)
print("+ Installing background.tiff +")
bg_path = os.path.join('dist', '.background', 'background.tiff')
os.mkdir(os.path.dirname(bg_path))
tiff_path = os.path.join('contrib', 'macdeploy', 'background.tiff')
shutil.copy2(tiff_path, bg_path)
# ------------------------------------------------
if config.dmg is not None:
print("+ Preparing .dmg disk image +")
@@ -570,14 +580,6 @@ if config.dmg is not None:
m = re.search(r"/Volumes/(.+$)", output)
disk_root = m.group(0)
print("+ Applying fancy settings +")
bg_path = os.path.join(disk_root, ".background", os.path.basename('background.tiff'))
os.mkdir(os.path.dirname(bg_path))
if verbose:
print('background.tiff', "->", bg_path)
shutil.copy2('contrib/macdeploy/background.tiff', bg_path)
os.symlink("/Applications", os.path.join(disk_root, "Applications"))
print("+ Finalizing .dmg disk image +")