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
@@ -113,7 +133,7 @@ jobs:
       - name: Build smoke-test application package
         run: make -C packaging/smoke-test-app package BUILD_TYPE=${{ inputs.build-type }}
 
-      - name: Install driver package (pkg)
+      - name: Install driver packages (pkg)
         run: |
           set -euo pipefail
           shopt -s nullglob
@@ -122,10 +142,30 @@ 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: Verify dev package installation
+        run: |
+          set -euo pipefail
+          # 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: make -C packaging/smoke-test-app install-pkg
 
@@ -181,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: |

CMakeLists.txt

@@ -275,13 +275,26 @@ set(CPACK_MONOLITHIC_INSTALL ON)
 set(CPACK_VERBATIM_VARIABLES ON)
 
 set(CPACK_MONOLITHIC_INSTALL OFF)
-set(CPACK_COMPONENTS_ALL ${SCYLLA_DRIVER_COMPONENT_NAME})
+
+# Define component names for runtime and dev packages
+set(SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME "${SCYLLA_DRIVER_COMPONENT_NAME}")
+set(SCYLLA_DRIVER_DEV_COMPONENT_NAME "${SCYLLA_DRIVER_COMPONENT_NAME}-dev")
+set(CPACK_COMPONENTS_ALL ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME} ${SCYLLA_DRIVER_DEV_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"
+
+# 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")
@@ -305,15 +318,39 @@ else()
   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} = \${CPACK_RPM_PACKAGE_VERSION}-\${CPACK_RPM_PACKAGE_RELEASE}")
 endif()
 
 include(CPack)

scylla-rust-wrapper/CMakeLists.txt

@@ -118,43 +118,50 @@ endif()
 # Determine if the header should be installed
 if(CASS_INSTALL_HEADER)
   file(GLOB CASS_API_HEADER_FILES ${CASS_INCLUDE_DIR}/*.h)
+  # Headers go to dev package
   install(FILES ${CASS_API_HEADER_FILES}
     DESTINATION ${INSTALL_HEADER_DIR}
-    ${SCYLLA_DRIVER_COMPONENT_ARGS})
+    COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
 endif()
 
 # Install the dynamic/shared library
 if(CASS_BUILD_SHARED)
+  # Versioned shared library goes to runtime package
   install(FILES $<TARGET_FILE:scylla-cpp-driver>
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ${SCYLLA_DRIVER_COMPONENT_ARGS}
+    COMPONENT ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME}
     PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
+  # Major version symlink goes to runtime package
   install(FILES ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_SYMLINK_VERSION}
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ${SCYLLA_DRIVER_COMPONENT_ARGS})
+    COMPONENT ${SCYLLA_DRIVER_RUNTIME_COMPONENT_NAME})
+  # Unversioned development symlink goes to dev package
   install(FILES ${CMAKE_BINARY_DIR}/${INSTALL_NAME_SHARED_SYMLINK_NO_VERSION}
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ${SCYLLA_DRIVER_COMPONENT_ARGS})
+    COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
+  # pkg-config file goes to dev package
   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"
-        ${SCYLLA_DRIVER_COMPONENT_ARGS})
+        COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
     endif()
   endif()
 endif()
 
+# Static library goes to dev package
 if(CASS_BUILD_STATIC)
   install(FILES $<TARGET_FILE:scylla-cpp-driver_static>
     DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ${SCYLLA_DRIVER_COMPONENT_ARGS})
+    COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
+  # Static library pkg-config file goes to dev package
   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"
-        ${SCYLLA_DRIVER_COMPONENT_ARGS})
+        COMPONENT ${SCYLLA_DRIVER_DEV_COMPONENT_NAME})
     endif()
   endif()
 endif()