Skip to content

Commit 84f6fd1

Browse files
lawrinnlawrinn
committed
Fix of source package generation
to include files (borrowed from and) returned to the c/c++ repo Fixed one compilation warning along the way
1 parent b4f3713 commit 84f6fd1

File tree

3 files changed

+103
-61
lines changed

3 files changed

+103
-61
lines changed

‎cmake/packaging.cmake‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,43 @@ Makefile$
7676

7777
# Build source packages
7878
IF(GIT_BUILD_SRCPKG OR ODBC_GIT_BUILD_SRCPKG)
79-
IF(WIN32)
80-
EXECUTE_PROCESS(COMMAND git archive --format=zip --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip --worktree-attributes -v HEAD)
81-
ELSE()
82-
EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=zip --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip -v HEAD)
83-
EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=tar --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar -v HEAD)
84-
EXECUTE_PROCESS(COMMAND gzip -9 -f ${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar)
79+
# Assuming that git available and assuming on Windoews that all required unix tools came along with git(as they usualyy do). But actually we use only cmake functionality
80+
SET(TMP_SRCPKG_DIR "tmp_src_pkg")
81+
EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=tar --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar -v HEAD
82+
OUTPUT_QUIET)
83+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_SRCPKG_DIR}
84+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
85+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory ${TMP_SRCPKG_DIR}
86+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
87+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E
88+
tar "cf" ${CMAKE_BINARY_DIR}/cppmini.tar ${MARIADB_CPPMINI_FILES} ${MARIADB_CPPMINI_HEADERS}
89+
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/driver")
90+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E
91+
tar "xf" ${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar
92+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${TMP_SRCPKG_DIR}")
93+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E
94+
tar "xf" ${CMAKE_BINARY_DIR}/cppmini.tar
95+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${TMP_SRCPKG_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}/driver")
96+
#EXECUTE_PROCESS(COMMAND git archive --format=tar --prefix="cppmini/" --output=${CMAKE_BINARY_DIR}/cppmini.tar HEAD -- *.cpp *.h
97+
# WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/driver/cppmini")
98+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_BINARY_DIR}/cppmini.tar")
99+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove "${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar")
100+
IF(NOT WIN32)
101+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E
102+
tar "zcf" ${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.tar.gz ${CPACK_SOURCE_PACKAGE_FILE_NAME}
103+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${TMP_SRCPKG_DIR}")
104+
85105
ENDIF()
106+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E
107+
tar "cf" "${CMAKE_BINARY_DIR}/${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip"
108+
--format=zip ${CPACK_SOURCE_PACKAGE_FILE_NAME}
109+
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/${TMP_SRCPKG_DIR}")
110+
EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove_directory ${TMP_SRCPKG_DIR}
111+
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
112+
#EXECUTE_PROCESS(COMMAND git archive ${GIT_BRANCH} --format=zip --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ --output=${CPACK_SOURCE_PACKAGE_FILE_NAME}.zip -v HEAD)
113+
# Should we exit right here?
86114
ENDIF()
115+
87116
IF(WIN32)
88117
SET(DEFAULT_GENERATOR "ZIP")
89118
ELSE()

‎driver/CMakeLists.txt‎

Lines changed: 67 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -30,44 +30,22 @@ INCLUDE(FindGit)
3030
IF(NOT GIT_EXECUTABLE)
3131
MESSAGE(STATUS "Git has nobeen found")
3232
ENDIF()
33-
IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cppmini/CMakeLists.txt AND GIT_EXECUTABLE)
33+
IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cppmini/class AND GIT_EXECUTABLE)
3434
MESSAGE(STATUS "C/C++ files are not found - updating submodules")
3535
EXECUTE_PROCESS(COMMAND "${GIT_EXECUTABLE}" submodule init
36-
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
36+
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
3737
EXECUTE_PROCESS(COMMAND "${GIT_EXECUTABLE}" submodule update
38-
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
38+
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
3939
ENDIF()
40-
IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cppmini/CMakeLists.txt)
40+
IF(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/cppmini/class)
4141
MESSAGE(FATAL_ERROR "No MariaDB Connector/C++ mini branch! Run
4242
git submodule init
4343
git submodule update
4444
Then restart the build.
4545
")
4646
ENDIF()
4747

48-
49-
SET (MARIADB_ODBC_SOURCES odbc_3_api.cpp
50-
ma_api_internal.cpp
51-
ma_error.cpp
52-
ma_connection.cpp
53-
ma_helper.cpp
54-
ma_debug.cpp
55-
ma_dsn.c
56-
ma_driver.cpp
57-
ma_info.cpp
58-
ma_environment.cpp
59-
ma_parse.cpp
60-
ma_catalog.cpp
61-
ma_statement.cpp
62-
ma_desc.cpp
63-
ma_string.cpp
64-
ma_result.cpp
65-
ma_common.c
66-
ma_server.cpp
67-
ma_legacy_helpers.cpp
68-
ma_typeconv.cpp
69-
ma_bulk.cpp
70-
ma_codec.cpp
48+
SET(MARIADB_CPPMINI_FILES
7149
cppmini/class/Results.cpp
7250
cppmini/class/TextRow.cpp
7351
cppmini/class/BinRow.cpp
@@ -92,7 +70,66 @@ SET (MARIADB_ODBC_SOURCES odbc_3_api.cpp
9270
cppmini/interface/Exception.cpp
9371
cppmini/template/CArray.cpp
9472
)
73+
# Propogating it to the parent level as it needed for source package generation. If we wet it for parent_scope in first place,
74+
# it won't be visible in this scope
75+
SET(MARIADB_CPPMINI_FILES ${MARIADB_CPPMINI_FILES} PARENT_SCOPE)
76+
77+
SET(MARIADB_CPPMINI_HEADERS
78+
cppmini/class/SQLString.h
79+
cppmini/class/Results.h
80+
cppmini/class/TextRow.h
81+
cppmini/class/BinRow.h
82+
cppmini/class/ClientSidePreparedStatement.h
83+
cppmini/class/ServerSidePreparedStatement.h
84+
cppmini/class/SSPSDirectExec.h
85+
cppmini/class/ClientPrepareResult.h
86+
cppmini/class/ServerPrepareResult.h
87+
cppmini/class/CmdInformationSingle.h
88+
cppmini/class/CmdInformationMultiple.h
89+
cppmini/class/CmdInformationBatch.h
90+
cppmini/class/ColumnDefinition.h
91+
cppmini/class/ResultSetText.h
92+
cppmini/class/ResultSetBin.h
93+
cppmini/class/ResultSetMetaData.h
94+
cppmini/class/Parameter.h
95+
cppmini/class/pimpls.h
96+
cppmini/class/Protocol.h
97+
cppmini/class/lru/lrucache.h
98+
cppmini/class/lru/pscache.h
99+
cppmini/interface/PreparedStatement.h
100+
cppmini/interface/PrepareResult.h
101+
cppmini/interface/Row.h
102+
cppmini/interface/ResultSet.h
103+
cppmini/interface/CmdInformation.h
104+
cppmini/interface/Exception.h
105+
cppmini/template/CArray.h
106+
)
107+
SET(MARIADB_CPPMINI_HEADERS ${MARIADB_CPPMINI_HEADERS} PARENT_SCOPE)
95108

109+
SET (MARIADB_ODBC_SOURCES odbc_3_api.cpp
110+
ma_api_internal.cpp
111+
ma_error.cpp
112+
ma_connection.cpp
113+
ma_helper.cpp
114+
ma_debug.cpp
115+
ma_dsn.c
116+
ma_driver.cpp
117+
ma_info.cpp
118+
ma_environment.cpp
119+
ma_parse.cpp
120+
ma_catalog.cpp
121+
ma_statement.cpp
122+
ma_desc.cpp
123+
ma_string.cpp
124+
ma_result.cpp
125+
ma_common.c
126+
ma_server.cpp
127+
ma_legacy_helpers.cpp
128+
ma_typeconv.cpp
129+
ma_bulk.cpp
130+
ma_codec.cpp
131+
${MARIADB_CPPMINI_FILES}
132+
)
96133
IF(WIN32)
97134
SET(ODBC_LIBS odbc32)
98135
SET(ODBC_INSTLIBS odbccp32)
@@ -122,31 +159,7 @@ IF(WIN32)
122159
ma_bulk.h
123160
ma_codec.h
124161
ma_c_stuff.h
125-
cppmini/class/SQLString.h
126-
cppmini/class/Results.h
127-
cppmini/class/TextRow.h
128-
cppmini/class/BinRow.h
129-
cppmini/class/ClientSidePreparedStatement.h
130-
cppmini/class/ServerSidePreparedStatement.h
131-
cppmini/class/SSPSDirectExec.h
132-
cppmini/class/ClientPrepareResult.h
133-
cppmini/class/ServerPrepareResult.h
134-
cppmini/class/CmdInformationSingle.h
135-
cppmini/class/CmdInformationMultiple.h
136-
cppmini/class/CmdInformationBatch.h
137-
cppmini/class/ColumnDefinition.h
138-
cppmini/class/ResultSetText.h
139-
cppmini/class/ResultSetBin.h
140-
cppmini/class/ResultSetMetaData.h
141-
cppmini/class/Parameter.h
142-
cppmini/class/Protocol.h
143-
cppmini/interface/PreparedStatement.h
144-
cppmini/interface/PrepareResult.h
145-
cppmini/interface/Row.h
146-
cppmini/interface/ResultSet.h
147-
cppmini/interface/CmdInformation.h
148-
cppmini/interface/Exception.h
149-
cppmini/template/CArray.h
162+
${MARIADB_CPPMINI_HEADERS}
150163
)
151164

152165
SOURCE_GROUP(Classes REGULAR_EXPRESSION "class/")
@@ -230,9 +243,9 @@ ELSE()
230243
ENDIF()
231244

232245
SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES
233-
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
246+
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
234247
# Specifically on Windows, to have implib in the same place as the dll
235-
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
248+
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
236249
LANGUAGE CXX)
237250
MESSAGE(STATUS "All linked targets/external dependencies: ${MARIADB_CLIENT_TARGET_NAME} ${ODBC_INSTLIBS} ${PLATFORM_DEPENDENCIES}")
238251
TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${MARIADB_CLIENT_TARGET_NAME} ${ODBC_INSTLIBS} ${PLATFORM_DEPENDENCIES})

‎driver/ma_codec.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ namespace mariadb
486486
uint32_t need2terminate= length == 0 || row[length - 1] != '\0' ? 1 : 0;
487487

488488
if (it.value() && it.getDescRec()->OctetLength > 0) {
489-
if (it.getDescRec()->OctetLength < length + need2terminate) {
489+
if (static_cast<SQLULEN>(it.getDescRec()->OctetLength) < length + need2terminate) {
490490
CALC_ALL_FLDS_RC(Stmt->aggRc, MADB_SetError(&Stmt->Error, MADB_ERR_01004, NULL, 0));
491491
std::memcpy(it.value(), row, static_cast<std::size_t>(it.getDescRec()->OctetLength - 1));
492492
((char*)it.value())[static_cast<std::size_t>(it.getDescRec()->OctetLength - 1)]= '\0';

0 commit comments

Comments
 (0)
⚡