Merge branch 'release_6.0.0' into 2356_correct_behaviour_add_all_cons…

…traints
SasView · Jan 17, 2024 · 13d0f7a · 13d0f7a
2 parents 3eb3e0a + 5c1edfc
commit 13d0f7a
Showing 1 changed file with 34 additions and 3 deletions.
diff --git a/build_tools/code_sign_osx.py b/build_tools/code_sign_osx.py
@@ -15,13 +15,44 @@
     "SasView*.app/Contents/Resources/zmq/.dylibs/*.dylib", recursive=True
 )
 
+pyside_QtWebEngineProcessApp = glob.glob(
+    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Versions/A/Helpers/QtWebEngineProcess.app", recursive=True
+)
+
+pyside_QtWebEngineCore = glob.glob(
+    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Versions/A/QtWebEngineCore", recursive=True
+)
+
+pyside_QtWebEngineProcess_Helpers = glob.glob(
+    "SasView*.app/Contents/Resources/PySide6/Qt/lib/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app/Contents/MacOS/QtWebEngineProcess", recursive=True
+)
+
+pyside_Qtlibs = glob.glob(
+    "SasView*.app/Contents/Resources/PySide6/Qt/lib/Qt*.framework/Versions/A/Qt*", recursive=True
+)
+
+#pyside_libs = pyside_QtWebEngineCore + pyside_QtWebEngineProcess
+
 sign_command = ['codesign', '--timestamp', '--options=runtime', '--verify', '--verbose=4', '--force',
-                '--sign', 'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
+                '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
 
+sign_deep_command = ['codesign', '--timestamp', '--deep', '--options=runtime', '--verify', '--verbose=4', '--force',
+                 '--sign',  'Developer ID Application: European Spallation Source Eric (W2AG9MPZ43)']
 
-#TODO: Check if it is necesarry to do it per file (one long list maybe enough)
-for sfile in itertools.chain(so_list, dylib_list, dylib_list_resources, zmq_dylib_list_resources):
+#Signing QtWebEngineProcess.app first as it is a helper app
+for sfile in itertools.chain(pyside_QtWebEngineProcessApp):
+    sign_deep_command.append(sfile)
+    subprocess.check_call(sign_deep_command)
+    sign_deep_command.pop()
+
+for sfile in itertools.chain(so_list, dylib_list,
+                             dylib_list_resources,
+                             zmq_dylib_list_resources,
+                             pyside_QtWebEngineCore,
+                             pyside_QtWebEngineProcess_Helpers,
+                             pyside_Qtlibs):
     sign_command.append(sfile)
     subprocess.check_call(sign_command)
     sign_command.pop()
 
+