From 713bf6df4261ed4e4e248e2fa7b41dcfa62176cd Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 1 Sep 2019 13:42:14 +0530
Subject: [PATCH] Get macOS signing working again

---
 bypy/macos/sign.py | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/bypy/macos/sign.py b/bypy/macos/sign.py
index ec6d68feb6..4199dce94e 100644
--- a/bypy/macos/sign.py
+++ b/bypy/macos/sign.py
@@ -91,28 +91,40 @@ def get_executable(info_path):
         return plistlib.load(f)['CFBundleExecutable']
 
 
+def find_sub_apps(contents_dir='.'):
+    for app in glob(os.path.join(contents_dir, '*.app')):
+        cdir = os.path.join(app, 'Contents')
+        for sapp in find_sub_apps(cdir):
+            yield sapp
+        yield app
+
+
+def sign_MacOS(contents_dir='.'):
+    # Sign everything in MacOS except the main executable
+    # which will be signed automatically by codesign when
+    # signing the app bundles
+    with current_dir(os.path.join(contents_dir, 'MacOS')):
+        exe = get_executable('../Info.plist')
+        items = {x for x in os.listdir('.') if x != exe and not os.path.islink(x)}
+        if items:
+            codesign(items)
+
+
 def do_sign_app(appdir):
     appdir = os.path.abspath(appdir)
     with current_dir(os.path.join(appdir, 'Contents')):
-        executables = {get_executable('Info.plist')}
-
+        sign_MacOS()
         # Sign the sub application bundles
-        sub_apps = glob('*.app')
-        for sa in sub_apps:
-            exe = get_executable(sa + '/Contents/Info.plist')
-            if exe in executables:
-                raise ValueError('Multiple app bundles share the same executable: %s' % exe)
-            executables.add(exe)
+        sub_apps = list(find_sub_apps())
         sub_apps.append('Frameworks/QtWebEngineCore.framework/Versions/Current/Helpers/QtWebEngineProcess.app')
+        for sa in sub_apps:
+            sign_MacOS(os.path.join(sa, 'Contents'))
         codesign(sub_apps)
 
-        # Sign everything in MacOS except the main executables of the various
-        # app bundles which will be signed automatically by codesign when
-        # signing the app bundles
-        for MacOS in ('MacOS', 'utils.app/Contents/MacOS'):
-            with current_dir(MacOS):
-                items = set(os.listdir('.')) - executables
-                codesign(expand_dirs(items))
+        # Sign everything in PlugIns
+        with current_dir('PlugIns'):
+            items = set(os.listdir('.'))
+            codesign(expand_dirs(items))
 
         # Sign everything in Frameworks
         with current_dir('Frameworks'):