Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Windows packaging fixes
  • Loading branch information
9EOR9 committed Dec 19, 2016
1 parent 413b8bc commit d0a0e4c
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 19 deletions.
5 changes: 2 additions & 3 deletions CMakeLists.txt
Expand Up @@ -30,8 +30,7 @@ FOREACH(V WITH_MYSQLCOMPAT WITH_MSI WITH_SIGNCODE WITH_RTC WITH_UNITTEST
SET(${V} ${${OPT}${V}})
ENDFOREACH()


SET(PACKAGE_STATUS_SUFFIX "alpha")
SET(PACKAGE_STATUS_SUFFIX "beta")

SET(CC_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
SET(CC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
Expand Down Expand Up @@ -345,7 +344,7 @@ ENDIF()


IF(WIN32 AND WITH_MSI AND CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
DD_SUBDIRECTORY(win/packaging)
ADD_SUBDIRECTORY(win/packaging)
ENDIF()

SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab")
Expand Down
4 changes: 0 additions & 4 deletions cmake/sign.cmake
Expand Up @@ -9,11 +9,7 @@ MACRO(SIGN_TARGET target)
IF(WITH_SIGNCODE)
IF(WIN32)
SET(target_file $<TARGET_FILE:${target}>)
IF(EXISTS "/tools/sign.bat")
ADD_CUSTOM_COMMAND(TARGET ${target} COMMAND /tools/sign.bat ARGS ${target_file})
ELSEIF()
ADD_CUSTOM_COMMAND(TARGET ${target} COMMAND signtool ARGS sign ${SIGN_OPTIONS} ${target_file})
ENDIF()
ENDIF()
ENDIF()
ENDMACRO()
11 changes: 6 additions & 5 deletions include/CMakeLists.txt
Expand Up @@ -7,13 +7,16 @@ SET(MARIADB_CLIENT_INCLUDES ${CC_SOURCE_DIR}/include/mariadb_com.h
${CC_SOURCE_DIR}/include/ma_list.h
${CC_SOURCE_DIR}/include/errmsg.h
${CC_SOURCE_DIR}/include/mariadb_dyncol.h
${CC_SOURCE_DIR}/include/mariadb_ctype.h)
${CC_SOURCE_DIR}/include/mariadb_ctype.h
PARENT_SCOPE)
SET(MYSQL_ADDITIONAL_INCLUDES
${CC_SOURCE_DIR}/include/mysql/client_plugin.h
${CC_SOURCE_DIR}/include/mysql/plugin_auth_common.h
${CC_SOURCE_DIR}/include/mysql/plugin_auth.h)
${CC_SOURCE_DIR}/include/mysql/plugin_auth.h
PARENT_SCOPE)
SET(MARIADB_ADDITIONAL_INCLUDES
${CC_SOURCE_DIR}/include/mariadb/ma_io.h)
${CC_SOURCE_DIR}/include/mariadb/ma_io.h
PARENT_SCOPE)

INSTALL(FILES
${MARIADB_CLIENT_INCLUDES}
Expand All @@ -27,5 +30,3 @@ INSTALL(FILES
${MARIADB_ADDITIONAL_INCLUDES}
DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
COMPONENT Development)


8 changes: 4 additions & 4 deletions plugins/auth/CMakeLists.txt
Expand Up @@ -16,14 +16,14 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNAMIC")
"ORIGINAL_FILE_NAME:dialog.dll"
"FILE_DESCRIPTION:Authentication plugin")
ENDIF()
SET(DIALOG_SOURCES ${ialog_RC} dialog.c ${CC_SOURCE_DIR}/libmariadb/get_password.c)
SET(DIALOG_SOURCES ${dialog_RC} dialog.c ${CC_SOURCE_DIR}/libmariadb/get_password.c)
IF(WIN32)
SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CC_SOURCE_DIR}/plugins/plugin.def)
ENDIF()
ADD_LIBRARY(dialog MODULE ${DIALOG_SOURCES})
SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "")
INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth)
SIGN_TARGET(dialog)
INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth)
ENDIF()

# old_password plugin
Expand Down Expand Up @@ -80,7 +80,7 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "DYNAMIC")
"ORIGINAL_FILE_NAME:auth_gssapi_client.dll"
"FILE_DESCRIPTION:Authentication plugin")
ADD_DEFINITIONS(-DHAVE_AUTH_GSSAPI_DYNAMIC=1)
SET(GSSAPI_SOURCES auth_gssapi_client.c sspi_client.c sspi_errmsg.c ${CC_SOURCE_DIR}/plugins/plugin.def ${gssapi_RC})
SET(GSSAPI_SOURCES auth_gssapi_client.c sspi_client.c sspi_errmsg.c ${CC_SOURCE_DIR}/plugins/plugin.def ${auth_gssapi_client_RC})
ELSE()
IF(GSSAPI_FOUND)
SET(GSSAPI_SOURCES auth_gssapi_client.c gssapi_client.c gssapi_errmsg.c)
Expand All @@ -94,7 +94,7 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "DYNAMIC")
TARGET_LINK_LIBRARIES(auth_gssapi_client ${GSSAPI_LIBS})
ENDIF()
SET_TARGET_PROPERTIES(auth_gssapi_client PROPERTIES PREFIX "")
INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth)
SIGN_TARGET(auth_gssapi_client)
INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth)
ENDIF()
ENDIF()
16 changes: 13 additions & 3 deletions win/packaging/CMakeLists.txt
Expand Up @@ -39,16 +39,26 @@ FOREACH(plugin ${PLUGINS})
ENDIF()
ENDFOREACH()

SET(ALL_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES})
SET(ALL_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES})
FOREACH(src ${ALL_INCLUDES})
STRING(REPLACE "${CC_SOURCE_DIR}/include/" "" src ${src})
# check binary dir
STRING(REPLACE "${CC_BINARY_DIR}/include/" "" chgbin ${src})
IF (${chgbin} STREQUAL ${src})
SET(SRC_DIR ${CC_SOURCE_DIR})
ELSE()
SET(SRC_DIR ${CC_BINARY_DIR})
STRING(REPLACE "${CC_BINARY_DIR}/include/" "" src ${src})
ENDIF()
STRING(REPLACE "-" "_" src_id ${src})
STRING(REPLACE "mysql/" "" src_id ${src_id})
STRING(REPLACE "mysql/" "" src_name ${src})
STRING(REPLACE "mariadb/" "" src_name ${src_name})
STRING(REPLACE "mariadb/" "" src_id ${src_id})
IF(${src} MATCHES "mysql/")
SET(MARIADB_INCLUDEMYSQL_FILES "${MARIADB_INCLUDEMYSQL_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${CC_SOURCE_DIR}/include/${src}\"/>\n")
SET(MARIADB_INCLUDEMYSQL_FILES "${MARIADB_INCLUDEMYSQL_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${SRC_DIR}/include/${src}\"/>\n")
ELSE()
SET(MARIADB_INCLUDE_FILES "${MARIADB_INCLUDE_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${CC_SOURCE_DIR}/include/${src}\"/>\n")
SET(MARIADB_INCLUDE_FILES "${MARIADB_INCLUDE_FILES} <File Id=\"${src_id}\" Name=\"${src_name}\" DiskId=\"1\" Source=\"${SRC_DIR}/include/${src}\"/>\n")
ENDIF()
ENDFOREACH()

Expand Down
1 change: 1 addition & 0 deletions win/packaging/mariadb-connector-c.xml.in
Expand Up @@ -71,6 +71,7 @@
@MARIADB_INCLUDE_FILES@
</Component>
<Component Id="MysqlIncludes" Guid="6BD3D62D-8013-4C0A-B032-61AA04A98EDE" Directory="instincludemysql" DiskId="1" Win64="@IS_WIN64@">
<CreateFolder/>
@MARIADB_INCLUDEMYSQL_FILES@
</Component>
</Fragment>
Expand Down

0 comments on commit d0a0e4c

Please sign in to comment.