1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

MCOL-3625 Rename packages

Rename packages to MariaDB-columnstore-engine, MariaDB-columnstore-libs
and MariaDB-columnstore-platform.

Also add the "columnstore-" prefix the the components so that MariaDB's
packaging system understands then and add a line to include them in
MariaDB's packaging.

In addition
* Fix S3 building for dist source build
* Fix Debian 10 dependency issue
* Fix git handling for dist builds
* Add support for MariaDB's RPM building
* Use MariaDB's PCRE and readline
* Removes a few dead files
* Fix Boost noncopyable includes
This commit is contained in:
Andrew Hutchings
2019-11-27 08:21:58 +00:00
parent a8cd34f86d
commit 7489d0bfd0
87 changed files with 294 additions and 337 deletions

View File

@ -10,5 +10,5 @@ add_executable(clearShm ${clearShm_SRCS})
target_link_libraries(clearShm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS clearShm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(cleartablelock ${cleartablelock_SRCS})
target_link_libraries(cleartablelock ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS cleartablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,4 +10,4 @@ add_executable(autoConfigure ${autoConfigure_SRCS})
target_link_libraries(autoConfigure ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS autoConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -46,8 +46,8 @@
#include "ctype.h"
#include <netdb.h>
#include <readline/readline.h>
#include <readline/history.h>
#include <readline.h>
#include <history.h>
#include "liboamcpp.h"
#include "configcpp.h"

View File

@ -10,5 +10,5 @@ add_executable(cplogger ${cplogger_SRCS})
target_link_libraries(cplogger ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS cplogger DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(dbbuilder ${dbbuilder_SRCS})
target_link_libraries(dbbuilder ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS dbbuilder DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -15,5 +15,5 @@ add_executable(colxml ${colxml_SRCS})
target_link_libraries(colxml ${ENGINE_LDFLAGS} dbload ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS colxml DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(ddlcleanup ${ddlcleanup_SRCS})
target_link_libraries(ddlcleanup ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_WRITE_LIBS} ddlcleanuputil)
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS ddlcleanup DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(editem ${editem_SRCS})
target_link_libraries(editem ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS editem DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(mcsGetConfig ${getConfig_SRCS})
target_link_libraries(mcsGetConfig ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS mcsGetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(idbmeminfo ${idbmeminfo_SRCS})
target_link_libraries(idbmeminfo ${ENGINE_LDFLAGS})
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS idbmeminfo DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -11,7 +11,7 @@ add_executable(mcsSetConfig ${setConfig_SRCS})
target_link_libraries(mcsSetConfig ${ENGINE_LDFLAGS} ${NETSNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS mcsSetConfig DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(PROGRAMS configxml.sh DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

View File

@ -10,5 +10,5 @@ add_executable(viewtablelock ${viewtablelock_SRCS})
target_link_libraries(viewtablelock ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS viewtablelock DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)