after clean port

Author: restot

CMakeLists.txt

@@ -107,10 +107,10 @@ option(WITH_EXTERNAL_BRANDING "A URL to an external branding repo" "")
 set(VIRTUAL_FILE_SYSTEM_PLUGINS off cfapi CACHE STRING "Name of internal plugin in src/libsync/vfs or the locations of virtual file plugins")
 
 if(APPLE)
-  set( SOCKETAPI_TEAM_IDENTIFIER_PREFIX "" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit" )
+  # Default SOCKETAPI_TEAM_IDENTIFIER_PREFIX from environment if present, otherwise empty.
+  set(SOCKETAPI_TEAM_IDENTIFIER_PREFIX "$ENV{SOCKETAPI_TEAM_IDENTIFIER_PREFIX}" CACHE STRING "SocketApi prefix (including a following dot) that must match the codesign key's TeamIdentifier/Organizational Unit")
 endif()
 
-
 if (WITH_AUTO_UPDATER)
     if(APPLE)
         find_package(Sparkle REQUIRED)

VERSION.cmake

@@ -1,6 +1,6 @@
 set( MIRALL_VERSION_MAJOR 3 )
 set( MIRALL_VERSION_MINOR 1 )
-set( MIRALL_VERSION_PATCH 0 )
+set( MIRALL_VERSION_PATCH 7 )
 set( MIRALL_VERSION_YEAR  2025 )
 set( MIRALL_SOVERSION 0 )
 

WARP.md

@@ -10,7 +10,7 @@ OpenCloud Desktop is a Qt-based C++ desktop synchronization client for OpenCloud
 - **Language**: C++20
 - **Build System**: CMake 3.18+ with KDE ECM (Extra CMake Modules)
 - **Database**: SQLite3
-- **Version**: 3.1.1 (see VERSION.cmake)
+- **Version**: 3.1.6 (see VERSION.cmake)
 
 ## Build System & Development Commands
 
@@ -29,12 +29,21 @@ mkdir -p ~/craft/CraftMaster
 git clone --depth=1 https://invent.kde.org/kde/craftmaster.git ~/craft/CraftMaster/CraftMaster
 ```
 
-#### Initial Craft Setup
+#### Environment Setup
+
+Before running any Craft commands, set these environment variables once in your shell session:
 
 ```bash
-# Set target architecture (use macos-clang-arm64 for Apple Silicon, macos-clang-x86_64 for Intel)
 export CRAFT_TARGET=macos-clang-arm64
+export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
+export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.ncpu)
+```
 
+You only need to run these exports once per shell session. All subsequent build commands will use these settings.
+
+#### Initial Craft Setup
+
+```bash
 # Initialize Craft
 pwsh .github/workflows/.craft.ps1 --setup
 
@@ -49,17 +58,13 @@ pwsh .github/workflows/.craft.ps1 -c --install-deps opencloud/opencloud-desktop
 #### Building the Application
 
 ```bash
-export CRAFT_TARGET=macos-clang-arm64
-
 # Point Craft to your local source directory
 pwsh .github/workflows/.craft.ps1 -c --set "srcDir=$(pwd)" opencloud/opencloud-desktop
 
 # Configure build options (optional - enables crash reporter, tests, shell integration)
 pwsh .github/workflows/.craft.ps1 -c --set 'args=-DWITH_CRASHREPORTER=ON -DCRASHREPORTER_SUBMIT_URL=http://localhost:8080/submit -DBUILD_TESTING=ON -DBUILD_SHELL_INTEGRATION=ON' opencloud/opencloud-desktop
 
 # Build with max parallelism
-export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
-export CMAKE_BUILD_PARALLEL_LEVEL=$(sysctl -n hw.ncpu)
 pwsh .github/workflows/.craft.ps1 -c --no-cache opencloud/opencloud-desktop
 ```
 
@@ -73,17 +78,64 @@ open ~/Documents/craft/macos-clang-arm64/Applications/KDE/OpenCloud.app
 #### Running Tests
 
 ```bash
-export CRAFT_TARGET=macos-clang-arm64
 pwsh .github/workflows/.craft.ps1 -c --no-cache --test opencloud/opencloud-desktop
 ```
 
 #### Rebuilding After Changes
 
 ```bash
-export CRAFT_TARGET=macos-clang-arm64
 pwsh .github/workflows/.craft.ps1 -c --no-cache opencloud/opencloud-desktop
 ```
 
+#### Clean Rebuild (Force Full Rebuild)
+
+If Craft thinks the package is up-to-date and `--no-cache` isn't triggering a rebuild, delete the build directory and rebuild:
+
+```bash
+# Delete the build directory
+rm -rf ~/Documents/craft/macos-clang-arm64/build/opencloud/opencloud-desktop/work/build
+
+# Force configure, compile, and install
+pwsh .github/workflows/.craft.ps1 -c --configure --compile --install opencloud/opencloud-desktop
+```
+
+Alternatively, for a complete reset:
+
+```bash
+# Delete the entire package work directory
+rm -rf ~/Documents/craft/macos-clang-arm64/build/opencloud/opencloud-desktop
+
+# Rebuild from scratch
+pwsh .github/workflows/.craft.ps1 -c opencloud/opencloud-desktop
+```
+
+#### Max Performance Build (Recommended)
+
+With environment variables already set, you can use these faster build options:
+
+```bash
+# Full rebuild with max parallelism
+pwsh .github/workflows/.craft.ps1 -c --no-cache opencloud/opencloud-desktop
+
+# Or compile only (faster for incremental builds)
+pwsh .github/workflows/.craft.ps1 -c --compile opencloud/opencloud-desktop
+
+# Then install
+pwsh .github/workflows/.craft.ps1 -c --install opencloud/opencloud-desktop
+```
+
+**Flags explained:**
+- `MAKEFLAGS="-j$(sysctl -n hw.ncpu)"` - Parallel make jobs (uses all CPU cores)
+- `CMAKE_BUILD_PARALLEL_LEVEL` - Ninja/CMake parallel build level
+- `--compile` - Only compile, skip configure if already done (faster for code changes)
+- `--install` - Install to final location after compile
+
+**Filtering build output:**
+```bash
+# Show only errors and build status (useful for long builds)
+pwsh .github/workflows/.craft.ps1 -c opencloud/opencloud-desktop 2>&1 | rg "error:|BUILD"
+```
+
 ### Alternative: Plain CMake (Advanced)
 
 For development without Craft, you must manually install all dependencies first:
@@ -117,7 +169,11 @@ qmlformat -i <file.qml>
 # C++ formatting (requires clang-format)
 clang-format -i <file.cpp>
 
-# The project has pre-commit hooks for formatting (requires ECM 5.79+)
+# Format staged changes before commit (project enforces this via pre-commit hook)
+git clang-format --staged --extensions 'cpp,h,hpp,c'
+
+# Preview formatting changes
+git clang-format --staged --extensions 'cpp,h,hpp,c' --diff
 ```
 
 ### Build Options

shell_integration/MacOSX/CMakeLists.txt

@@ -11,17 +11,44 @@ endif()
 # to be able to open a Mach port across the extension's sandbox boundary.
 # Pass the info through the xcodebuild command line and make sure that the project uses
 # those user-defined settings to build the plist.
+
+# Build FinderSyncExt (Finder overlay icons and context menus)
 add_custom_target( mac_overlayplugin ALL
     xcodebuild -project ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj
         -target FinderSyncExt -configuration "${XCODE_CONFIG}" "SYMROOT=${CMAKE_CURRENT_BINARY_DIR}"
         "OC_OEM_SHARE_ICNS=${OC_OEM_SHARE_ICNS}"
         "OC_APPLICATION_NAME=${APPLICATION_NAME}"
         "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
         "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
-    COMMENT building Mac Overlay icons
+        "OC_APPLICATION_VERSION=${MIRALL_VERSION}"
+        "DEVELOPMENT_TEAM=$ENV{APPLE_DEVELOPMENT_TEAM_ID}"
+    COMMENT "Building FinderSyncExt (Finder overlay icons)"
     VERBATIM)
 add_dependencies(mac_overlayplugin opencloud) # for the ${APPLICATION_ICON_NAME}.icns to be generated
 add_custom_command(TARGET mac_overlayplugin POST_BUILD COMMAND ${CMAKE_COMMAND}
     ARGS -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/${XCODE_CONFIG}/FinderSyncExt.appex" "$<TARGET_FILE_DIR:opencloud>/../PlugIns/FinderSyncExt.appex")
 
+# Build FileProviderExt (Virtual file system in Finder sidebar)
+add_custom_target( mac_fileprovider ALL
+    xcodebuild -project ${CMAKE_SOURCE_DIR}/shell_integration/MacOSX/OpenCloudFinderExtension/OpenCloudFinderExtension.xcodeproj
+        -target FileProviderExt -configuration "${XCODE_CONFIG}" "SYMROOT=${CMAKE_CURRENT_BINARY_DIR}"
+        "OC_APPLICATION_NAME=${APPLICATION_NAME}"
+        "OC_APPLICATION_REV_DOMAIN=${APPLICATION_REV_DOMAIN}"
+        "OC_SOCKETAPI_TEAM_IDENTIFIER_PREFIX=${SOCKETAPI_TEAM_IDENTIFIER_PREFIX}"
+        "OC_APPLICATION_VERSION=${MIRALL_VERSION}"
+        "DEVELOPMENT_TEAM=$ENV{APPLE_DEVELOPMENT_TEAM_ID}"
+    COMMENT "Building FileProviderExt (Virtual file system)"
+    VERBATIM)
+add_dependencies(mac_fileprovider opencloud)
+add_custom_command(TARGET mac_fileprovider POST_BUILD COMMAND ${CMAKE_COMMAND}
+    ARGS -E copy_directory "${CMAKE_CURRENT_BINARY_DIR}/${XCODE_CONFIG}/FileProviderExt.appex" "$<TARGET_FILE_DIR:opencloud>/../PlugIns/FileProviderExt.appex")
+
+# Install extensions into the installed app bundle
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${XCODE_CONFIG}/FinderSyncExt.appex"
+    DESTINATION "${KDE_INSTALL_BUNDLEDIR}/${APPLICATION_SHORTNAME}.app/Contents/PlugIns"
+    USE_SOURCE_PERMISSIONS)
+install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${XCODE_CONFIG}/FileProviderExt.appex"
+    DESTINATION "${KDE_INSTALL_BUNDLEDIR}/${APPLICATION_SHORTNAME}.app/Contents/PlugIns"
+    USE_SOURCE_PERMISSIONS)
+
 endif()