diff --git a/Makefile b/Makefile index 18eac69cf..fa58f8f4c 100644 --- a/Makefile +++ b/Makefile @@ -713,6 +713,7 @@ MACOS_INNER_BUNDLE := $(MACOS_OUTER_BUNDLE)/Contents/Frameworks/QtWebEngineCore. STATUS_CLIENT_DMG ?= pkg/Status.dmg $(STATUS_CLIENT_DMG): override RESOURCES_LAYOUT := $(PRODUCTION_PARAMETERS) +$(STATUS_CLIENT_DMG): ENTITLEMENTS ?= resources/Entitlements.plist $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL) rm -rf tmp/macos pkg/*.dmg mkdir -p $(MACOS_OUTER_BUNDLE)/Contents/MacOS @@ -740,7 +741,8 @@ $(STATUS_CLIENT_DMG): nim_status_client $(DMG_TOOL) # if MACOS_CODESIGN_IDENT is not set then the outer and inner .app # bundles are not signed ifdef MACOS_CODESIGN_IDENT - scripts/sign-macos-pkg.sh $(MACOS_OUTER_BUNDLE) $(MACOS_CODESIGN_IDENT) --entitlements Entitlements.plist + scripts/sign-macos-pkg.sh $(MACOS_OUTER_BUNDLE) $(MACOS_CODESIGN_IDENT) \ + --entitlements $(ENTITLEMENTS) endif echo -e $(BUILD_MSG) "dmg" mkdir -p pkg diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos index b8bf9b96a..daaec47a4 100644 --- a/ci/Jenkinsfile.macos +++ b/ci/Jenkinsfile.macos @@ -31,6 +31,11 @@ pipeline { description: 'Decides whether the mocked status-keycard-go library is built.', defaultValue: false ) + choice( + name: 'ENTITLEMENTS', + description: 'Select app entitlements. Squish requires extra entitlements.', + choices: ['resources/Entitlements.plist', 'resources/Entitlements_squish.plist'] + ) } options { diff --git a/Entitlements.plist b/resources/Entitlements.plist similarity index 79% rename from Entitlements.plist rename to resources/Entitlements.plist index bba4be795..8eec77611 100644 --- a/Entitlements.plist +++ b/resources/Entitlements.plist @@ -4,9 +4,11 @@ com.apple.security.device.camera - + + --> diff --git a/resources/Entitlements_squish.plist b/resources/Entitlements_squish.plist new file mode 100644 index 000000000..f01bb5df4 --- /dev/null +++ b/resources/Entitlements_squish.plist @@ -0,0 +1,14 @@ + + + + + com.apple.security.device.camera + + com.apple.security.cs.allow-dyld-environment-variables + + com.apple.security.cs.disable-library-validation + + com.apple.security.cs.allow-jit + + +