simplify CMakeLists.txt for cassandra/connect engines

now, if the dynamic plugin puts itself in a distinct component, then
* ${plugin}.cnf file is generated and installed automatically
* a separate RPM is generated automatically
* necessary FILELIST/PROVIDES/OBSOLETES/REQUIRES are filled in automatically

cmake/cpack_deb.cmake

@@ -5,5 +5,6 @@
 IF(DEB)
 SET(CPACK_COMPONENT_SERVER_GROUP "server")
 SET(CPACK_COMPONENT_README_GROUP "server")
+SET(CPACK_COMPONENTS_ALL Server Test SharedLibraries)
 ENDIF(DEB)
 

cmake/plugin.cmake

@@ -46,7 +46,7 @@ ENDMACRO()
 
 MACRO(MYSQL_ADD_PLUGIN)
   MYSQL_PARSE_ARGUMENTS(ARG
-    "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT"
+    "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME;COMPONENT;CONFIG"
     "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
     ${ARGN}
   )
@@ -209,14 +209,20 @@ MACRO(MYSQL_ADD_PLUGIN)
       OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}")  
     # Install dynamic library
     IF(ARG_COMPONENT)
-      IF(RPM AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
+      IF(CPACK_COMPONENTS_ALL AND NOT CPACK_COMPONENTS_ALL MATCHES ${ARG_COMPONENT})
         SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} ${ARG_COMPONENT} PARENT_SCOPE)
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE)
 
+        IF (NOT ARG_CONFIG)
+          SET(ARG_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/${target}.cnf")
+          FILE(WRITE ${ARG_CONFIG} "[mariadb]\nplugin-load-add=${ARG_MODULE_OUTPUT_NAME}.so\n")
+        ENDIF()
+        INSTALL(FILES ${ARG_CONFIG} COMPONENT ${ARG_COMPONENT} DESTINATION ${INSTALL_SYSCONF2DIR})
+
         # workarounds for cmake issues #13248 and #12864:
-        SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} PARENT_SCOPE)
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
         SET(CPACK_RPM_${ARG_COMPONENT}_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE)
+        SET(CPACK_RPM_${ARG_COMPONENT}_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
       ENDIF()
     ELSE()
       SET(ARG_COMPONENT Server)

debian/mariadb-connect-engine-10.0.files

@@ -1 +1,2 @@
 usr/lib/mysql/plugin/ha_connect.so
+etc/mysql/conf.d/connect.cnf

storage/cassandra/CMakeLists.txt

@@ -53,19 +53,5 @@ IF(CASSANDRASE_OK)
   SET(CASSANDRA_DEB_FILES "usr/lib/mysql/plugin/ha_cassandra.so" PARENT_SCOPE)
 
   MYSQL_ADD_PLUGIN(cassandra ${cassandra_sources} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES thrift COMPONENT cassandra-engine)
-  IF (INSTALL_SYSCONFDIR)
-    INSTALL(FILES cassandra.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
-            COMPONENT cassandra-engine)
-  ENDIF(INSTALL_SYSCONFDIR)
-
-  IF(RPM)
-    SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} cassandra-engine PARENT_SCOPE)
-    SET(CPACK_RPM_cassandra-engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE)
-
-    # workarounds for cmake issues #13248 and #12864:
-    SET(CPACK_RPM_cassandra-engine_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE)
-    SET(CPACK_RPM_cassandra-engine_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
-    SET(CPACK_RPM_cassandra-engine_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE)
-  ENDIF(RPM)
 
 ENDIF(CASSANDRASE_OK)

storage/cassandra/cassandra.cnf

@@ -1,2 +0,0 @@
-[mariadb]
-plugin-load-add=ha_cassandra.so

storage/connect/CMakeLists.txt

@@ -271,27 +271,7 @@ ENDIF(CONNECT_WITH_ODBC)
 
 MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES}
   STORAGE_ENGINE
-  MODULE_OUTPUT_NAME "ha_connect"
   COMPONENT connect-engine
   LINK_LIBRARIES ${ZLIB_LIBRARY} ${XML_LIBRARY} ${ICONV_LIBRARY}
                  ${ODBC_LIBRARY} ${IPHLPAPI_LIBRARY})
 
-
-#
-# Packaging definitions
-#
-
-IF (INSTALL_SYSCONFDIR)
-    INSTALL(FILES connect.cnf DESTINATION ${INSTALL_SYSCONFDIR}/my.cnf.d
-            COMPONENT connect-engine)
-ENDIF(INSTALL_SYSCONFDIR)
-
-IF(RPM)
-  SET(CPACK_COMPONENTS_ALL ${CPACK_COMPONENTS_ALL} connect-engine PARENT_SCOPE)
-  SET(CPACK_RPM_connect-engine_PACKAGE_REQUIRES "MariaDB-server" PARENT_SCOPE)
-
-  # workarounds for cmake issues #13248 and #12864:
-  SET(CPACK_RPM_connect-engine_USER_FILELIST ${ignored} "%config(noreplace) /etc/my.cnf.d/*" PARENT_SCOPE)
-  SET(CPACK_RPM_connect-engine_PACKAGE_PROVIDES "cmake_bug_13248" PARENT_SCOPE)
-  SET(CPACK_RPM_connect-engine_PACKAGE_OBSOLETES "cmake_bug_13248" PARENT_SCOPE)
-ENDIF(RPM)

storage/connect/connect.cnf

@@ -1,2 +0,0 @@
-[mariadb]
-plugin-load-add=ha_connect.so

storage/tokudb/CMakeLists.txt

@@ -45,12 +45,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/toku_include)
 SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
 SET(TOKUDB_SOURCES ha_tokudb.cc)
 MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
-    COMPONENT "tokudb-engine"
+    COMPONENT "tokudb-engine" CONFIG tokudb.cnf
     LINK_LIBRARIES tokufractaltree_static tokuportability_static z stdc++)
 SET(CMAKE_MODULE_LINKER_FLAGS_RELEASE "${CMAKE_MODULE_LINKER_FLAGS_RELEASE} -flto -fuse-linker-plugin")
 
-IF (INSTALL_SYSCONF2DIR)
-  INSTALL(FILES tokudb.cnf DESTINATION ${INSTALL_SYSCONF2DIR} COMPONENT tokudb-engine)
-  SET(CPACK_RPM_tokudb-engine_USER_FILELIST ${ignored} "%config(noreplace) ${INSTALL_SYSCONF2DIR}/*" PARENT_SCOPE)
-ENDIF(INSTALL_SYSCONF2DIR)
-

storage/tokudb/tokudb.cnf

@@ -5,5 +5,5 @@
 # See https://mariadb.com/kb/en/tokudb-differences/ for differences
 # between TokuDB in MariaDB and TokuDB from http://www.tokutek.com/
 
-#plugin-load=ha_tokudb.so
+#plugin-load-add=ha_tokudb.so