[ODBC-257] Double-check CPack for a copy-paste error Created: 2019-06-25  Updated: 2019-06-26  Resolved: 2019-06-26

Status: Closed
Project: MariaDB Connector/ODBC
Component/s: General
Affects Version/s: 3.1.1
Fix Version/s: 3.1.2

Type: Bug Priority: Minor
Reporter: Michal Schorm Assignee: Lawrin Novitsky
Resolution: Fixed Votes: 0
Labels: None
Environment:

Released tarball; source code


 Description   

Please double check this piece of code I went by, that it is intentional and not a copy-paste error:

mariadb-connector-odbc-3.1.1-ga-src/CMakeLists.txt

384 # Packaging
 
385 SET(CPACK_PACKAGE_VERSION_MAJOR "${MARIADB_ODBC_VERSION_MAJOR}")
 
386 SET(CPACK_PACKAGE_VERSION_MINOR "${MARIADB_ODBC_VERSION_MINOR}")
 
387 SET(CPACK_PACKAGE_VERSION_MINOR "${MARIADB_ODBC_VERSION_PATCH}")

Shouldn't be the line 387 say "..._VERSION_PATCH" instead of "...MINOR" ?

 Comments   
Comment by Michal Schorm [ 2019-06-25 ]

Also, on line 202, there's

202 SET(CPACK_PACKAGE_VERSION ${MARIADB_ODBC_VERSION_MAJOR}.${MARIADB_ODBC_VERSION_MINOR}.${MARIADB_ODBC_VERSION_PATCH})

unlinke in CONC/C, where the macro is created from the CPACK_PACKAGE_VERSION_* macros:

 37 SET(CPACK_PACKAGE_VERSION_MAJOR 3)
 
 38 SET(CPACK_PACKAGE_VERSION_MINOR 0)
 
 39 SET(CPACK_PACKAGE_VERSION_PATCH 10)
 
 40 SET(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")

However I don't understand the cmake / cpack that good to decide, if that makes the lines 385-387 irrelevant, as they are IMHO not used anywhere.

Comment by Lawrin Novitsky [ 2019-06-26 ]

That is apparently some copy/paste error. But also that is true, that it's not used anywhere, and thus was harmless. Looks like that part was copied from C/C, where they(those variables) are used. Removed them so far.

Generated at Thu Feb 08 03:27:22 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.