Skip to content

Commit cd81266

Browse files
committed
Fixed build of manpages
To build manpages run cmake with option -DWITH_DOCS=ON. Creation of man pages requires Python3 and Docygen. The bundled manpaes were removed from repository.
1 parent 312b7ea commit cd81266

File tree

133 files changed

+34
-6657
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

133 files changed

+34
-6657
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "docs"]
2+
path = docs
3+
url = https://github.com/mariadb-corporation/mariadb-connector-c.wiki.git

CMakeLists.txt

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ ENDMACRO()
5353
### Options ###
5454
IF(NOT WIN32)
5555
ADD_OPTION(WITH_MYSQLCOMPAT "creates libmysql* symbolic links" OFF)
56+
ADD_OPTION(WITH_DOCS "creates manpages" OFF)
5657
ELSE()
5758
ADD_OPTION(WITH_MSI "Build MSI installation package" OFF)
5859
ADD_OPTION(WITH_SIGNCODE "digitally sign files" OFF)
@@ -147,7 +148,6 @@ IF(NOT CMAKE_BUILD_TYPE)
147148
SET(CMAKE_BUILD_TYPE "RelWithDebInfo")
148149
ENDIF()
149150

150-
# various defines for generating include/mysql_version.h
151151
INCLUDE(FindGit)
152152
IF(GIT_EXECUTABLE AND EXISTS ${CC_SOURCE_DIR}/.git)
153153
EXECUTE_PROCESS(
@@ -157,7 +157,12 @@ IF(GIT_EXECUTABLE AND EXISTS ${CC_SOURCE_DIR}/.git)
157157
IF(RES EQUAL 0)
158158
STRING(REGEX REPLACE "\n$" "" CC_SOURCE_REVISION "${OUT}")
159159
ENDIF()
160+
EXECUTE_PROCESS(
161+
COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
162+
WORKING_DIRECTORY ${CC_SOURCE_DIR})
160163
ENDIF()
164+
165+
# various defines for generating include/mysql_version.h
161166
SET(PROTOCOL_VERSION 10) # we adapted new password option from PHP's mysqlnd !
162167

163168
# if C/C is build as subproject inside MariaDB server tree we will
@@ -439,14 +444,16 @@ IF(IS_DIRECTORY ${CC_SOURCE_DIR}/unittest)
439444
ENDIF()
440445
ENDIF()
441446

442-
IF(CLIENT_DOCS)
443-
INSTALL(DIRECTORY ${CLIENT_DOCS}
444-
DESTINATION ${DOCS_INSTALL_DIR_${INSTALL_LAYOUT}}
445-
COMPONENT SharedLibraries)
446-
ENDIF()
447+
#IF(CLIENT_DOCS)
448+
# INSTALL(DIRECTORY ${CLIENT_DOCS}
449+
# DESTINATION ${DOCS_INSTALL_DIR_${INSTALL_LAYOUT}}
450+
# COMPONENT SharedLibraries)
451+
#ENDIF()
447452

448453
IF(UNIX)
449-
ADD_SUBDIRECTORY(man)
454+
IF(WITH_DOCS)
455+
ADD_SUBDIRECTORY(man)
456+
ENDIF()
450457
ENDIF()
451458

452459
IF(WIN32 AND WITH_MSI AND CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")

docs

Submodule docs added at 7e12bce

man/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,4 +120,16 @@ mysql_thread_init.3
120120
mysql_use_result.3
121121
mysql_warning_count.3)
122122

123+
set(Python3_FIND_STRATEGY VERSION)
124+
find_package (Python3 REQUIRED)
125+
126+
find_package(Doxygen REQUIRED)
127+
128+
ADD_CUSTOM_COMMAND(OUTPUT ${CC_MAN_PAGES_3}
129+
COMMAND python3 ${CC_SOURCE_DIR}/scripts/create_man
130+
--docs=${CC_SOURCE_DIR}/docs --funcs=${CC_BINARY_DIR}/manpages.list
131+
--version=${CPACK_PACKAGE_VERSION} --out=${CC_BINARY_DIR}/man
132+
DEPENDS ${CC_BINARY_DIR}/manpages.list)
133+
ADD_CUSTOM_TARGET(docs ALL DEPENDS ${CC_MAN_PAGES_3})
134+
123135
INSTALL(FILES ${CC_MAN_PAGES_3} DESTINATION ${INSTALL_MANDIR}/man3 COMPONENT ManPagesDevelopment)

man/mariadb_cancel.3

Lines changed: 0 additions & 36 deletions
This file was deleted.

man/mariadb_connection.3

Lines changed: 0 additions & 29 deletions
This file was deleted.

man/mariadb_dyncol_check.3

Lines changed: 0 additions & 32 deletions
This file was deleted.

man/mariadb_dyncol_column_cmp_named.3

Lines changed: 0 additions & 31 deletions
This file was deleted.

man/mariadb_dyncol_column_count.3

Lines changed: 0 additions & 36 deletions
This file was deleted.

man/mariadb_dyncol_create_many_named.3

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)