From b94df17ae56583c8139cd225dcc69e032fe8d788 Mon Sep 17 00:00:00 2001
From: Arto Kitula <arto.kitula@gmail.com>
Date: Fri, 12 Jul 2019 14:44:16 +0200
Subject: macOS: remove hardcoded paths for code signing python/dylib/so

Differential Revision: https://developer.blender.org/D5234
---
 release/darwin/bundle.sh | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'release/darwin')

diff --git a/release/darwin/bundle.sh b/release/darwin/bundle.sh
index 73fba0f30e6..fed91d26b7f 100755
--- a/release/darwin/bundle.sh
+++ b/release/darwin/bundle.sh
@@ -124,11 +124,17 @@ sleep 5
 
 if [ ! -z "${C_CERT}" ]; then
     # Codesigning requires all libs and binaries to be signed separately.
-    # TODO: use find to get the list automatically
-    echo -n "Codesigning..."
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${_mount_dir}/Blender.app/Contents/Resources/*/python/bin/python*"
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${_mount_dir}/Blender.app/Contents/Resources/*/python/lib/python*/site-packages/libextern_draco.dylib"
-    codesign --timestamp --options runtime --sign "${C_CERT}" "${_mount_dir}/Blender.app/Contents/Resources/lib/libomp.dylib"
+    echo -n "Codesigning Python"
+    for f in $(find "${_mount_dir}/Blender.app/Contents/Resources" -name "python*"); do
+	if [ -x ${f} ] && [ ! -d ${f} ]; then
+	    codesign --timestamp --options runtime --sign "${C_CERT}" "${f}"
+	fi
+    done
+    echo ; echo -n "Codesigning .dylib and .so libraries"
+    for f in $(find "${_mount_dir}/Blender.app" -name "*.dylib" -o -name "*.so"); do
+	codesign --timestamp --options runtime --sign "${C_CERT}" "${f}"
+    done
+    echo ; echo -n "Codesigning Blender.app"
     codesign --timestamp --options runtime --sign "${C_CERT}" "${_mount_dir}/Blender.app"
     echo
 else
@@ -161,6 +167,7 @@ if [ ! -z "${N_USERNAME}" ] && [ ! -z "${N_PASSWORD}" ] && [ ! -z "${N_BUNDLE_ID
     # Send to Apple
     echo -n "Sending ${DEST_DMG} for notarization..."
     _tmpout=$(mktemp)
+    echo xcrun altool --notarize-app -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}"
     xcrun altool --notarize-app -f "${DEST_DMG}" --primary-bundle-id "${N_BUNDLE_ID}" --username "${N_USERNAME}" --password "${N_PASSWORD}" >${_tmpout} 2>&1
 
     # Parse request uuid
-- 
cgit v1.2.3