Adding dirver UnixODBC template ini file to installation(RPM/DEB/TGZ)

Adding (post)installation script to RPM and DEB to register the driver
with DM
Adding source rpm build
Moved all packaging, i.e. osxinstall and wininstall under packaging
subdirectory as macos and windows, respectively

CMakeLists.txt

@@ -210,7 +210,7 @@ IF(NOT USE_SYSTEM_INSTALLED_LIB)
   ELSE()
     INSTALL(FILES
             $<TARGET_FILE:libmariadb>
-            DESTINATION ${INSTALL_LIBDIR}
+            DESTINATION "${INSTALL_LIBDIR}"
             COMPONENT ConCLib)
     MESSAGE(STATUS "Configuring to install libmariadb to ${INSTALL_LIBDIR}")
     IF(NOT ALL_PLUGINS_STATIC)
@@ -436,6 +436,14 @@ ELSEIF(APPLE)
 ENDIF()
 
 SET(CPACK_PACKAGE_NAME "mariadb-connector-odbc")
+
+# "set/append array" - append a set of strings, separated by a space
+MACRO(SETA var)
+  FOREACH(v ${ARGN})
+    SET(${var} "${${var}} ${v}")
+  ENDFOREACH()
+ENDMACRO(SETA)
+
 IF(WIN32)
   IF(WITH_MSI)
     IF(ALL_PLUGINS_STATIC)
@@ -444,38 +452,74 @@ IF(WIN32)
                                       -DPLUGINS_LIB_DIR=""
                                       -DINSTALLER_TOOLS_DIR=$<TARGET_FILE_DIR:change_dsns_driver>
                                       -DPLUGINS_SUBDIR_NAME=${MARIADB_DEFAULT_PLUGINS_SUBDIR}
-                                      -DFILE_IN=${CMAKE_SOURCE_DIR}/wininstall/binaries_dir.xml.in
-                                      -DFILE_OUT=${CMAKE_SOURCE_DIR}/wininstall/binaries_dir.xml
+                                      -DFILE_IN=${CMAKE_SOURCE_DIR}/packaging/windows/binaries_dir.xml.in
+                                      -DFILE_OUT=${CMAKE_SOURCE_DIR}/packaging/windows/binaries_dir.xml
                                       -P ${CMAKE_SOURCE_DIR}/cmake/ConfigureFile.cmake)
     ELSE()
       ADD_CUSTOM_COMMAND(TARGET maodbc POST_BUILD
         COMMAND ${CMAKE_COMMAND} ARGS -DDRIVER_LIB_DIR=$<TARGET_FILE_DIR:maodbc>
                                       -DPLUGINS_LIB_DIR=$<TARGET_FILE_DIR:dialog>
                                       -DINSTALLER_TOOLS_DIR=$<TARGET_FILE_DIR:change_dsns_driver>
                                       -DPLUGINS_SUBDIR_NAME=${MARIADB_DEFAULT_PLUGINS_SUBDIR}
-                                      -DFILE_IN=${CMAKE_SOURCE_DIR}/wininstall/binaries_dir.xml.in
-                                      -DFILE_OUT=${CMAKE_SOURCE_DIR}/wininstall/binaries_dir.xml
+                                      -DFILE_IN=${CMAKE_SOURCE_DIR}/packaging/windows/binaries_dir.xml.in
+                                      -DFILE_OUT=${CMAKE_SOURCE_DIR}/packaging/windows/binaries_dir.xml
                                       -P ${CMAKE_SOURCE_DIR}/cmake/ConfigureFile.cmake)
 
     ENDIF()
-    ADD_SUBDIRECTORY(wininstall)
+    ADD_SUBDIRECTORY(packaging/windows)
   ELSE()
     MESSAGE(STATUS "MSI package won't be generated - WITH_MSI=${WITH_MSI}")
   ENDIF()
-  ADD_EXECUTABLE(install_driver osxinstall/install_driver.c)
+  ADD_EXECUTABLE(install_driver packaging/macos/install_driver.c)
   TARGET_LINK_LIBRARIES(install_driver ${PLATFORM_DEPENDENCIES} ${ODBC_INSTLIBS})
 ELSE()
   IF(APPLE)
     MESSAGE(STATUS "Configuring to generate PKG package")
-    ADD_SUBDIRECTORY(osxinstall)
+    ADD_SUBDIRECTORY(packaging/macos)
   ELSE()
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libmaodbc.pc.in
                    ${CMAKE_CURRENT_BINARY_DIR}/libmaodbc.pc @ONLY)
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmaodbc.pc
             DESTINATION "${INSTALL_PCDIR}"
             COMPONENT Development)
-    IF(RPM)
-      SET(CPACK_RPM_Development_USER_FILELIST "%ignore ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR}")
+    # Not doing this with MacOS(iOdbc). So far, at least
+    CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/packaging/linux/maodbc.ini.in
+                   ${CMAKE_BINARY_DIR}/packaging/linux/maodbc.ini @ONLY)
+    INSTALL(FILES
+            ${CMAKE_BINARY_DIR}/packaging/linux/maodbc.ini
+            DESTINATION
+            "${INSTALL_DOCDIR}"
+            COMPONENT Documentation)
+    IF(RPM OR DEB)
+      CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/packaging/linux/postinstall.in
+                     ${CMAKE_BINARY_DIR}/packaging/linux/postinstall @ONLY)
+
+      IF(RPM)
+        SET(CPACK_RPM_Development_USER_FILELIST "%ignore ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR}")
+        SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR})
+        MESSAGE(STATUS "Excluding ${CMAKE_INSTALL_PREFIX}/${INSTALL_PCDIR} from RPM filelist")
+        SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_BINARY_DIR}/packaging/linux/postinstall)
+
+        IF(CMAKE_VERSION VERSION_GREATER "3.9.99")
+
+          SET(CPACK_SOURCE_GENERATOR "RPM")
+          SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS "-DRPM=${RPM}")
+
+          MACRO(ADDIF var)
+            IF(DEFINED ${var})
+              SETA(CPACK_RPM_SOURCE_PKG_BUILD_PARAMS "-D${var}=${${var}}")
+            ENDIF()
+          ENDMACRO()
+
+          ADDIF(CMAKE_BUILD_TYPE)
+          ADDIF(BUILD_CONFIG)
+          #ADDIF(WITH_SSL)
+
+        ENDIF()
+      ELSE()
+        SET(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_BINARY_DIR}/packaging/linux/postinstall")
+      ENDIF()
+
     ENDIF()
   ENDIF()
   INSTALL(TARGETS
@@ -488,6 +532,7 @@ ELSE()
           DESTINATION
           "${INSTALL_DOCDIR}"
           COMPONENT Documentation)
+
   INSTALL(FILES
           ${CMAKE_SOURCE_DIR}/COPYING
           DESTINATION
@@ -573,7 +618,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-connector-odbc-${CPACK_PACKAGE_VERSION}${QUALITY_SUFFIX}-src")
 SET(CPACK_PACKAGE_CONTACT "[email protected]")
-SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation AB")
+SET(CPACK_PACKAGE_VENDOR "MariaDB plc")
 SET(CPACK_SOURCE_IGNORE_FILES
 /test/
 /.git/

packaging/linux/maodbc.ini.in

@@ -0,0 +1,9 @@
+[MariaDB]
+Driver      = @CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/libmaodbc.so
+DESCRIPTION = MariaDB ODBC Connector
+Threading   = 0
+
+[@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/libmaodbc.so]
+Driver      = @CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/libmaodbc.so
+DESCRIPTION = MariaDB ODBC Connector
+Threading   = 0

packaging/linux/postinstall.in

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if ! odbcinst -i -d -n "MariaDB ODBC Connector" -f @CMAKE_INSTALL_PREFIX@/@INSTALL_DOCDIR@/maodbc.ini ; then
+  if [-z ${ODBCINSTINI+x}]; then
+    if [-z ${ODBCSYSINI+x}]; then
+      ODBCINIFILE="/etc/odbcinst.ini";
+    else
+      ODBCINIFILE="$ODBCSYSINI/odbcinst.ini";
+    fi
+  else
+    ODBCINIFILE="$ODBCINSTINI";
+  fi
+
+  cat @CMAKE_INSTALL_PREFIX@/@INSTALL_DOCDIR@/maodbc.ini >> $ODBCINIFILE
+fi

osxinstall/CMakeLists.txt → packaging/macos/CMakeLists.txt

@@ -1,6 +1,7 @@
 # ************************************************************************************
 #   Copyright (C) 2019,2020 MariaDB Corporation AB
-#   
+#                 2023 MariaDB plc
+#
 #   This library is free software; you can redistribute it and/or
 #   modify it under the terms of the GNU Library General Public
 #   License as published by the Free Software Foundation; either
@@ -17,7 +18,7 @@
 #   51 Franklin St., Fifth Floor, Boston, MA 02110, USA
 # *************************************************************************************/
 
-SET(ODBC_SOURCE_PKG_DIR ${CMAKE_SOURCE_DIR}/osxinstall)
+SET(ODBC_SOURCE_PKG_DIR ${CMAKE_SOURCE_DIR}/packaging/macos)
 
 # Get revision number
 IF(WITH_REVNO)

wininstall/CMakeLists.txt → packaging/windows/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(ODBC_SOURCE_WIX_DIR ${CMAKE_SOURCE_DIR}/wininstall)
+SET(ODBC_SOURCE_WIX_DIR ${CMAKE_SOURCE_DIR}/packaging/windows)
 
 # Get revision number
 IF(WITH_REVNO)
@@ -83,8 +83,8 @@ ELSE()
   SET(GUID_INSTALLER_TOOLS "786BD2C3-20B0-4b8f-8D9B-374C736E3A1B")
 ENDIF()
 
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/wininstall/mariadb_odbc.xml.in
-               ${CMAKE_BINARY_DIR}/wininstall/mariadb_odbc.xml)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/packaging/windows/mariadb_odbc.xml.in
+               ${CMAKE_BINARY_DIR}/packaging/windows/mariadb_odbc.xml)
 IF(${revno})
   SET(MSI_PACKAGE "mariadb-connector-odbc-${PRODUCT_VERSION}-r${revno}-${PLATFORM}.msi")
 ELSE()