packaging: RPM build adapted to Scylla

Author: jul-stas

.gitignore

@@ -5,7 +5,7 @@
 *.0
 
 # Compiled Dynamic libraries
-libcassandra.so*
+libscylla-cpp-driver.so*
 *.dylib
 
 # Compiled Static libraries

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(cassandra C CXX)
+project(scylla-cpp C CXX)
 
 set(CASS_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(CASS_SRC_DIR "${CASS_ROOT_DIR}/src")
@@ -62,12 +62,12 @@ if(CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)
 endif()
 
 # Determine which driver target should be used as a dependency
-set(PROJECT_LIB_NAME_TARGET cassandra)
+set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver)
 if(CASS_USE_STATIC_LIBS OR
    (WIN32 AND (CASS_BUILD_INTEGRATION_TESTS OR CASS_BUILD_UNIT_TESTS)))
   set(CASS_USE_STATIC_LIBS ON) # Not all driver internals are exported for test executable (e.g. CASS_EXPORT)
   set(CASS_BUILD_STATIC ON)
-  set(PROJECT_LIB_NAME_TARGET cassandra_static)
+  set(PROJECT_LIB_NAME_TARGET scylla-cpp-driver_static)
 endif()
 
 # Ensure the driver is configured to build

packaging/README.md

@@ -0,0 +1,21 @@
+## On a clean CentOS 7
+
+Set up the EPEL, install the toolchain and `libuv`:
+```
+wget https://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/e/epel-release-7-13.noarch.rpm
+sudo rpm -Uvh epel-release*rpm
+sudo yum install -y libuv-devel openssl-devel cmake3 make g++ git
+```
+
+Now clone the source code, checkout particular revision if needed:
+```
+git clone https://github.com/scylladb/cpp-driver.git
+cd cpp-driver/
+```
+
+Packaging:
+```
+cat licenses/* > LICENSE.txt
+cd packaging/
+./build_rpm.sh
+```

packaging/build_rpm.sh

@@ -40,7 +40,7 @@ if [[ ! -z $1 ]]; then
 fi
 
 version=$(header_version "../include/cassandra.h")
-base="cassandra-cpp-driver-$version"
+base="scylla-cpp-driver-$version"
 archive="$base.tar.gz"
 files="CMakeLists.txt cmake cmake_uninstall.cmake.in driver_config.hpp.in include src README.md LICENSE.txt"
 
@@ -69,15 +69,15 @@ echo "Copying files"
 for file in $files; do
   cp -r  "../$file" "build/SOURCES/$base"
 done
-cp cassandra.pc.in build/SOURCES
-cp cassandra_static.pc.in build/SOURCES
+cp scylla-cpp-driver.pc.in build/SOURCES
+cp scylla-cpp-driver_static.pc.in build/SOURCES
 
 echo "Archiving $archive"
 pushd "build/SOURCES"
 tar zcf $archive $base
 popd
 
 echo "Building package:"
-rpmbuild --target $arch --define "_topdir ${PWD}/build" --define "driver_version $version" --define "libuv_version $libuv_version" -ba cassandra-cpp-driver.spec
+rpmbuild --target $arch --define "_topdir ${PWD}/build" --define "driver_version $version" --define "libuv_version $libuv_version" -ba scylla-cpp-driver.spec
 
 exit 0

packaging/cassandra.pc.in

@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: scylla-cpp-driver
+Description: A C/C++ client driver for Scylla, Apache Cassandra and DataStax Products
+Version: @version@
+Libs: -L${libdir} -lscylla-cpp-driver
+Cflags: -I${includedir}
+URL: https://github.com/scylladb/cpp-driver/

packaging/cassandra_static.pc.in

@@ -2,18 +2,18 @@
 %define distnum %(/usr/lib/rpm/redhat/dist.sh --distnum)
 %endif
 
-Name:    cassandra-cpp-driver
+Name:    scylla-cpp-driver
 Epoch:   1
 Version: %{driver_version}
 Release: 1%{?dist}
-Summary: DataStax C/C++ Driver for Apache Cassandra and DataStax Products
+Summary: C/C++ Driver for Scylla, Apache Cassandra and DataStax Products
 
 Group: Development/Tools
 License: Apache 2.0
-URL: https://github.com/datastax/cpp-driver
+URL: https://github.com/scylladb/cpp-driver
 Source0: %{name}-%{version}.tar.gz
-Source1: cassandra.pc.in
-Source2: cassandra_static.pc.in
+Source1: scylla-cpp-driver.pc.in
+Source2: scylla-cpp-driver_static.pc.in
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -29,9 +29,9 @@ BuildRequires: libuv-devel >= %{libuv_version}
 BuildRequires: openssl-devel >= 0.9.8e
 
 %description
-A modern, feature-rich, and highly tunable C/C++ client library for Apache
-Cassandra and DataStax Products using Cassandra's native protocol and Cassandra
-Query Language along with extensions for DataStax Products.
+A modern, feature-rich, shard-aware, and highly tunable C/C++ client library for 
+ScyllaDB, Apache Cassandra and DataStax Products using Cassandra's native protocol and
+Cassandra Query Language along with extensions for DataStax Products.
 
 %package devel
 Summary: Development libraries for ${name}
@@ -53,6 +53,8 @@ export CFLAGS='%{optflags}'
 export CXXFLAGS='%{optflags}'
 %{cmakecmd} -DCMAKE_BUILD_TYPE=RELEASE -DCASS_BUILD_STATIC=ON -DCASS_INSTALL_PKG_CONFIG=OFF -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} -DCMAKE_INSTALL_LIBDIR=%{_libdir} .
 make %{?_smp_mflags}
+ln -s libscylla-cpp-driver.so libcassandra.so
+ln -s libscylla-cpp-driver_static.a libcassandra_static.a
 
 %install
 rm -rf %{buildroot}
@@ -64,13 +66,13 @@ sed -e "s#@prefix@#%{_prefix}#g" \
     -e "s#@libdir@#%{_libdir}#g" \
     -e "s#@includedir@#%{_includedir}#g" \
     -e "s#@version@#%{version}#g" \
-    %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/cassandra.pc
+    %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/scylla-cpp-driver.pc
 sed -e "s#@prefix@#%{_prefix}#g" \
     -e "s#@exec_prefix@#%{_exec_prefix}#g" \
     -e "s#@libdir@#%{_libdir}#g" \
     -e "s#@includedir@#%{_includedir}#g" \
     -e "s#@version@#%{version}#g" \
-    %SOURCE2 > %{buildroot}/%{_libdir}/pkgconfig/cassandra_static.pc
+    %SOURCE2 > %{buildroot}/%{_libdir}/pkgconfig/scylla-cpp-driver_static.pc
 
 %clean
 rm -rf %{buildroot}

packaging/scylla-cpp-driver.pc.in

@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: scylla-cpp-driver
+Description: A C/C++ client driver for Scylla, Apache Cassandra and DataStax Products
+Version: @version@
+Requires: libuv
+Requires: openssl
+Libs: -L${libdir} -lscylla-cpp-driver_static -lstdc++
+Cflags: -I${includedir}
+URL: https://github.com/scylladb/cpp-driver/

packaging/cassandra-cpp-driver.spec renamed to packaging/scylla-cpp-driver.spec

@@ -136,39 +136,39 @@ configure_file(
 #------------------------------
 
 if(CASS_BUILD_SHARED)
-  add_library(cassandra SHARED 
+  add_library(scylla-cpp-driver SHARED 
     ${SOURCES}
     $<TARGET_OBJECTS:curl_hostcheck>
     $<TARGET_OBJECTS:hdr_histogram>
     $<TARGET_OBJECTS:http-parser>
     $<TARGET_OBJECTS:minizip>)
-  target_link_libraries(cassandra ${CASS_LIBS})
-  target_include_directories(cassandra PRIVATE ${INCLUDE_DIRS} ${CASS_INCLUDES})
+  target_link_libraries(scylla-cpp-driver ${CASS_LIBS})
+  target_include_directories(scylla-cpp-driver PRIVATE ${INCLUDE_DIRS} ${CASS_INCLUDES})
 
-  set_target_properties(cassandra PROPERTIES OUTPUT_NAME cassandra)
-  set_target_properties(cassandra PROPERTIES VERSION ${PROJECT_VERSION_STRING} SOVERSION ${PROJECT_VERSION_MAJOR})
-  set_target_properties(cassandra PROPERTIES
-      COMPILE_PDB_NAME "cassandra"
+  set_target_properties(scylla-cpp-driver PROPERTIES OUTPUT_NAME scylla-cpp-driver)
+  set_target_properties(scylla-cpp-driver PROPERTIES VERSION ${PROJECT_VERSION_STRING} SOVERSION ${PROJECT_VERSION_MAJOR})
+  set_target_properties(scylla-cpp-driver PROPERTIES
+      COMPILE_PDB_NAME "scylla-cpp-driver"
       COMPILE_PDB_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}")
-  set_target_properties(cassandra PROPERTIES
+  set_target_properties(scylla-cpp-driver PROPERTIES
       ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
       LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
       RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
-  set_target_properties(cassandra PROPERTIES FOLDER "Driver")
+  set_target_properties(scylla-cpp-driver PROPERTIES FOLDER "Driver")
 
-  target_compile_definitions(cassandra PRIVATE CASS_BUILDING)
+  target_compile_definitions(scylla-cpp-driver PRIVATE CASS_BUILDING)
 
   if(CASS_USE_BOOST_ATOMIC AND BOOST_LIBRARY_NAME)
-    add_dependencies(cassandra ${BOOST_LIBRARY_NAME})
+    add_dependencies(scylla-cpp-driver ${BOOST_LIBRARY_NAME})
   endif()
   if(LIBUV_LIBRARY_NAME)
-    add_dependencies(cassandra ${LIBUV_LIBRARY_NAME})
+    add_dependencies(scylla-cpp-driver ${LIBUV_LIBRARY_NAME})
   endif()
   if(OPENSSL_LIBRARY_NAME)
-    add_dependencies(cassandra ${OPENSSL_LIBRARY_NAME})
+    add_dependencies(scylla-cpp-driver ${OPENSSL_LIBRARY_NAME})
   endif()
   if(ZLIB_LIBRARY_NAME)
-    add_dependencies(cassandra ${ZLIB_LIBRARY_NAME})
+    add_dependencies(scylla-cpp-driver ${ZLIB_LIBRARY_NAME})
   endif()
 endif()
 
@@ -182,7 +182,7 @@ if(CASS_BUILD_STATIC)
   target_link_libraries(cassandra_static ${CASS_LIBS})
   target_include_directories(cassandra_static PRIVATE ${INCLUDE_DIRS} ${CASS_INCLUDES})
 
-  set_target_properties(cassandra_static PROPERTIES OUTPUT_NAME cassandra_static)
+  set_target_properties(cassandra_static PROPERTIES OUTPUT_NAME scylla-cpp-driver_static)
   set_target_properties(cassandra_static PROPERTIES VERSION ${PROJECT_VERSION_STRING} SOVERSION ${PROJECT_VERSION_MAJOR})
   set_target_properties(cassandra_static PROPERTIES
       COMPILE_PDB_NAME "cassandra_static"
@@ -270,21 +270,21 @@ endif()
 
 # Install the dynamic/shared library
 if(CASS_BUILD_SHARED)
-  install(TARGETS cassandra
+  install(TARGETS scylla-cpp-driver
     RUNTIME DESTINATION ${INSTALL_DLL_EXE_DIR}  # for dll/executable/pdb files
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}  # for shared library
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) # for static library
   if(CASS_INSTALL_PKG_CONFIG)
     if(NOT WIN32)
       if(PKG_CONFIG_FOUND)
-        configure_file("${PROJECT_SOURCE_DIR}/packaging/cassandra.pc.in" "cassandra.pc" @ONLY)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cassandra.pc"
+        configure_file("${PROJECT_SOURCE_DIR}/packaging/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")
       endif()
     endif()
   endif()
   if(WIN32)
-    install(FILES $<TARGET_PDB_FILE:cassandra>
+    install(FILES $<TARGET_PDB_FILE:scylla-cpp-driver>
       DESTINATION "${INSTALL_DLL_EXE_DIR}"
       OPTIONAL)
   endif()
@@ -298,8 +298,8 @@ if(CASS_BUILD_STATIC)
   if(CASS_INSTALL_PKG_CONFIG)
     if(NOT WIN32)
       if(PKG_CONFIG_FOUND)
-        configure_file("${PROJECT_SOURCE_DIR}/packaging/cassandra_static.pc.in" "cassandra_static.pc" @ONLY)
-        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/cassandra_static.pc"
+        configure_file("${PROJECT_SOURCE_DIR}/packaging/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")
       endif()
     endif()