diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3d97fead..25230847 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -185,6 +185,7 @@ jobs: -DCUTTER_ENABLE_DEPENDENCY_DOWNLOADS=ON \ -DCUTTER_PACKAGE_RZ_GHIDRA=ON \ -DCMAKE_FRAMEWORK_PATH="$BREAKPAD_FRAMEWORK_DIR" \ + -DCPACK_BUNDLE_APPLE_CERT_APP="-" \ .. && \ make -j4; make package diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index 8f7bacc7..c06ad1a0 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -47,6 +47,11 @@ if(APPLE) set(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/macos/cutter.icns") set(CPACK_DMG_BACKGROUND_IMAGE "${CMAKE_CURRENT_SOURCE_DIR}/macos/cutter_mac_app.png") set(CPACK_DMG_DS_STORE "${CMAKE_CURRENT_SOURCE_DIR}/macos/DS_Store_ForDMGBackground") + set(CPACK_BUNDLE_APPLE_ENTITLEMENTS "${CMAKE_CURRENT_SOURCE_DIR}/macos/Entitlements.plist") + set(CPACK_APPLE_BUNDLE_ID "re.rizin.cutter") + if (CUTTER_ENABLE_CRASH_REPORTS) + list(APPEND CPACK_BUNDLE_APPLE_CODESIGN_FILES "/Contents/Frameworks/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib") + endif() find_program(MACDEPLOYQT_PATH macdeployqt HINTS "${Qt5_DIR}/../../../bin") diff --git a/dist/appbundle_embed_python.sh b/dist/appbundle_embed_python.sh index e8cf2a8f..d2b30d72 100755 --- a/dist/appbundle_embed_python.sh +++ b/dist/appbundle_embed_python.sh @@ -21,7 +21,7 @@ then echo "Cleaning up embedded Python Framework" cd "$appbundle/Contents/Frameworks/Python.framework" find . | grep -E "(__pycache__|\.pyc|\.pyo$)" | xargs rm -rf - rm -r Versions/Current/Resources/* "Versions/Current/lib/$python_version/test" "Versions/Current/lib/$python_version/idlelib" "Versions/Current/lib/$python_version/curses" "Versions/Current/lib/$python_version/lib2to3" || echo "Couldn't remove something" + rm -r Versions/Current/Resources/Python.app "Versions/Current/lib/$python_version/test" "Versions/Current/lib/$python_version/idlelib" "Versions/Current/lib/$python_version/curses" "Versions/Current/lib/$python_version/lib2to3" || echo "Couldn't remove something" else echo "Python.framework already exists, skipping copying" cd "$appbundle/Contents/Frameworks/Python.framework" @@ -48,4 +48,3 @@ then else echo "site-packages/Pyside2 exists, skipping copying" fi - diff --git a/dist/macos/Entitlements.plist b/dist/macos/Entitlements.plist new file mode 100644 index 00000000..67836f48 --- /dev/null +++ b/dist/macos/Entitlements.plist @@ -0,0 +1,8 @@ + + + + + com.apple.security.cs.debugger + + + \ No newline at end of file