fix bundle id / codesign

Author: sandboxcoder

CMakeLists.txt

@@ -28,15 +28,14 @@ if(DEFINED ENV{APPLE_TEAM_ID} AND NOT $ENV{APPLE_TEAM_ID} STREQUAL "")
                 RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
                 MACOSX_BUNDLE ON
                 MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist"
-                XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.streamlabs.slobs
+                XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "$ENV{APPLE_TEAM_ID}"
+                XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER com.streamlabs.slobs.camera-extension-installer
                 XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/entitlements.plist"
                 XCODE_ATTRIBUTE_PRODUCT_NAME slobs-virtual-cam-installer)
 
     # Switch to automatic codesigning via valid team ID
-    set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic)
-    set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "Apple Development")
-    set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM $ENV{APPLE_TEAM_ID})
-    #set(XCODE_ATTRIBUTE_PRODUCT_NAME slobs-virtual-cam-installer)
+set(CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_STYLE Automatic)
+set(CMAKE_XCODE_ATTRIBUTE_DEVELOPMENT_TEAM "$ENV{APPLE_TEAM_ID}")
 
     # Run shell script to install the mac-camera-extension
     add_custom_target(run_script ALL

CMakePresets.json

@@ -23,7 +23,7 @@
       "generator": "Xcode",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
-        "CAMERA_EXTENSION_GIT_TAG_VER": {"type": "STRING", "value": "30.2.4sl34"}
+        "CAMERA_EXTENSION_GIT_TAG_VER": {"type": "STRING", "value": "30.2.4sl36-vcam4"}
       }
     }
   ],

Info.plist

@@ -1,14 +1,24 @@
-<!--?xml version="1.0" encoding="UTF-8"?-->
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-    <dict>
-        <key>com.apple.security.app-sandbox</key>
-        <true/>
-        <key>com.apple.security.application-groups</key>
-        <array>
-            <string>$(TeamIdentifierPrefix)com.streamlabs.slobs</string>
-        </array>
-        <key>CFBundleIdentifier</key>
-        <string>com.streamlabs.slobs</string>
-    </dict>
+<dict>
+	<key>CFBundleName</key>
+	<string>slobs-installer</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.streamlabs.slobs.camera-extension-installer</string>
+	<key>CFBundleVersion</key>
+	<string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+	<key>CFBundleShortVersionString</key>
+	<string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleExecutable</key>
+	<string>slobs-virtual-cam-installer</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+	<key>CFBundleSupportedPlatforms</key>
+	<array>
+		<string>MacOSX</string>
+	</array>
+</dict>
 </plist>

codesign_development.sh

@@ -0,0 +1,10 @@
+root=$(pwd)
+cd build/RelWithDebInfo
+
+/usr/bin/codesign -o runtime --force --sign "$APPLE_SLD_IDENTITY" --entitlements "$root"/build/camera-ext-entitlements.plist  --timestamp\=none --generate-entitlement-der slobs-virtual-cam-installer.app/Contents/Library/SystemExtensions/com.streamlabs.slobs.mac-camera-extension.systemextension
+
+cp -R "$SYSEXT_INSTALLER_PROVISIONING_PROFILE" slobs-virtual-cam-installer.app/Contents/embedded.provisionprofile
+/usr/bin/codesign -o runtime --force --sign "$APPLE_SLD_IDENTITY" --entitlements "$root"/entitlements.plist --timestamp\=none --generate-entitlement-der /Users/rosbo/projects/streamlabs/slobs-vcam-installer/build/RelWithDebInfo/slobs-virtual-cam-installer.app
+
+echo "$0 run ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app"
+ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app

codesign_distribute.sh

@@ -0,0 +1,30 @@
+# This script will codesign & notarize the app
+root=$(pwd)
+cd build/RelWithDebInfo
+
+/usr/bin/codesign -o runtime --force --sign "Developer ID Application: ${APPLE_SLD_IDENTITY}" --entitlements "$root"/build/camera-ext-entitlements.plist --timestamp slobs-virtual-cam-installer.app/Contents/Library/SystemExtensions/com.streamlabs.slobs.mac-camera-extension.systemextension
+cp -R "$SYSEXT_INSTALLER_PROVISIONING_PROFILE" slobs-virtual-cam-installer.app/Contents/embedded.provisionprofile
+/usr/bin/codesign -o runtime --force --sign "Developer ID Application: ${APPLE_SLD_IDENTITY}" --entitlements "$root"/entitlements.plist --timestamp /Users/rosbo/projects/streamlabs/slobs-vcam-installer/build/RelWithDebInfo/slobs-virtual-cam-installer.app
+
+echo "$0 run ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app"
+ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app
+
+zip -r slobs-virtual-cam-installer.zip slobs-virtual-cam-installer.app
+
+xcrun notarytool submit slobs-virtual-cam-installer.zip \
+  --apple-id "$APPLE_ID" \
+  --team-id "$APPLE_TEAM_ID" \
+  --password "$APPLE_APP_PASSWORD" \
+  --wait
+
+
+xcrun stapler staple slobs-virtual-cam-installer.app
+
+echo "$0 run gatekeeper analysis post-notarytool"
+spctl --assess --type execute --verbose=4 slobs-virtual-cam-installer.app
+codesign --verify --verbose=4 slobs-virtual-cam-installer.app
+
+#xcrun notarytool log c2a0836d-c24f-4d33-b861-a7d74997e36f --apple-id "$APPLE_ID" --team-id $APPLE_TEAM_ID --password "$APPLE_APP_PASSWORD"
+
+echo "$0 run ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app"
+ditto slobs-virtual-cam-installer.app /Applications/slobs-virtual-cam-installer.app

entitlements.plist

@@ -4,11 +4,11 @@
     <dict>
         <key>com.apple.security.app-sandbox</key>
         <true/>
+        <key>com.apple.developer.system-extension.install</key>
+        <true/>
         <key>com.apple.security.application-groups</key>
         <array>
-            <string>$(TeamIdentifierPrefix)com.streamlabs.slobs</string>
+            <string>UT675MBB9Q.com.streamlabs.slobs</string>
         </array>
-        <key>com.apple.developer.system-extension.install</key>
-        <true/>
     </dict>
 </plist>

install-mac-camera-ext.sh

@@ -15,4 +15,5 @@ echo "Build the mac-camera-extension on $checkArch"
 echo "Copy system extension into the app bundle at Contents/Library/SystemExtensions folder"
 cd "$root"
 mkdir -p ./RelWithDebInfo/slobs-virtual-cam-installer.app/Contents/Library/SystemExtensions/
-cp -R obs-studio/plugins/mac-virtualcam/src/camera-extension/build_macos/RelWithDebInfo/com.streamlabs.slobs.mac-camera-extension.systemextension "$root"/RelWithDebInfo/slobs-virtual-cam-installer.app/Contents/Library/SystemExtensions/
+ditto obs-studio/plugins/mac-virtualcam/src/camera-extension/build_macos/RelWithDebInfo/com.streamlabs.slobs.mac-camera-extension.systemextension "$root"/RelWithDebInfo/slobs-virtual-cam-installer.app/Contents/Library/SystemExtensions/com.streamlabs.slobs.mac-camera-extension.systemextension
+cp obs-studio/plugins/mac-virtualcam/src/camera-extension/cmake/macos/slobs-entitlements.plist camera-ext-entitlements.plist