VladPolskiy/mariadb-connector-cpp
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-connector-cpp.git synced 2025-08-15 20:45:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Includes added to MSI

Browse Source 
New banner product upgrade code and banner for msi.
Some amendments to tests build
This commit is contained in:
Lawrin Novitsky
2020-03-18 21:19:40 +01:00
parent 5b8a128ca2
commit 67f146ee6e
9 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -541,7 +541,9 @@ CTestTestfile.cmake
.*pdb$
.*sln$
.*sdf$
install_manifest_*txt
Makefile$
tests_config.h
/autom4te.cache/
/.travis/
.travis.yml

2
test/CJUnitTestsPort/CMakeLists.txt
View File

@ -35,7 +35,7 @@ IF(WIN32)
ADD_DEFINITIONS("-D_CRT_SECURE_NO_WARNINGS")
ELSEIF(NOT WIN32)
SET(MY_TARGET_LINK_LIBRARIES ${LIBRARY_NAME} test_framework)
SET(MY_TARGET_LINK_LIBRARIES ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework)
ENDIF(WIN32)
IF(CMAKE_COMPILER_IS_GNUCC AND MYSQLCPPCONN_GCOV_ENABLE)

2
test/unit/bugs/CMakeLists.txt
View File

@ -42,6 +42,6 @@ ENDIF(WIN32)
ADD_EXECUTABLE(unsorted_bugs ${bugs_sources})
SET_TARGET_PROPERTIES(unsorted_bugs PROPERTIES OUTPUT_NAME "unsorted_bugs")
TARGET_LINK_LIBRARIES(unsorted_bugs ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(unsorted_bugs ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring bugs test cases - unsorted")

22
test/unit/classes/CMakeLists.txt
View File

@ -53,7 +53,7 @@ ENDIF(WIN32)
# OUTPUT_NAME "connection"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_connection ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_connection ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
#MESSAGE(STATUS "Configuring unit tests - connection")
@ -74,7 +74,7 @@ ENDIF(WIN32)
# OUTPUT_NAME "databasemetadata"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_databasemetadata ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_databasemetadata ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
#MESSAGE(STATUS "Configuring unit tests - databasemetadata")
@ -96,7 +96,7 @@ SET_TARGET_PROPERTIES(test_resultsetmetadata PROPERTIES
OUTPUT_NAME "resultsetmetadata"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(test_resultsetmetadata ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(test_resultsetmetadata ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring unit tests - resultsetmetadata")
@ -117,7 +117,7 @@ SET_TARGET_PROPERTIES(test_resultset PROPERTIES
OUTPUT_NAME "resultset"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(test_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(test_resultset ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring unit tests - resultset")
@ -138,7 +138,7 @@ SET_TARGET_PROPERTIES(test_savepoint PROPERTIES
OUTPUT_NAME "savepoint"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(test_savepoint ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(test_savepoint ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring unit tests - savepoint")
@ -159,7 +159,7 @@ ENDIF(WIN32)
# OUTPUT_NAME "preparedstatement"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_preparedstatement ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_preparedstatement ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
#MESSAGE(STATUS "Configuring unit tests - preparedstatement")
@ -180,7 +180,7 @@ SET_TARGET_PROPERTIES(test_parametermetadata PROPERTIES
OUTPUT_NAME "parametermetadata"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(test_parametermetadata ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(test_parametermetadata ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring unit tests - parametermetadata")
@ -203,7 +203,7 @@ ENDIF(WIN32)
# OUTPUT_NAME "art_resultset"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_art_resultset ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_art_resultset ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
#MESSAGE(STATUS "Configuring unit tests - art_resultset")
@ -224,7 +224,7 @@ SET_TARGET_PROPERTIES(test_statement PROPERTIES
OUTPUT_NAME "statement"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(test_statement ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(test_statement ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
MESSAGE(STATUS "Configuring unit tests - statement")
@ -246,7 +246,7 @@ ENDIF(WIN32)
# OUTPUT_NAME "uri"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_uri ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_uri ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#MESSAGE(STATUS "Configuring unit tests - uri")
@ -268,6 +268,6 @@ ENDIF(WIN32)
# OUTPUT_NAME "variant"
# LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
# COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
#TARGET_LINK_LIBRARIES(test_variant ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
#TARGET_LINK_LIBRARIES(test_variant ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
#MESSAGE(STATUS "Configuring unit tests - variant")

3
test/unit/example/CMakeLists.txt
View File

@ -1,4 +1,5 @@
# Copyright (c) 2008, 2018, Oracle and/or its affiliates. All rights reserved.
# 2020 MariaDB Corportation AB
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2.0, as
@ -44,7 +45,7 @@ SET_TARGET_PROPERTIES(example PROPERTIES
OUTPUT_NAME "example"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(example ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(example ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} test_framework ${MY_GCOV_LINK_LIBRARIES})
#
# End of the instructions for building binary example from example.cpp|h

2
test/unit/performance/CMakeLists.txt
View File

@ -44,6 +44,6 @@ SET_TARGET_PROPERTIES(perf_statement PROPERTIES
OUTPUT_NAME "perf_statement"
LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}")
TARGET_LINK_LIBRARIES(perf_statement ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
TARGET_LINK_LIBRARIES(perf_statement ${LIBRARY_NAME} ${PLATFORM_DEPENDENCIES} ${MY_GCOV_LINK_LIBRARIES} test_framework)
MESSAGE(STATUS "Configuring performance test - statement")

4
wininstall/CMakeLists.txt
View File

@ -32,6 +32,8 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(GUID_DEBUG "B65F7C73-58BD-4c02-9EE5-F2C26DAC420E")
SET(GUID_PLUGINS "A0DB6358-383B-447c-9014-750F74266E3F")
SET(GUID_PLUGINS_DEBUG "D82D012A-12F2-4c18-B671-53D472770A79")
SET(GUID_INCLUDES "821B249F-1752-4875-9E0D-BD1A3519146E")
SET(GUID_COMPATINCLUDES "C7262456-C6AC-4609-B16C-0886B9ECFF85")
ELSE()
SET(PLATFORM "win32")
SET(IS_WIN64 "no")
@ -43,6 +45,8 @@ ELSE()
SET(GUID_DEBUG "BE46408D-BFA9-4df3-8A84-229A12494284")
SET(GUID_PLUGINS "59E15495-7EF1-4781-9229-FF246D074BDB")
SET(GUID_PLUGINS_DEBUG "454A26D3-51B8-435f-AD56-E68E5E70FB9F")
SET(GUID_INCLUDES "9D136CA2-8AC8-4f0b-A1F4-9A20DC01439D")
SET(GUID_COMPATINCLUDES "95AA0630-3A73-4efa-A314-7F287824748D")
ENDIF()
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/wininstall/mariadb_conncpp.xml.in

35
wininstall/mariadb_conncpp.xml.in
View File

@ -3,7 +3,7 @@
<?include @CPP_SOURCE_WIX_DIR@/binaries_dir.xml ?>
<Product Id="*" Name="@PRODUCT_NAME@" Language="1033"
Version="@PRODUCT_VERSION@"
Manufacturer="@PRODUCT_MANUFACTURER@" UpgradeCode="b43bad5d-118f-4368-8977-e60fd4dd4317">
Manufacturer="@PRODUCT_MANUFACTURER@" UpgradeCode="B4D6B19C-7519-4ebb-8E9A-4613EBC78402">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="@WIXPLATFORM@"/>
<MajorUpgrade DowngradeErrorMessage="A newer version of @PRODUCT_NAME@ is already installed." />
@ -17,6 +17,8 @@
<Feature Id="ProductFeature" Title="@PRODUCT_NAME@ @PRODUCT_VERSION@" Level="1">
<ComponentRef Id="Driver" />
<ComponentRef Id="CcPlugins" />
<ComponentRef Id="CcInclude" />
<ComponentRef Id="CcIncludeCompat" />
<@TLS_LIB_BEGIN@ComponentRef Id="TlsLib" /@TLS_LIB_END@>
</Feature>
<Feature Id="DebugFeature" Title="Debug Information" Level="2">
@ -35,6 +37,10 @@
<Directory Id="INSTALLFOLDER" Name="@PRODUCT_NAME@">
<Directory Id="PLUGINSFOLDER" Name="$(var.plugins_subdir_name)">
</Directory>
<Directory Id="INCLUDESFOLDER" Name="include">
<Directory Id="COMPATINCLUDES" Name="compat">
</Directory>
</Directory>
</Directory>
</Directory>
</Directory>
@ -69,6 +75,33 @@
<File Id="client_ed25519_pdb" Name="client_ed25519.pdb" DiskId="1" Source="$(var.plugins_source_dir)/client_ed25519.pdb" />
<CreateFolder />
</Component>
<Component Id="CcInclude" Guid="@GUID_INCLUDES@" Directory="INCLUDESFOLDER" DiskId="1" Win64="@IS_WIN64@">
<File Id="CallableStatementH" Name="CallableStatement.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/CallableStatement.h" />
<File Id="ConnCppH" Name="ConnCpp.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/ConnCpp.h" />
<File Id="ConnectionH" Name="Connection.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Connection.h" />
<File Id="DatabaseMEtaDataH" Name="DatabaseMEtaData.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/DatabaseMEtaData.h" />
<File Id="DriverH" Name="Driver.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Driver.h" />
<File Id="ExceptionH" Name="Exception.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Exception.h" />
<File Id="jdbccompatH" Name="jdbccompat.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/jdbccompat.h" />
<File Id="ParameterMetaDataH" Name="ParameterMetaData.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/ParameterMetaData.h" />
<File Id="PreparedStatementH" Name="PreparedStatement.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/PreparedStatement.h" />
<File Id="ResultSetH" Name="ResultSet.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/ResultSet.h" />
<File Id="ResultSetMetaDataH" Name="ResultSetMetaData.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/ResultSetMetaData.h" />
<File Id="SavepointH" Name="Savepoint.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Savepoint.h" />
<File Id="SQLStringH" Name="SQLString.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/SQLString.h" />
<File Id="StatementH" Name="Statement.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Statement.h" />
<File Id="TypesH" Name="Types.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Types.h" />
<File Id="WarningH" Name="Warning.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/Warning.h" />
<CreateFolder />
</Component>
<Component Id="CcIncludeCompat" Guid="@GUID_COMPATINCLUDES@" Directory="COMPATINCLUDES" DiskId="1" Win64="@IS_WIN64@">
<File Id="ArrayH" Name="Array.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/compat/Array.h" />
<File Id="ExecutorH" Name="Executor.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/compat/Executor.h" />
<File Id="ObjectH" Name="Object.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/compat/Object.h" />
<File Id="SQLTypeH" Name="SQLType.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/compat/SQLType.h" />
<File Id="StructH" Name="Struct.h" DiskId="1" Source="@CMAKE_SOURCE_DIR@/include/compat/Struct.h" />
<CreateFolder />
</Component>
<@TLS_LIB_BEGIN@Component Id="TlsLib" Guid="@GUID_TLS_LIB@" Directory="INSTALLFOLDER" DiskId="1" Win64="@IS_WIN64@">
<File Id="TlsLibFile1" Name="libgnutls-30.dll" DiskId="1" Source="@LIB_GNUTLS_LOCATION@/libgnutls-30.dll" />
<File Id="TlsLibFile2" Name="libgcc_s_seh-1.dll" DiskId="1" Source="@LIB_GNUTLS_LOCATION@/libgcc_s_seh-1.dll" />

BIN
wininstall/mdb-connector-cpp.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 72 KiB