Merge pull request #57 from Snapmaker/dev_snapmaker_2.2.0_beta2_alves

Dev snapmaker 2.2.0 beta2 alves

CMakeLists.txt

@@ -101,7 +101,7 @@ option(SLIC3R_PERL_XS           "Compile XS Perl module and enable Perl unit and
 option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
 
 # Sentry crash reporting - enabled only on Windows by default
-if (WIN32)
+if (WIN32 OR APPLE)
     set(SLIC3R_SENTRY_DEFAULT ON)
 else()
     set(SLIC3R_SENTRY_DEFAULT OFF)

build_release_macos.sh

@@ -222,15 +222,83 @@ function build_slicer() {
         # delete .DS_Store file
         find "./Snapmaker Orca.app/" -name '.DS_Store' -delete
 
-         # Copy Snapmaker_Orca_profile_validator.app if it exists
+        # Copy Sentry crashpad_handler and libsentry.dylib for crash reporting
-            if [ -f "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
+        CRASHPAD_HANDLER="${DEPS}/usr/local/bin/crashpad_handler"
-                echo "Copying Snapmaker_Orca_profile_validator.app..."
+        LIBSENTRY="${DEPS}/usr/local/lib/libsentry.dylib"
-                rm -rf ./Snapmaker_Orca_profile_validator.app
+        APP_MACOS_DIR='./Snapmaker Orca.app/Contents/MacOS'
-                cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app" ./Snapmaker_Orca_profile_validator.app
+        APP_FRAMEWORKS_DIR='./Snapmaker Orca.app/Contents/Frameworks'
-                # delete .DS_Store file
+        EXECUTABLE="${APP_MACOS_DIR}/Snapmaker_Orca"
-                find ./Snapmaker_Orca_profile_validator.app/ -name '.DS_Store' -delete
+        
+        if [ -f "${CRASHPAD_HANDLER}" ]; then
+            echo "Copying crashpad_handler to app bundle..."
+            cp -f "${CRASHPAD_HANDLER}" "${APP_MACOS_DIR}/crashpad_handler"
+            # Sign crashpad_handler
+            codesign --force --sign - "${APP_MACOS_DIR}/crashpad_handler" 2>/dev/null || true
+        else
+            echo "Warning: crashpad_handler not found at ${CRASHPAD_HANDLER}"
+        fi
+        
+        if [ -f "${LIBSENTRY}" ]; then
+            echo "Copying libsentry.dylib to Frameworks..."
+            mkdir -p "${APP_FRAMEWORKS_DIR}"
+            cp -f "${LIBSENTRY}" "${APP_FRAMEWORKS_DIR}/libsentry.dylib"
+            # Sign libsentry.dylib
+            codesign --force --sign - "${APP_FRAMEWORKS_DIR}/libsentry.dylib" 2>/dev/null || true
+            
+            # Update rpath in Snapmaker_Orca to use @executable_path relative path
+            if [ -f "${EXECUTABLE}" ]; then
+                echo "Updating libsentry.dylib rpath in Snapmaker_Orca..."
+                install_name_tool -change "@rpath/libsentry.dylib" "@executable_path/../Frameworks/libsentry.dylib" "${EXECUTABLE}" 2>/dev/null || true
+                # Re-sign the executable after modification
+                codesign --force --sign - "${EXECUTABLE}" 2>/dev/null || true
             fi
-        )
+        else
+            echo "Warning: libsentry.dylib not found at ${LIBSENTRY}"
+        fi
+
+        # Copy Snapmaker_Orca_profile_validator.app if it exists
+        if [ -f "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
+            echo "Copying Snapmaker_Orca_profile_validator.app..."
+            rm -rf ./Snapmaker_Orca_profile_validator.app
+            cp -pR "../src$BUILD_DIR_CONFIG_SUBDIR/Snapmaker_Orca_profile_validator.app" ./Snapmaker_Orca_profile_validator.app
+            # delete .DS_Store file
+            find ./Snapmaker_Orca_profile_validator.app/ -name '.DS_Store' -delete
+        fi
+
+        # Generate dSYM debug symbols for Sentry crash reporting
+        if [ "$SLIC3R_SENTRY" = "1" ]; then
+            echo "Generating dSYM debug symbols..."
+            DSYM_DIR="./dSYM"
+            mkdir -p "${DSYM_DIR}"
+            
+            # Generate dSYM for main app
+            if [ -f "${APP_MACOS_DIR}/Snapmaker_Orca" ]; then
+                echo "Generating dSYM for Snapmaker_Orca..."
+                dsymutil "${APP_MACOS_DIR}/Snapmaker_Orca" -o "${DSYM_DIR}/Snapmaker_Orca.dSYM"
+            fi
+            
+            # Generate dSYM for crashpad_handler if it exists
+            if [ -f "${APP_MACOS_DIR}/crashpad_handler" ]; then
+                echo "Generating dSYM for crashpad_handler..."
+                dsymutil "${APP_MACOS_DIR}/crashpad_handler" -o "${DSYM_DIR}/crashpad_handler.dSYM"
+            fi
+            
+            # Generate dSYM for libsentry.dylib if it exists
+            if [ -f "${APP_FRAMEWORKS_DIR}/libsentry.dylib" ]; then
+                echo "Generating dSYM for libsentry.dylib..."
+                dsymutil "${APP_FRAMEWORKS_DIR}/libsentry.dylib" -o "${DSYM_DIR}/libsentry.dSYM"
+            fi
+            
+            # Generate dSYM for profile_validator if it exists
+            if [ -f "./Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
+                echo "Generating dSYM for Snapmaker_Orca_profile_validator..."
+                dsymutil "./Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" -o "${DSYM_DIR}/Snapmaker_Orca_profile_validator.dSYM"
+            fi
+            
+            echo "dSYM files generated in ${DSYM_DIR}"
+            ls -la "${DSYM_DIR}"
+        fi
+    )
 
     # extract version
     # export ver=$(grep '^#define Snapmaker_VERSION' ../src/libslic3r/libslic3r_version.h | cut -d ' ' -f3)
@@ -271,6 +339,41 @@ function build_universal() {
         
     echo "Universal binary created at $UNIVERSAL_APP"
     
+    # Create universal crashpad_handler if both architectures have it
+    CRASHPAD_ARM64="${PROJECT_DIR}/build/arm64/Snapmaker_Orca/Snapmaker Orca.app/Contents/MacOS/crashpad_handler"
+    CRASHPAD_X86="${PROJECT_DIR}/build/x86_64/Snapmaker_Orca/Snapmaker Orca.app/Contents/MacOS/crashpad_handler"
+    CRASHPAD_UNIVERSAL="${UNIVERSAL_APP}/Contents/MacOS/crashpad_handler"
+    if [ -f "${CRASHPAD_ARM64}" ] && [ -f "${CRASHPAD_X86}" ]; then
+        echo "Creating universal crashpad_handler..."
+        lipo -create "${CRASHPAD_X86}" "${CRASHPAD_ARM64}" -output "${CRASHPAD_UNIVERSAL}"
+        codesign --force --sign - "${CRASHPAD_UNIVERSAL}" 2>/dev/null || true
+    elif [ -f "${CRASHPAD_ARM64}" ]; then
+        cp -f "${CRASHPAD_ARM64}" "${CRASHPAD_UNIVERSAL}"
+        codesign --force --sign - "${CRASHPAD_UNIVERSAL}" 2>/dev/null || true
+    fi
+    
+    # Create universal libsentry.dylib if both architectures have it
+    LIBSENTRY_ARM64="${PROJECT_DIR}/build/arm64/Snapmaker_Orca/Snapmaker Orca.app/Contents/Frameworks/libsentry.dylib"
+    LIBSENTRY_X86="${PROJECT_DIR}/build/x86_64/Snapmaker_Orca/Snapmaker Orca.app/Contents/Frameworks/libsentry.dylib"
+    LIBSENTRY_UNIVERSAL="${UNIVERSAL_APP}/Contents/Frameworks/libsentry.dylib"
+    if [ -f "${LIBSENTRY_ARM64}" ] && [ -f "${LIBSENTRY_X86}" ]; then
+        echo "Creating universal libsentry.dylib..."
+        mkdir -p "${UNIVERSAL_APP}/Contents/Frameworks"
+        lipo -create "${LIBSENTRY_X86}" "${LIBSENTRY_ARM64}" -output "${LIBSENTRY_UNIVERSAL}"
+        codesign --force --sign - "${LIBSENTRY_UNIVERSAL}" 2>/dev/null || true
+    elif [ -f "${LIBSENTRY_ARM64}" ]; then
+        mkdir -p "${UNIVERSAL_APP}/Contents/Frameworks"
+        cp -f "${LIBSENTRY_ARM64}" "${LIBSENTRY_UNIVERSAL}"
+        codesign --force --sign - "${LIBSENTRY_UNIVERSAL}" 2>/dev/null || true
+    fi
+    
+    # Update rpath in universal Snapmaker_Orca
+    if [ -f "${LIBSENTRY_UNIVERSAL}" ]; then
+        echo "Updating libsentry.dylib rpath in universal Snapmaker_Orca..."
+        install_name_tool -change "@rpath/libsentry.dylib" "@executable_path/../Frameworks/libsentry.dylib" "${UNIVERSAL_APP}/${BINARY_PATH}" 2>/dev/null || true
+        codesign --force --sign - "${UNIVERSAL_APP}/${BINARY_PATH}" 2>/dev/null || true
+    fi
+    
     # Create universal binary for profile validator if it exists
     if [ -f "$PROJECT_DIR/build/arm64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ] && \
        [ -f "$PROJECT_DIR/build/x86_64/Snapmaker_Orca/Snapmaker_Orca_profile_validator.app/Contents/MacOS/Snapmaker_Orca_profile_validator" ]; then
@@ -290,6 +393,40 @@ function build_universal() {
             
         echo "Universal binary for Snapmaker_Orca_profile_validator created at $UNIVERSAL_VALIDATOR_APP"
     fi
+    
+    # Generate dSYM for universal binary if Sentry is enabled
+    if [ "$SLIC3R_SENTRY" = "1" ]; then
+        echo "Generating dSYM for universal binary..."
+        DSYM_DIR="$PROJECT_BUILD_DIR/Snapmaker_Orca/dSYM"
+        mkdir -p "${DSYM_DIR}"
+        
+        # Generate dSYM for universal main app
+        if [ -f "$UNIVERSAL_APP/$BINARY_PATH" ]; then
+            echo "Generating dSYM for universal Snapmaker_Orca..."
+            dsymutil "$UNIVERSAL_APP/$BINARY_PATH" -o "${DSYM_DIR}/Snapmaker_Orca.dSYM"
+        fi
+        
+        # Generate dSYM for universal crashpad_handler if it exists
+        if [ -f "$UNIVERSAL_APP/Contents/MacOS/crashpad_handler" ]; then
+            echo "Generating dSYM for universal crashpad_handler..."
+            dsymutil "$UNIVERSAL_APP/Contents/MacOS/crashpad_handler" -o "${DSYM_DIR}/crashpad_handler.dSYM"
+        fi
+        
+        # Generate dSYM for universal libsentry.dylib if it exists
+        if [ -f "$UNIVERSAL_APP/Contents/Frameworks/libsentry.dylib" ]; then
+            echo "Generating dSYM for universal libsentry.dylib..."
+            dsymutil "$UNIVERSAL_APP/Contents/Frameworks/libsentry.dylib" -o "${DSYM_DIR}/libsentry.dSYM"
+        fi
+        
+        # Generate dSYM for universal profile_validator if it exists
+        if [ -f "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH" ]; then
+            echo "Generating dSYM for universal Snapmaker_Orca_profile_validator..."
+            dsymutil "$UNIVERSAL_VALIDATOR_APP/$VALIDATOR_BINARY_PATH" -o "${DSYM_DIR}/Snapmaker_Orca_profile_validator.dSYM"
+        fi
+        
+        echo "Universal dSYM files generated in ${DSYM_DIR}"
+        ls -la "${DSYM_DIR}"
+    fi
 }
 
 case "${BUILD_TARGET}" in

build_release_vs2022.bat

@@ -47,7 +47,7 @@ if "%1"=="slicer" (
 echo "building deps.."
 
 echo on
-cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%DEPS%" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo% -DSLIC3R_SENTRY=ON
+cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%DEPS%" -DCMAKE_BUILD_TYPE=%build_type% -DDEP_DEBUG=%debug% -DORCA_INCLUDE_DEBUG_INFO=%debuginfo%
 cmake --build . --config %build_type% --target deps -- -m
 @echo off
 

deps/CMakeLists.txt

@@ -63,7 +63,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 endif()
 
 # Sentry crash reporting - enabled only on Windows by default
-if (WIN32)
+if (WIN32 OR APPLE)
     set(SLIC3R_SENTRY_DEFAULT ON)
 else()
     set(SLIC3R_SENTRY_DEFAULT OFF)

src/sentry_wrapper/SentryWrapper.cpp

@@ -20,6 +20,8 @@
 #ifdef __APPLE__
 #include <unistd.h>
 #include <mach-o/dyld.h>
+#include <libgen.h>
+#include <string.h>
 #endif
 
 #include <cstdlib>
@@ -64,8 +66,11 @@ void initSentryEx()
         }
 
         // Get the directory containing the executable, not the executable path itself
-        boost::filesystem::path exe_dir = boost::filesystem::path(exe_path).parent_path();
+        // Use dirname() to get parent directory (need to copy string as dirname may modify it)
-        handlerDir                      = (exe_dir / "crashpad_handler").string();
+        char exe_path_copy[PATH_MAX];
+        strncpy(exe_path_copy, exe_path, PATH_MAX);
+        char* exe_dir = dirname(exe_path_copy);
+        handlerDir = std::string(exe_dir) + "/crashpad_handler";
 
         const char* home_env = getenv("HOME");
 
@@ -132,6 +137,7 @@ void initSentryEx()
 
         sentry_init(options);
         sentry_start_session();
+        
     }
 }