database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-3625 Rename packages

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
oamapps/alarmmanager/CMakeLists.txt
View File

@ -10,8 +10,6 @@ add_library(alarmmanager SHARED ${alarmmanager_LIB_SRCS})
target_compile_options(alarmmanager PRIVATE -Wno-unused-result)
set_target_properties(alarmmanager PROPERTIES VERSION 1.0.0 SOVERSION 1)
install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT libs)
install(TARGETS alarmmanager DESTINATION ${ENGINE_LIBDIR} COMPONENT columnstore-libs)

2
oamapps/columnstoreDB/CMakeLists.txt
View File

@ -10,5 +10,5 @@ add_executable(columnstoreDBWrite ${columnstoreDBWrite_SRCS})
target_link_libraries(columnstoreDBWrite ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS columnstoreDBWrite DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

6
oamapps/columnstoreSupport/CMakeLists.txt
View File

@ -10,11 +10,11 @@ add_executable(columnstoreSupport ${columnstoreSupport_SRCS})
target_compile_options(columnstoreSupport PRIVATE -Wno-unused-result)
target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(columnstoreSupport ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS columnstoreSupport DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
install(PROGRAMS alarmReport.sh bulklogReport.sh configReport.sh
hardwareReport.sh logReport.sh resourceReport.sh softwareReport.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

2
oamapps/columnstoreSupport/columnstoreSupport.cpp
View File

@ -27,7 +27,7 @@
#include "stdio.h"
#include "ctype.h"
#include <netdb.h>
#include <readline/readline.h>
#include <readline.h>
#include "mcsconfig.h"
#include "liboamcpp.h"

4
oamapps/mcsadmin/CMakeLists.txt
View File

@ -10,7 +10,7 @@ add_executable(mcsadmin ${mcsadmin_SRCS})
target_compile_options(mcsadmin PRIVATE -Wno-unused-result)
target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS})
target_link_libraries(mcsadmin ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS} ${ENGINE_WRITE_LIBS})
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS mcsadmin DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

4
oamapps/mcsadmin/mcsadmin.h
View File

@ -39,8 +39,8 @@
#include <ctype.h>
#include <sys/signal.h>
#include <sys/types.h>
#include <readline/readline.h>
#include <readline/history.h>
#include <readline.h>
#include <history.h>
#include <time.h>
#include <pthread.h>
#include <errno.h>

22
oamapps/postConfigure/CMakeLists.txt
View File

@ -10,9 +10,9 @@ add_executable(postConfigure ${postConfigure_SRCS})
target_compile_options(postConfigure PRIVATE -Wno-unused-result)
target_link_libraries(postConfigure ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(postConfigure ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS postConfigure DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -23,9 +23,9 @@ add_executable(columnstore_installer ${installer_SRCS})
target_compile_options(columnstore_installer PRIVATE -Wno-unused-result)
target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(columnstore_installer ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS columnstore_installer DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -34,9 +34,9 @@ set(getMySQLpw_SRCS getMySQLpw.cpp)
add_executable(getMySQLpw ${getMySQLpw_SRCS})
target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(getMySQLpw ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -45,9 +45,9 @@ install(TARGETS getMySQLpw DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
#add_executable(amazonInstaller ${amazonInstaller_SRCS})
#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} readline ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
#target_link_libraries(amazonInstaller ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${SNMP_LIBRARIES} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
#install(TARGETS amazonInstaller DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
@ -58,12 +58,12 @@ add_executable(mycnfUpgrade ${mycnfUpgrade_SRCS})
target_compile_options(mycnfUpgrade PRIVATE -Wno-unused-result)
target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} readline ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
target_link_libraries(mycnfUpgrade ${ENGINE_LDFLAGS} ${ENGINE_READLINE_LIBRARY} ncurses ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS mycnfUpgrade DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)
########### next target ###############
install(PROGRAMS quick_installer_single_server.sh quick_installer_multi_server.sh quick_installer_amazon.sh
DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)

2
oamapps/postConfigure/helpers.cpp
View File

@ -23,7 +23,7 @@
#include <iterator>
#include <stdio.h>
#include <readline/readline.h>
#include <readline.h>
#include "mcsconfig.h"
#include "configcpp.h"

4
oamapps/postConfigure/postConfigure.cpp
View File

@ -62,8 +62,8 @@
#include <netinet/in.h>
#include <net/if.h>
#include <readline/readline.h>
#include <readline/history.h>
#include <readline.h>
#include <history.h>
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/tokenizer.hpp>

2
oamapps/serverMonitor/CMakeLists.txt
View File

@ -22,5 +22,5 @@ target_compile_options(ServerMonitor PRIVATE -Wno-unused-result)
target_link_libraries(ServerMonitor ${ENGINE_LDFLAGS} ${MARIADB_CLIENT_LIBS} ${ENGINE_EXEC_LIBS})
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT platform)
install(TARGETS ServerMonitor DESTINATION ${ENGINE_BINDIR} COMPONENT columnstore-platform)