1

Author: dkropachev

.github/workflows/build-cpack-packages.yml

@@ -107,6 +107,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Docker
+        run: |
+          set -euo pipefail
+          brew install colima docker
+          colima start
+          docker context use colima
+
       - name: Build packages
         run: make build-package
 

.gitignore

@@ -1,6 +1,9 @@
 .vscode/
 .zed
 build/
+build-macos/
+**/build/
+**/build-macos/
 scylla-rust-wrapper/target/
 .idea/
 cmake-build-debug/

CMakeLists.txt

@@ -51,6 +51,11 @@ option(CASS_USE_LIBUV "Use libuv" OFF)
 
 set(CASS_CPP_STANDARD "11" CACHE STRING "C++ standard (11, 14, 17, etc.)")
 
+# Component metadata used for macOS productbuild packages. Other platforms
+# ignore these values, so keep the defaults empty by default.
+set(SCYLLA_DRIVER_COMPONENT_NAME "scylla_cpp_driver")
+set(SCYLLA_DRIVER_COMPONENT_ARGS COMPONENT ${SCYLLA_DRIVER_COMPONENT_NAME})
+
 if(CASS_BUILD_SHARED)
   set(BUILD_SHARED_LIBS ON)
 endif()
@@ -269,6 +274,14 @@ endif()
 set(CPACK_MONOLITHIC_INSTALL ON)
 set(CPACK_VERBATIM_VARIABLES ON)
 
+set(CPACK_MONOLITHIC_INSTALL OFF)
+set(CPACK_COMPONENTS_ALL ${SCYLLA_DRIVER_COMPONENT_NAME})
+include(CPackComponent)
+cpack_add_component(${SCYLLA_DRIVER_COMPONENT_NAME}
+  DISPLAY_NAME "Scylla C++ Driver"
+  DESCRIPTION "Shared/static libraries, headers, and pkg-config metadata"
+  REQUIRED)
+
 if(WIN32)
   set(CPACK_GENERATOR "WIX")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "ScyllaDB\\Scylla CPP Driver")
@@ -285,6 +298,8 @@ elseif(APPLE)
     "${_CPACK_PACKAGE_NAME}-${PROJECT_VERSION_STRING}-macos")
   set(CPACK_PRODUCTBUILD_IDENTIFIER "com.scylladb.cpp-rust-driver")
   set(CPACK_PRODUCTBUILD_SIGNING_IDENTITY "")
+  set(CPACK_PRODUCTBUILD_COMPONENT_INSTALL ON)
+
 else()
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
   set(CPACK_GENERATOR "DEB;RPM")

packaging/smoke-test-app/CMakeLists.txt

@@ -131,7 +131,16 @@ if(DRIVER_LINK_OPTIONS)
     ${DRIVER_LINK_OPTIONS})
 endif()
 
-install(TARGETS scylla-cpp-driver-smoke-test DESTINATION bin)
+set(SMOKE_APP_COMPONENT_NAME "")
+set(SMOKE_APP_COMPONENT_ARGS "")
+if(APPLE)
+  set(SMOKE_APP_COMPONENT_NAME "scylla_cpp_driver_smoke_app")
+  set(SMOKE_APP_COMPONENT_ARGS COMPONENT ${SMOKE_APP_COMPONENT_NAME})
+endif()
+
+install(TARGETS scylla-cpp-driver-smoke-test
+  DESTINATION bin
+  ${SMOKE_APP_COMPONENT_ARGS})
 
 #------------------------
 # Packaging (CPack)
@@ -156,11 +165,25 @@ if(WIN32)
   set(CPACK_WIX_UPGRADE_GUID "180C9F7E-8D90-40F1-A91E-9DE5DB451A80")
 elseif(APPLE)
   set(CPACK_GENERATOR "productbuild;DragNDrop")
-  set(CPACK_RESOURCE_FILE_LICENSE "${CPP_DRIVER_ROOT}/LICENSE")
+  configure_file(
+    "${CPP_DRIVER_ROOT}/LICENSE"
+    "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt"
+    COPYONLY)
+  set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/LICENSE.txt")
   set(CPACK_PACKAGE_FILE_NAME
     "scylla-cpp-driver-smoke-app-${PROJECT_VERSION_STRING}-macos")
   set(CPACK_PRODUCTBUILD_IDENTIFIER "com.scylladb.cpp-rust-driver.smoke-app")
   set(CPACK_PRODUCTBUILD_SIGNING_IDENTITY "")
+  if(SMOKE_APP_COMPONENT_NAME)
+    include(CPackComponent)
+    set(CPACK_MONOLITHIC_INSTALL OFF)
+    set(CPACK_COMPONENTS_ALL ${SMOKE_APP_COMPONENT_NAME})
+    cpack_add_component(${SMOKE_APP_COMPONENT_NAME}
+      DISPLAY_NAME "Smoke Test Binary"
+      DESCRIPTION "CLI smoke test for installed driver packages"
+      REQUIRED)
+    set(CPACK_PRODUCTBUILD_COMPONENT_INSTALL ON)
+  endif()
 else()
   set(CPACK_GENERATOR "DEB;RPM")
   set(CPACK_RESOURCE_FILE_LICENSE "${CPP_DRIVER_ROOT}/LICENSE")

packaging/smoke-test-app/Makefile

@@ -29,7 +29,7 @@ package:
 install-pkg:
 	set -euo pipefail; \
 	shopt -s nullglob; \
-	packages=($(BUILD_DIR)/scylla-cpp-driver-smoke-app-*-macos.pkg); \
+	packages=($(BUILD_DIR)/scylla-cpp-driver-smoke-app-*-macos*.pkg); \
 	if [ "$${#packages[@]}" -eq 0 ]; then \
 		echo "No smoke-test productbuild packages produced"; \
 		exit 1; \

scylla-rust-wrapper/CMakeLists.txt

@@ -118,35 +118,43 @@ endif()
 # Determine if the header should be installed
 if(CASS_INSTALL_HEADER)
   file(GLOB CASS_API_HEADER_FILES ${CASS_INCLUDE_DIR}/*.h)
-  install(FILES ${CASS_API_HEADER_FILES} DESTINATION ${INSTALL_HEADER_DIR})
+  install(FILES ${CASS_API_HEADER_FILES}
+    DESTINATION ${INSTALL_HEADER_DIR}
+    ${SCYLLA_DRIVER_COMPONENT_ARGS})
 endif()
 
 # Install the dynamic/shared library
 if(CASS_BUILD_SHARED)
-    install(FILES $<TARGET_FILE:scylla-cpp-driver>
+  install(FILES $<TARGET_FILE:scylla-cpp-driver>
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ${SCYLLA_DRIVER_COMPONENT_ARGS}
     PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
   install(FILES ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_SYMLINK_VERSION}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ${SCYLLA_DRIVER_COMPONENT_ARGS})
   install(FILES ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_SYMLINK_NO_VERSION}
-    DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ${SCYLLA_DRIVER_COMPONENT_ARGS})
   if(CASS_INSTALL_PKG_CONFIG)
     if(PKG_CONFIG_FOUND)
       configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylla-cpp-driver.pc.in" "scylla-cpp-driver.pc" @ONLY)
       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylla-cpp-driver.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+        ${SCYLLA_DRIVER_COMPONENT_ARGS})
     endif()
   endif()
 endif()
 
 if(CASS_BUILD_STATIC)
-    install(FILES $<TARGET_FILE:scylla-cpp-driver_static>
-    DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(FILES $<TARGET_FILE:scylla-cpp-driver_static>
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ${SCYLLA_DRIVER_COMPONENT_ARGS})
   if(CASS_INSTALL_PKG_CONFIG)
     if(PKG_CONFIG_FOUND)
         configure_file("${CMAKE_CURRENT_SOURCE_DIR}/scylla-cpp-driver_static.pc.in" "scylla-cpp-driver_static.pc" @ONLY)
       install(FILES "${CMAKE_CURRENT_BINARY_DIR}/scylla-cpp-driver_static.pc"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig"
+        ${SCYLLA_DRIVER_COMPONENT_ARGS})
     endif()
   endif()
 endif()