1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +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

@ -32,9 +32,7 @@ set(brm_LIB_SRCS
add_library(brm SHARED ${brm_LIB_SRCS})
set_target_properties(brm PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(TARGETS brm DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)
########### next target ###############
@ -45,7 +43,7 @@ add_executable(controllernode ${controllernode_SRCS})
target_link_libraries(controllernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} )
install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS controllernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -56,7 +54,7 @@ add_executable(workernode ${workernode_SRCS})
target_link_libraries(workernode ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS workernode DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -67,7 +65,7 @@ add_executable(dbrmctl ${dbrmctl_SRCS})
target_link_libraries(dbrmctl ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS dbrmctl DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -78,7 +76,7 @@ add_executable(reset_locks ${reset_locks_SRCS})
target_link_libraries(reset_locks ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES})
install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS reset_locks DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -89,7 +87,7 @@ add_executable(rollback ${rollback_SRCS})
target_link_libraries(rollback ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES})
install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS rollback DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -100,7 +98,7 @@ add_executable(save_brm ${save_brm_SRCS})
target_link_libraries(save_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES})
install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS save_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -111,5 +109,5 @@ add_executable(load_brm ${load_brm_SRCS})
target_link_libraries(load_brm ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_OAM_LIBS} ${ENGINE_EXEC_LIBS} ${NETSNMP_LIBRARIES})
install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS load_brm DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)