diff --git a/.gitignore b/.gitignore index 05a42f3ffb..3887cd76a4 100644 --- a/.gitignore +++ b/.gitignore @@ -128,6 +128,7 @@ oam/install_scripts/pre-uninstall oam/install_scripts/syslogSetup.sh tools/setConfig/configxml.sh dbcon/mysql/install_mcs_mysql.sh +debian/mariadb-plugin-columnstore.install oam/cloud/MCSInstanceCmds.sh oam/cloud/MCSVolumeCmds.sh oam/etc/ProcessConfig.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index af7f8fcdab..653e23e8a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -568,6 +568,56 @@ INSTALL ( COMPONENT columnstore-engine ) CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h.in ${CMAKE_CURRENT_SOURCE_DIR}/columnstoreversion.h) + +SET ( + COLUMSTORE_INSTALL_INTERNAL_SO_LIST + "usr/lib/*/libbatchloader.so +usr/lib/*/libbrm.so +usr/lib/*/libcacheutils.so +usr/lib/*/libcloudio.so +usr/lib/*/libcommon.so +usr/lib/*/libcompress.so +usr/lib/*/libconfigcpp.so +usr/lib/*/libdataconvert.so +usr/lib/*/libddlcleanuputil.so +usr/lib/*/libddlpackage.so +usr/lib/*/libddlpackageproc.so +usr/lib/*/libdmlpackage.so +usr/lib/*/libdmlpackageproc.so +usr/lib/*/libexecplan.so +usr/lib/*/libfuncexp.so +usr/lib/*/libidbdatafile.so +usr/lib/*/libjoblist.so +usr/lib/*/libjoiner.so +usr/lib/*/liblibmysql_client.so +usr/lib/*/libloggingcpp.so +usr/lib/*/libmarias3.so +usr/lib/*/liboamcpp.so +usr/lib/*/libquerystats.so +usr/lib/*/libquerytele.so +usr/lib/*/libregr.so +usr/lib/*/librowgroup.so +usr/lib/*/librwlock.so +usr/lib/*/libstoragemanager.so +usr/lib/*/libthreadpool.so +usr/lib/*/libudfsdk.so +usr/lib/*/libwindowfunction.so +usr/lib/*/libwriteengine.so +usr/lib/*/libwriteengineclient.so +usr/lib/*/libwriteengineredistribute.so +usr/lib/*/libdatatypes.so +usr/lib/*/libfdbcs.so" +) + +IF (COLUMNSTORE_ALL_STATIC) + SET (COLUMSTORE_INSTALL_INTERNAL_SO_LIST "") +ENDIF () + +CONFIGURE_FILE ( + ${CMAKE_CURRENT_SOURCE_DIR}/debian/mariadb-plugin-columnstore.install.in + ${CMAKE_CURRENT_BINARY_DIR}/debian/mariadb-plugin-columnstore.install +) + CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/mcsconfig.h.in ${CMAKE_CURRENT_BINARY_DIR}/mcsconfig.h) CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/gitversionEngine.in ${CMAKE_CURRENT_BINARY_DIR}/gitversionEngine IMMEDIATE) diff --git a/debian/mariadb-plugin-columnstore.install b/debian/mariadb-plugin-columnstore.install.in similarity index 72% rename from debian/mariadb-plugin-columnstore.install rename to debian/mariadb-plugin-columnstore.install.in index 17539eaa9c..623872beef 100644 --- a/debian/mariadb-plugin-columnstore.install +++ b/debian/mariadb-plugin-columnstore.install.in @@ -55,42 +55,7 @@ usr/bin/testS3Connection usr/bin/test_fdb_api usr/bin/viewtablelock usr/bin/workernode -usr/lib/*/libbatchloader.so -usr/lib/*/libbrm.so -usr/lib/*/libcacheutils.so -usr/lib/*/libcloudio.so -usr/lib/*/libcommon.so -usr/lib/*/libcompress.so -usr/lib/*/libconfigcpp.so -usr/lib/*/libdataconvert.so -usr/lib/*/libddlcleanuputil.so -usr/lib/*/libddlpackage.so -usr/lib/*/libddlpackageproc.so -usr/lib/*/libdmlpackage.so -usr/lib/*/libdmlpackageproc.so -usr/lib/*/libexecplan.so -usr/lib/*/libfuncexp.so -usr/lib/*/libidbdatafile.so -usr/lib/*/libjoblist.so -usr/lib/*/libjoiner.so -usr/lib/*/liblibmysql_client.so -usr/lib/*/libloggingcpp.so -usr/lib/*/libmarias3.so -usr/lib/*/liboamcpp.so -usr/lib/*/libquerystats.so -usr/lib/*/libquerytele.so -usr/lib/*/libregr.so -usr/lib/*/librowgroup.so -usr/lib/*/librwlock.so -usr/lib/*/libstoragemanager.so -usr/lib/*/libthreadpool.so -usr/lib/*/libudfsdk.so -usr/lib/*/libwindowfunction.so -usr/lib/*/libwriteengine.so -usr/lib/*/libwriteengineclient.so -usr/lib/*/libwriteengineredistribute.so -usr/lib/*/libdatatypes.so -usr/lib/*/libfdbcs.so +@COLUMSTORE_INSTALL_INTERNAL_SO_LIST@ usr/lib/mysql/plugin/ha_columnstore.so usr/lib/mysql/plugin/libregr_mysql.so usr/lib/mysql/plugin/libudf_mysql.so