1

Author: dkropachev

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

@@ -47,7 +47,7 @@ jobs:
       - name: Build packages
         run: make build-package
 
-      - name: Install driver package (DEB)
+      - name: Install driver packages (DEB)
         run: |
           set -euo pipefail
           shopt -s nullglob
@@ -56,9 +56,29 @@ jobs:
             echo "No driver DEB packages produced"
             exit 1
           fi
+          echo "Installing ${#DRIVER_PACKAGES[@]} DEB package(s):"
+          for pkg in "${DRIVER_PACKAGES[@]}"; do
+            echo "  - $(basename "$pkg")"
+          done
+          # Install both runtime and dev packages
           sudo dpkg -i "${DRIVER_PACKAGES[@]}"
           sudo apt-get install -f -y
 
+      - name: Verify dev package installation
+        run: |
+          set -euo pipefail
+          # Verify headers are installed
+          if [ ! -f /usr/include/cassandra.h ]; then
+            echo "ERROR: cassandra.h header not found - dev package may not be installed"
+            exit 1
+          fi
+          # Verify pkg-config file is installed
+          if ! pkg-config --exists scylla-cpp-driver; then
+            echo "ERROR: scylla-cpp-driver.pc not found - dev package may not be installed"
+            exit 1
+          fi
+          echo "Dev package verification successful"
+
       - name: Build smoke-test application package
         run: |
           set -euo pipefail
@@ -103,14 +123,17 @@ jobs:
 
   macos:
     name: macOS packages
-    runs-on: macos-13
+    runs-on: macos-15-intel
     steps:
       - uses: actions/checkout@v4
 
       - name: Build packages
         run: make build-package
 
-      - name: Install driver package (pkg)
+      - name: Build smoke-test application package
+        run: make -C packaging/smoke-test-app package BUILD_TYPE=${{ inputs.build-type }}
+
+      - name: Install driver packages (pkg)
         run: |
           set -euo pipefail
           shopt -s nullglob
@@ -119,30 +142,35 @@ jobs:
             echo "No driver pkg packages produced"
             exit 1
           fi
+          echo "Installing ${#packages[@]} pkg package(s):"
+          for pkg in "${packages[@]}"; do
+            echo "  - $(basename "$pkg")"
+          done
+          # Install all packages (macOS productbuild creates a single package with components)
           for pkg in "${packages[@]}"; do
             sudo installer -pkg "$pkg" -target /
           done
 
-      - name: Build smoke-test application package
+      - name: Verify dev package installation
         run: |
           set -euo pipefail
-          make -C packaging/smoke-test-app package \
-            BUILD_TYPE=${{ inputs.build-type }}
+          # Verify headers are installed
+          if [ ! -f /usr/local/include/cassandra.h ]; then
+            echo "ERROR: cassandra.h header not found - dev package may not be installed"
+            exit 1
+          fi
+          # Verify pkg-config file is installed
+          if ! PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --exists scylla-cpp-driver; then
+            echo "ERROR: scylla-cpp-driver.pc not found - dev package may not be installed"
+            exit 1
+          fi
+          echo "Dev package verification successful"
 
       - name: Install smoke-test application package (pkg)
-        run: |
-          set -euo pipefail
-          make -C packaging/smoke-test-app install-pkg
+        run: make -C packaging/smoke-test-app install-pkg
 
       - name: Run smoke-test application against local Scylla
-        run: |
-          set -euo pipefail
-          cleanup() {
-            docker compose -f tests/examples_cluster/docker-compose.yml down --remove-orphans
-          }
-          trap cleanup EXIT
-          docker compose -f tests/examples_cluster/docker-compose.yml up -d --wait
-          /usr/local/bin/scylla-cpp-driver-smoke-test 172.43.0.2
+        run: make -C packaging/smoke-test-app test-package
 
       - name: Collect artifacts
         run: |
@@ -168,6 +196,22 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Install Docker
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $dockerService = Get-Service -Name docker -ErrorAction SilentlyContinue
+          if (-not $dockerService) {
+            Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+            Install-Module -Name DockerMsftProvider -Repository PSGallery -Force
+            Install-Package -Name docker -ProviderName DockerMsftProvider -Force
+          }
+          try {
+            Start-Service docker -ErrorAction Stop
+          } catch {
+            Write-Warning "Docker service failed to start: $($_.Exception.Message)"
+          }
+
       - name: Add WiX to PATH
         shell: pwsh
         run: |
@@ -177,21 +221,43 @@ jobs:
       - name: Build packages
         run: make build-package
 
-      - name: Install driver package (MSI)
+      - name: Install driver packages (MSI)
         shell: pwsh
         run: |
           $ErrorActionPreference = 'Stop'
           $packages = Get-ChildItem build -Filter *.msi
           if (-not $packages) {
             throw "No driver MSI packages produced"
           }
+          Write-Host "Installing $($packages.Count) MSI package(s):"
+          foreach ($pkg in $packages) {
+            Write-Host "  - $($pkg.Name)"
+          }
+          # Install all packages (Windows WIX creates a single MSI with components)
           foreach ($pkg in $packages) {
             $process = Start-Process msiexec.exe -ArgumentList "/i `"$($pkg.FullName)`" /qn /norestart" -Wait -PassThru
             if ($process.ExitCode -ne 0) {
               throw "Failed to install driver package $($pkg.Name): exit code $($process.ExitCode)"
             }
           }
 
+      - name: Verify dev package installation
+        shell: pwsh
+        run: |
+          $ErrorActionPreference = 'Stop'
+          $installPath = "C:\Program Files\ScyllaDB\Scylla CPP Driver"
+          # Verify headers are installed
+          $headerPath = Join-Path $installPath "include\cassandra.h"
+          if (-not (Test-Path $headerPath)) {
+            throw "ERROR: cassandra.h header not found at $headerPath - dev package may not be installed"
+          }
+          # Verify pkg-config file is installed
+          $pkgConfigPath = Join-Path $installPath "lib\pkgconfig\scylla-cpp-driver.pc"
+          if (-not (Test-Path $pkgConfigPath)) {
+            throw "ERROR: scylla-cpp-driver.pc not found at $pkgConfigPath - dev package may not be installed"
+          }
+          Write-Host "Dev package verification successful"
+
       - name: Build smoke-test application package
         shell: pwsh
         run: |

.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,16 @@ 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})
+
+# Define component names for runtime and dev packages
+# These must be set before add_subdirectory() calls so install commands can use them
+set(SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME "${SCYLLA_DRIVER_COMPONENT_NAME}")
+set(SCYLLA_DRIVER_DEV_COMPONENT_NAME "${SCYLLA_DRIVER_COMPONENT_NAME}-dev")
+
 if(CASS_BUILD_SHARED)
   set(BUILD_SHARED_LIBS ON)
 endif()
@@ -269,6 +279,25 @@ endif()
 set(CPACK_MONOLITHIC_INSTALL ON)
 set(CPACK_VERBATIM_VARIABLES ON)
 
+set(CPACK_MONOLITHIC_INSTALL OFF)
+
+# Set the list of components for CPack
+set(CPACK_COMPONENTS_ALL ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME} ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
+
+include(CPackComponent)
+
+# Runtime component: shared libraries only
+cpack_add_component(${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}
+  DISPLAY_NAME "Scylla C++ Driver Runtime"
+  DESCRIPTION "Shared libraries for the Scylla C++ Driver"
+  REQUIRED)
+
+# Dev component: headers, static libraries, pkg-config files, and development symlinks
+cpack_add_component(${SCYLLA_DRIVER_DEV_COMPONENT_NAME}
+  DISPLAY_NAME "Scylla C++ Driver Development"
+  DESCRIPTION "Headers, static libraries, and development files for the Scylla C++ Driver"
+  DEPENDS ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME})
+
 if(WIN32)
   set(CPACK_GENERATOR "WIX")
   set(CPACK_PACKAGE_INSTALL_DIRECTORY "ScyllaDB\\Scylla CPP Driver")
@@ -285,20 +314,46 @@ 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")
   set(CPACK_PACKAGE_FILE_NAME
     "${_CPACK_PACKAGE_NAME}-${PROJECT_VERSION_STRING}-${CMAKE_SYSTEM_NAME}")
+
+  # DEB package configuration
+  set(CPACK_DEB_COMPONENT_INSTALL ON)
   set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
   set(CPACK_DEBIAN_PACKAGE_MAINTAINER "ScyllaDB")
   set(CPACK_DEBIAN_PACKAGE_SECTION "database")
   set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL})
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+
+  # DEB runtime package
+  set(CPACK_DEBIAN_${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}_PACKAGE_NAME "${_CPACK_PACKAGE_NAME}")
+  set(CPACK_DEBIAN_${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}_PACKAGE_SECTION "libs")
+
+  # DEB dev package
+  set(CPACK_DEBIAN_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_NAME "${_CPACK_PACKAGE_NAME}-dev")
+  set(CPACK_DEBIAN_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_SECTION "libdevel")
+  set(CPACK_DEBIAN_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_DEPENDS "${_CPACK_PACKAGE_NAME} (= \${CPACK_DEBIAN_PACKAGE_VERSION})")
+
+  # RPM package configuration
+  set(CPACK_RPM_COMPONENT_INSTALL ON)
   set(CPACK_RPM_PACKAGE_LICENSE "Apache-2.0")
   set(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_HOMEPAGE_URL})
   set(CPACK_RPM_PACKAGE_RELEASE 1)
   set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
+
+  # RPM runtime package
+  set(CPACK_RPM_${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}_PACKAGE_NAME "${_CPACK_PACKAGE_NAME}")
+  set(CPACK_RPM_${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}_PACKAGE_GROUP "System Environment/Libraries")
+
+  # RPM dev package (devel suffix is standard for RPM)
+  set(CPACK_RPM_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_NAME "${_CPACK_PACKAGE_NAME}-devel")
+  set(CPACK_RPM_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_GROUP "Development/Libraries")
+  set(CPACK_RPM_${SCYLLA_DRIVER_DEV_COMPONENT_NAME}_PACKAGE_REQUIRES "${_CPACK_PACKAGE_NAME} = ${PROJECT_VERSION_STRING}-${CPACK_RPM_PACKAGE_RELEASE}")
 endif()
 
 include(CPack)

Makefile

@@ -6,6 +6,7 @@ SHELL = bash
 ifeq ($(OS),Windows_NT)
     SHELL := pwsh.exe
     .SHELLFLAGS := -NoProfile -Command
+    .ONESHELL:
 endif
 
 UNAME_S := $(shell uname -s)
@@ -199,7 +200,12 @@ BUILD_DIR := "${CURRENT_DIR}build"
 INTEGRATION_TEST_BIN := ${BUILD_DIR}/cassandra-integration-tests
 CMAKE_FLAGS ?=
 CMAKE_BUILD_TYPE ?= Release
-CMAKE_INSTALL_PREFIX ?= /usr
+
+ifeq ($(OS_TYPE),macos)
+  CMAKE_INSTALL_PREFIX ?= /usr/local
+else
+  CMAKE_INSTALL_PREFIX ?= /usr
+endif
 
 ifeq ($(OS_TYPE),macos)
   CPACK_GENERATORS ?= DragNDrop productbuild
@@ -301,23 +307,31 @@ build-examples:
 		$(MAKE) .ubuntu-package-install-dependencies; \
 	fi
 
-.package-build-prepare-windows:
-	if (-not (choco list --local-only --exact openssl.light | Select-String '^openssl.light$')) { choco install openssl.light --no-progress -y }
-	if (-not (choco list --local-only --exact pkgconfiglite | Select-String '^pkgconfiglite$')) { choco install pkgconfiglite --no-progress -y }
+.package-build-prepare-windows-openssl:
+	if (-not (choco list --local-only --exact openssl.light | Select-String '^openssl.light$$')) {
+	    choco install openssl.light --no-progress -y
+	}
+
+.package-build-prepare-windows-pkgconfiglite:
+	if (-not (choco list --local-only --exact pkgconfiglite | Select-String '^pkgconfiglite$$')) {
+		choco install pkgconfiglite --no-progress -y
+	}
+
+.package-build-prepare-windows: .package-build-prepare-windows-openssl .package-build-prepare-windows-pkgconfiglite
 
 ifeq ($(OS_TYPE),macos)
 .package-build-prepare:
-ifeq ($(OS_TYPE),windows)
+else ifeq ($(OS_TYPE),windows)
 .package-build-prepare: .package-build-prepare-windows
 else
 .package-build-prepare: .package-build-prepare-ubuntu
 endif
 
 .package-configure: .package-build-prepare
 ifeq ($(OS_TYPE),windows)
-	cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) $(CMAKE_FLAGS)
-else
 	cmake -S . -B build -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) $(CMAKE_FLAGS)
+else
+	cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) $(CMAKE_FLAGS)
 endif
 
 build-driver: .package-configure