Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-12 19:20:42 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

macdeploy: remove runHDIUtil in favor of directly calling subprocess.run

Browse Source
This commit is contained in:
fanquake 2020-11-11 15:29:00 +08:00
parent adaa26202b
commit a42aa94c54
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
1 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
contrib/macdeploy/macdeployqtplus
View File

@ -17,11 +17,12 @@
# #
import plistlib import plistlib
import subprocess, sys, re, os, shutil, stat, os.path import sys, re, os, shutil, stat, os.path
from argparse import ArgumentParser from argparse import ArgumentParser
from ds_store import DSStore from ds_store import DSStore
from mac_alias import Alias from mac_alias import Alias
from pathlib import Path from pathlib import Path
from subprocess import PIPE, run
from typing import List, Optional from typing import List, Optional
# This is ported from the original macdeployqt with modifications # This is ported from the original macdeployqt with modifications
@ -199,14 +200,13 @@ def getFrameworks(binaryPath: str, verbose: int) -> List[FrameworkInfo]:
if verbose: if verbose:
print("Inspecting with otool: " + binaryPath) print("Inspecting with otool: " + binaryPath)
otoolbin=os.getenv("OTOOL", "otool") otoolbin=os.getenv("OTOOL", "otool")
otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True) otool = run([otoolbin, "-L", binaryPath], stdout=PIPE, stderr=PIPE, universal_newlines=True)
o_stdout, o_stderr = otool.communicate()
if otool.returncode != 0: if otool.returncode != 0:
sys.stderr.write(o_stderr) sys.stderr.write(otool.stderr)
sys.stderr.flush() sys.stderr.flush()
raise RuntimeError("otool failed with return code {}".format(otool.returncode)) raise RuntimeError("otool failed with return code {}".format(otool.returncode))
otoolLines = o_stdout.split("\n") otoolLines = otool.stdout.split("\n")
otoolLines.pop(0) # First line is the inspected binary otoolLines.pop(0) # First line is the inspected binary
if ".framework" in binaryPath or binaryPath.endswith(".dylib"): if ".framework" in binaryPath or binaryPath.endswith(".dylib"):
otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency. otoolLines.pop(0) # Frameworks and dylibs list themselves as a dependency.
@ -225,7 +225,7 @@ def getFrameworks(binaryPath: str, verbose: int) -> List[FrameworkInfo]:
def runInstallNameTool(action: str, *args): def runInstallNameTool(action: str, *args):
installnametoolbin=os.getenv("INSTALLNAMETOOL", "install_name_tool") installnametoolbin=os.getenv("INSTALLNAMETOOL", "install_name_tool")
subprocess.check_call([installnametoolbin, "-"+action] + list(args)) run([installnametoolbin, "-"+action] + list(args), check=True)
def changeInstallName(oldName: str, newName: str, binaryPath: str, verbose: int): def changeInstallName(oldName: str, newName: str, binaryPath: str, verbose: int):
if verbose: if verbose:
@ -247,7 +247,7 @@ def runStrip(binaryPath: str, verbose: int):
if verbose: if verbose:
print("Using strip:") print("Using strip:")
print(" stripped", binaryPath) print(" stripped", binaryPath)
subprocess.check_call([stripbin, "-x", binaryPath]) run([stripbin, "-x", binaryPath], check=True)
def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional[str]: def copyFramework(framework: FrameworkInfo, path: str, verbose: int) -> Optional[str]:
if framework.sourceFilePath.startswith("Qt"): if framework.sourceFilePath.startswith("Qt"):
@ -658,23 +658,6 @@ ds.close()
if config.dmg is not None: if config.dmg is not None:
def runHDIUtil(verb: str, image_basename: str, **kwargs) -> int:
hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
if "capture_stdout" in kwargs:
del kwargs["capture_stdout"]
run = subprocess.check_output
else:
if verbose:
hdiutil_args.append("-verbose")
run = subprocess.check_call
for key, value in kwargs.items():
hdiutil_args.append("-" + key)
if value is not True:
hdiutil_args.append(str(value))
return run(hdiutil_args, universal_newlines=True)
print("+ Preparing .dmg disk image +") print("+ Preparing .dmg disk image +")
if verbose: if verbose:
@ -687,17 +670,14 @@ if config.dmg is not None:
if verbose: if verbose:
print("Creating temp image for modification...") print("Creating temp image for modification...")
try:
runHDIUtil("create", appname + ".temp", srcfolder="dist", format="UDRW", size=size, volname=appname, ov=True) tempname = appname + ".temp.dmg"
except subprocess.CalledProcessError as e:
sys.exit(e.returncode) run(["hdiutil", "create", tempname, "-srcfolder", "dist", "-format", "UDRW", "-size", str(size), "-volname", appname], check=True, universal_newlines=True)
if verbose: if verbose:
print("Attaching temp image...") print("Attaching temp image...")
try: output = run(["hdiutil", "attach", tempname, "-readwrite"], check=True, universal_newlines=True, stdout=PIPE).stdout
output = runHDIUtil("attach", appname + ".temp", readwrite=True, noverify=True, noautoopen=True, capture_stdout=True)
except subprocess.CalledProcessError as e:
sys.exit(e.returncode)
m = re.search(r"/Volumes/(.+$)", output) m = re.search(r"/Volumes/(.+$)", output)
disk_root = m.group(0) disk_root = m.group(0)
@ -714,15 +694,11 @@ if config.dmg is not None:
print("+ Finalizing .dmg disk image +") print("+ Finalizing .dmg disk image +")
subprocess.run(["hdiutil", "detach", "/Volumes/{}".format(appname)], universal_newlines=True) run(["hdiutil", "detach", "/Volumes/{}".format(appname)], universal_newlines=True)
try: run(["hdiutil", "convert", tempname, "-format", "UDZO", "-o", appname, "-imagekey", "zlib-level=9"], check=True, universal_newlines=True)
runHDIUtil("convert", appname + ".temp", format="UDBZ", o=appname + ".dmg", ov=True)
except subprocess.CalledProcessError as e:
print(e)
sys.exit(e.returncode)
os.unlink(appname + ".temp.dmg") os.unlink(tempname)
# ------------------------------------------------ # ------------------------------------------------