[Bf-blender-cvs] [735a33b5acc] codesign: Codesign: Tweaks to make it work on final machines

[Sergey Sharybin]

Commit: 735a33b5accad6b4141675ab462c079e1c72e7a3
Author: Sergey Sharybin
Date:   Mon Feb 3 16:37:24 2020 +0100
Branches: codesign
https://developer.blender.org/rB735a33b5accad6b4141675ab462c079e1c72e7a3

Codesign: Tweaks to make it work on final machines

===================================================================

M	build_files/buildbot/codesign/config_builder.py
M	build_files/buildbot/codesign/macos_code_signer.py
M	build_files/buildbot/slave_pack.py

===================================================================

diff --git a/build_files/buildbot/codesign/config_builder.py b/build_files/buildbot/codesign/config_builder.py
index 1fa725ed28b..1f41619ba13 100644
--- a/build_files/buildbot/codesign/config_builder.py
+++ b/build_files/buildbot/codesign/config_builder.py
@@ -35,7 +35,7 @@ if platform == util.Platform.LINUX:
 elif platform == util.Platform.WINDOWS:
     SHARED_STORAGE_DIR = Path('Z:\\codesign')
 elif platform == util.Platform.MACOS:
-    SHARED_STORAGE_DIR = Path('/Users/sergey/Developer/blender/codesign')
+    SHARED_STORAGE_DIR = Path('/Volumes/codesign_macos/codesign')
 
 # https://docs.python.org/3/library/logging.config.html#configuration-dictionary-schema
 LOGGING = {
diff --git a/build_files/buildbot/codesign/macos_code_signer.py b/build_files/buildbot/codesign/macos_code_signer.py
index aea7313d1c7..ce2bfb6d1b5 100644
--- a/build_files/buildbot/codesign/macos_code_signer.py
+++ b/build_files/buildbot/codesign/macos_code_signer.py
@@ -251,6 +251,8 @@ class MacOSCodeSigner(BaseCodeSigner):
                                bundle_name)
 
             # It is not possible to remove signature from DMG.
+            if bundle.relative_filepath.name.endswith('.app'):
+                self.codesign_remove_signature(bundle)
             self.codesign_file(bundle)
 
             signed_bundles.add(bundle_name)
@@ -328,6 +330,7 @@ class MacOSCodeSigner(BaseCodeSigner):
                     f'The package has been already submitted under UUID {request_uuid}')
                 return request_uuid
 
+        logger_server.error(output)
         logger_server.error('xcrun command did not report RequestUUID')
         return None
 
@@ -362,6 +365,7 @@ class MacOSCodeSigner(BaseCodeSigner):
                         'Package successfully notarized: %s', status_message)
                     return True
                 elif status == 'invalid':
+                    logger_server.error(output)
                     logger_server.error(
                         'Package notarization has failed: %s', status_message)
                     return False
diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index bbacedca0ce..dd321f6c737 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -109,14 +109,15 @@ def pack_mac(builder):
     package_filepath = os.path.join(builder.build_dir, package_filename)
 
     release_dir = os.path.join(builder.blender_dir, 'release', 'darwin')
-    bundle_sh = os.path.join(release_dir, 'bundle.sh')
+    buildbot_dir = os.path.join(builder.blender_dir, 'build_files', 'buildbot')
+    bundle_script = os.path.join(buildbot_dir, 'slave_bundle_dmg.py')
 
-    command = [bundle_sh]
-    command += ['--source', builder.install_dir]
+    command = [bundle_script]
     command += ['--dmg', package_filepath]
     if info.is_development_build:
         background_image = os.path.join(release_dir, 'buildbot', 'background.tif')
         command += ['--background-image', background_image]
+    command += [builder.install_dir]
     buildbot_utils.call(command)
 
     create_buildbot_upload_zip(builder, [(package_filepath, package_filename)])