diff --git a/CMakeLists.txt b/CMakeLists.txt index edbe69e93..124d807d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,9 +201,9 @@ SET (ENGINE_UTILS_QUERYSTATS_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/utils/queryst SET (ENGINE_WE_CONFIGCPP_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/writeengine/xml") SET (ENGINE_SERVER_SQL_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/sql") SET (ENGINE_SERVER_INCLUDE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/include") -SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_SOURCE_ROOT_DIR}/pcre") +SET (ENGINE_SERVER_PCRE_INCLUDE "${SERVER_BUILD_INCLUDE_DIR}/../pcre") -SET (ENGINE_DEFAULT_INCLUDES "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) +SET (ENGINE_DEFAULT_INCLUDES ${CMAKE_BINARY_DIR} "." "../" "../../" ${SERVER_BUILD_INCLUDE_DIR}) SET (ENGINE_COMMON_INCLUDES ${ENGINE_DEFAULT_INCLUDES} ${Boost_INCLUDE_DIR} ${ENGINE_UTILS_XML_INCLUDE} ${ENGINE_UTILS_MESSAGEQCPP_INCLUDE} ${ENGINE_WE_SHARED_INCLUDE} ${ENGINE_UTILS_IDBDATAFILE_INCLUDE} ${ENGINE_UTILS_LOGGINGCPP_INCLUDE} ${ENGINE_UTILS_CONFIGCPP_INCLUDE} ${ENGINE_UTILS_COMPRESS_INCLUDE} ${ENGINE_VERSIONING_BRM_INCLUDE} ${ENGINE_UTILS_ROWGROUP_INCLUDE} ${ENGINE_UTILS_COMMON_INCLUDE} ${ENGINE_UTILS_DATACONVERT_INCLUDE} ${ENGINE_UTILS_RWLOCK_INCLUDE} ${ENGINE_UTILS_FUNCEXP_INCLUDE} ${ENGINE_OAMAPPS_ALARMMANAGER_INCLUDE} ${ENGINE_UTILS_INCLUDE} ${ENGINE_OAM_OAMCPP_INCLUDE} ${ENGINE_DBCON_DDLPKGPROC_INCLUDE} ${ENGINE_DBCON_DDLPKG_INCLUDE} ${ENGINE_DBCON_EXECPLAN_INCLUDE} ${ENGINE_UTILS_STARTUP_INCLUDE} ${ENGINE_DBCON_JOBLIST_INCLUDE} ${ENGINE_WE_WRAPPER_INCLUDE} ${ENGINE_WE_SERVER_INCLUDE} ${ENGINE_DBCON_DMLPKG_INCLUDE} ${ENGINE_WE_CLIENT_INCLUDE} ${ENGINE_DBCON_DMLPKGPROC_INCLUDE} ${ENGINE_UTILS_CACHEUTILS_INCLUDE} ${ENGINE_UTILS_MYSQLCL_INCLUDE} ${ENGINE_UTILS_QUERYTELE_INCLUDE} ${ENGINE_UTILS_THRIFT_INCLUDE} ${ENGINE_UTILS_JOINER_INCLUDE} ${ENGINE_UTILS_THREADPOOL_INCLUDE} ${ENGINE_UTILS_BATCHLDR_INCLUDE} ${ENGINE_UTILS_DDLCLEANUP_INCLUDE} ${ENGINE_UTILS_QUERYSTATS_INCLUDE} ${ENGINE_WE_CONFIGCPP_INCLUDE} ${ENGINE_SERVER_SQL_INCLUDE} ${ENGINE_SERVER_INCLUDE_INCLUDE} ${ENGINE_SERVER_PCRE_INCLUDE}) @@ -236,3 +236,5 @@ ADD_SUBDIRECTORY(writeengine/bulk) ADD_SUBDIRECTORY(writeengine/splitter) INCLUDE(cpackEngineRPM.cmake) +INCLUDE(cpackEngineDEB.cmake) + diff --git a/build/debian/libs/postinst b/build/debian/libs/postinst new file mode 100644 index 000000000..0a3c0d2ee --- /dev/null +++ b/build/debian/libs/postinst @@ -0,0 +1,8 @@ +#!/bin/bash -e + +rpmmode=install +prefix=/usr/local + +echo "MariaDB ColumnStore install completed" + +exit 0 \ No newline at end of file diff --git a/build/debian/libs/prerm b/build/debian/libs/prerm new file mode 100644 index 000000000..1ebd4eedf --- /dev/null +++ b/build/debian/libs/prerm @@ -0,0 +1,4 @@ +#!/bin/bash -e + +exit 0 + diff --git a/build/debian/platform/postinst b/build/debian/platform/postinst new file mode 100644 index 000000000..4c91081c2 --- /dev/null +++ b/build/debian/platform/postinst @@ -0,0 +1,10 @@ +#!/bin/bash -e + +rpmmode=install +prefix=/usr/local + +test -x /usr/local/mariadb/columnstore/bin/post-install && /usr/local/mariadb/columnstore/bin/post-install --prefix=$prefix --rpmmode=$rpmmode + +echo "MariaDB ColumnStore install completed" + +exit 0 \ No newline at end of file diff --git a/build/debian/platform/prerm b/build/debian/platform/prerm new file mode 100644 index 000000000..f8ec4d1e7 --- /dev/null +++ b/build/debian/platform/prerm @@ -0,0 +1,6 @@ +#!/bin/bash -e + +test -x /usr/local/mariadb/columnstore/bin/pre-uninstall && /usr/local/mariadb/columnstore/bin/pre-uninstall + +exit 0 + diff --git a/build/debian/storageEngine/postinst b/build/debian/storageEngine/postinst new file mode 100644 index 000000000..f467b36d1 --- /dev/null +++ b/build/debian/storageEngine/postinst @@ -0,0 +1,8 @@ +#!/bin/bash -e + +rpmmode=install +prefix=/usr/local + +echo "MariaDB ColumnStore install completed" + +exit 0 diff --git a/build/debian/storageEngine/prerm b/build/debian/storageEngine/prerm new file mode 100644 index 000000000..1ebd4eedf --- /dev/null +++ b/build/debian/storageEngine/prerm @@ -0,0 +1,4 @@ +#!/bin/bash -e + +exit 0 + diff --git a/cpackEngineDEB.cmake b/cpackEngineDEB.cmake new file mode 100644 index 000000000..3c80e3ccd --- /dev/null +++ b/cpackEngineDEB.cmake @@ -0,0 +1,72 @@ +IF(DEB) + +SET(CMAKE_INSTALL_PREFIX ${INSTALL_ENGINE}) + +SET(CPACK_GENERATOR "DEB") +SET(CPACK_DEBIAN_PACKAGE_DEBUG 1) +SET(CPACK_PACKAGING_INSTALL_PREFIX ${INSTALL_ENGINE}) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) + + +# Note that this variable is DEB not DEBIAN! http://public.kitware.com/pipermail/cmake/2014-July/058030.html +SET(CPACK_DEB_COMPONENT_INSTALL ON) + +SET(CPACK_COMPONENTS_ALL platform libs storage-engine) + +SET(CPACK_PACKAGE_NAME "mariadb-columnstore") +SET(ENGINE_ARCH "x86_64") + +IF (NOT CPACK_DEBIAN_PACKAGE_VERSION) + SET (CPACK_DEBIAN_PACKAGE_VERSION ${PACKAGE_VERSION}) +ENDIF() +IF (NOT CPACK_DEBIAN_PACKAGE_RELEASE) + SET (CPACK_DEBIAN_PACKAGE_RELEASE ${PACKAGE_RELEASE}) +ENDIF() + +SET(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME}) +SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_DEBIAN_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}-${ENGINE_ARCH}-${DEB}") + +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MariaDB Columnstore: a very fast and robust SQL database server") +SET(CPACK_PACKAGE_URL "http://mariadb.org") +SET(CPACK_PACKAGE_CONTACT "MariaDB Corporation Ab") +SET(CPACK_PACKAGE_SUMMARY "MariaDB-Columnstore software") +SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation Ab") +SET(CPACK_PACKAGE_LICENSE "Copyright (c) 2016 MariaDB Corporation Ab., all rights reserved; redistributable under the terms of the GPL, see the file COPYING for details.") + + +SET(CPACK_DEBIAN_PACKAGE_LICENSE "GPLv2") +SET(CPACK_DEBIAN_PACKAGE_RELOCATABLE FALSE) +SET(CPACK_PACKAGE_RELOCATABLE FALSE) +SET(CPACK_DEBIAN_PACKAGE_URL ${CPACK_PACKAGE_URL}) +SET(CPACK_DEBIAN_PACKAGE_SUMMARY ${CPACK_PACKAGE_SUMMARY}) +SET(CPACK_DEBIAN_PACKAGE_VENDOR ${CPACK_PACKAGE_VENDOR}) +SET(CPACK_DEBIAN_PACKAGE_LICENSE ${CPACK_PACKAGE_LICENSE}) + +SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) + +SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DESCRIPTION "MariaDB-Columnstore binary files") +SET(CPACK_DEBIAN_PLATFORM_PACKAGE_SUMMARY "MariaDB-Columnstore software binaries") + +SET(CPACK_DEBIAN_LIBS_PACKAGE_DESCRIPTION "MariaDB-Columnstore libraries") +SET(CPACK_DEBIAN_LIBS_PACKAGE_SUMMARY "MariaDB-Columnstore software libraries") + +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DESCRIPTION "MariaDB Columnstore connector binary files") +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_SUMMARY "MariaDB-Columnstore software MariaDB connector") + + +SET(CPACK_DEBIAN_LIBS_PACKAGE_PROVIDES "mariadb-columnstore-libs") +SET(CPACK_DEBIAN_PLATFORM_PACKAGE_PROVIDES "mariadb-columnstore-platform") +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_PROVIDES "mariadb-columnstore-storage-engine") + +SET(CPACK_DEBIAN_PLATFORM_PACKAGE_DEPENDS "expect, libboost-all-dev, mariadb-columnstore-libs") + +SET(CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_DEPENDS "mariadb-columnstore-libs") + + +set( CPACK_DEBIAN_LIBS_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/libs/prerm;" ) +set( CPACK_DEBIAN_PLATFORM_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/platform/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/platform/prerm;" ) +set( CPACK_DEBIAN_STORAGE-ENGINE_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/postinst;${CMAKE_CURRENT_SOURCE_DIR}/build/debian/storageEngine/prerm;" ) + +INCLUDE (CPack) + +ENDIF()