Merge branch '3.3' into 3.4

Author: 9EOR9

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "docs"]
+	path = docs
+	url = https://github.com/mariadb-corporation/mariadb-connector-c.wiki.git

CMakeLists.txt

@@ -54,6 +54,7 @@ ENDMACRO()
 ### Options ###
 IF(NOT WIN32)
   ADD_OPTION(WITH_MYSQLCOMPAT "creates libmysql* symbolic links" OFF)
+  ADD_OPTION(WITH_DOCS "creates manpages" OFF)
 ELSE()
   ADD_OPTION(WITH_MSI "Build MSI installation package" OFF)
   ADD_OPTION(WITH_SIGNCODE "digitally sign files" OFF)
@@ -149,7 +150,6 @@ IF(NOT CMAKE_BUILD_TYPE)
   SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
 ENDIF()
 
-# various defines for generating include/mysql_version.h
 INCLUDE(FindGit)
 IF(GIT_EXECUTABLE AND EXISTS ${CC_SOURCE_DIR}/.git)
   EXECUTE_PROCESS(
@@ -159,7 +159,12 @@ IF(GIT_EXECUTABLE AND EXISTS ${CC_SOURCE_DIR}/.git)
    IF(RES EQUAL 0)
     STRING(REGEX REPLACE "\n$" "" CC_SOURCE_REVISION "${OUT}")
   ENDIF()
+  EXECUTE_PROCESS(
+    COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+            WORKING_DIRECTORY ${CC_SOURCE_DIR})
 ENDIF()
+
+# various defines for generating include/mysql_version.h
 SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
 
 # if C/C is build as subproject inside MariaDB server tree we will
@@ -447,14 +452,16 @@ IF(IS_DIRECTORY ${CC_SOURCE_DIR}/unittest)
   ENDIF()
 ENDIF()
 
-IF(CLIENT_DOCS)
-  INSTALL(DIRECTORY ${CLIENT_DOCS}
-          DESTINATION ${DOCS_INSTALL_DIR_${INSTALL_LAYOUT}}
-          COMPONENT SharedLibraries)
-ENDIF()
+#IF(CLIENT_DOCS)
+#  INSTALL(DIRECTORY ${CLIENT_DOCS}
+#          DESTINATION ${DOCS_INSTALL_DIR_${INSTALL_LAYOUT}}
+#          COMPONENT SharedLibraries)
+#ENDIF()
 
 IF(UNIX)
-  ADD_SUBDIRECTORY(man)
+  IF(WITH_DOCS)
+    ADD_SUBDIRECTORY(man)
+  ENDIF()
 ENDIF()
 
 IF(WIN32 AND WITH_MSI AND CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")

docs

@@ -160,7 +160,7 @@ typedef struct st_mysql_error_info
 
 typedef int  (*mysql_stmt_fetch_row_func)(MYSQL_STMT *stmt, unsigned char **row);
 typedef void (*ps_result_callback)(void *data, unsigned int column, unsigned char **row);
-typedef my_bool *(*ps_param_callback)(void *data, MYSQL_BIND *bind, unsigned int row_nr);
+typedef my_bool (*ps_param_callback)(void *data, MYSQL_BIND *bind, unsigned int row_nr);
 
 struct st_mysql_stmt
 {

include/mariadb_stmt.h

@@ -120,4 +120,16 @@ mysql_thread_init.3
 mysql_use_result.3
 mysql_warning_count.3)
 
+set(Python3_FIND_STRATEGY VERSION)
+find_package (Python3 REQUIRED)
+
+find_package(Doxygen REQUIRED)
+
+ADD_CUSTOM_COMMAND(OUTPUT ${CC_MAN_PAGES_3}
+                   COMMAND python3 ${CC_SOURCE_DIR}/scripts/create_man
+                                   --docs=${CC_SOURCE_DIR}/docs --funcs=${CC_BINARY_DIR}/manpages.list
+                                   --version=${CPACK_PACKAGE_VERSION} --out=${CC_BINARY_DIR}/man
+                   DEPENDS ${CC_BINARY_DIR}/manpages.list)
+ADD_CUSTOM_TARGET(docs ALL DEPENDS ${CC_MAN_PAGES_3})
+
 INSTALL(FILES ${CC_MAN_PAGES_3} DESTINATION ${INSTALL_MANDIR}/man3 COMPONENT ManPagesDevelopment)