Changeset: 5dbd6d598148 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5dbd6d598148 Modified Files: CMakeLists.txt cmake/monetdb-deb-packages.cmake cmake/monetdb-rpm-packages.cmake cmake/monetdb-versions.cmake ctest/cmake/CMakeLists.txt monetdb5/extras/mal_optimizer_template/CMakeLists.txt sql/backends/monet5/CMakeLists.txt sql/backends/monet5/vaults/fits/CMakeLists.txt Branch: mbedded Log Message:
port debian control and monetdb.spec to cpack diffs (truncated from 641 to 300 lines): diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ include(CMakeDependentOption REQUIRED) include(monetdb-options) include(monetdb-versions) project(MonetDB VERSION "${MONETDB_VERSION}" LANGUAGES C) +set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.monetdb.org/") set(C_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 99) diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake --- a/cmake/monetdb-deb-packages.cmake +++ b/cmake/monetdb-deb-packages.cmake @@ -6,74 +6,188 @@ # Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. #]] -set(CPACK_DEBIAN_PACKAGE_MAINTAINER "unknown") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB BV <i...@monetdb.org>") set(CPACK_DEB_COMPONENT_INSTALL ON) set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) +set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) +set(CPACK_DEBIAN_PACKAGE_SECTION "misc") +set(CPACK_DEBIAN_PACKAGE_SOURCE "monetdb") +# set(CPACK_DEBIAN_PACKAGE_DEPENDS "") -# Use 3 backslashes to make the variable a literal string -#set(CPACK_DEBIAN_PACKAGE_DEPENDS "\\\${misc:Depends}") -#set(CPACK_DEBIAN_PACKAGE_SECTION "misc") -#set(CPACK_COMPONENTS_IGNORE_GROUPS 1) - -set(CPACK_DEBIAN_PACKAGE_monetdb_NAME "${CMAKE_PROJECT_NAME}-18") -set(CPACK_DEBIAN_PACKAGE_monetdb_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_monetdb_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_monetdb_CONFLICTS +set(CPACK_DEBIAN_MONETDB_PACKAGE_NAME "libmonetdb${GDK_VERSION_MAJOR}") +set(CPACK_DEBIAN_MONETDB_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}") +set(CPACK_DEBIAN_MONETDB_PACKAGE_CONFLICTS "libmonetdb5-server-geom (<< \\\${source:Version})") -set(CPACK_DEBIAN_PACKAGE_monetdb_DESRCIPTION "MonetDB core library") -set(CPACK_DEBIAN_PACKAGE_monetdb_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_COMPONENT_MONETDB_DESCRIPTION "MonetDB core library + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the core components of MonetDB in the form of a + single shared library. If you want to use MonetDB, you will certainly + need this package, but you will also need at least the monetdb5-server + package, and most likely also monetdb5-sql, as well as one or + more client packages. +") + +set(CPACK_DEBIAN_MONETDBDEV_PACKAGE_NAME "libmonetdb-dev") +set(CPACK_DEBIAN_MONETDBDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, libmonetdb${GDK_VERSION_MAJOR}, libmonetdb-stream-dev") +set(CPACK_COMPONENT_MONETDBDEV_DESCRIPTION "MonetDB development files + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains files needed to develop extensions to the core + functionality of MonetDB. +") -set(CPACK_DEBIAN_PACKAGE_monetdbdev_NAME "${CMAKE_PROJECT_NAME}-monetdb-dev") -set(CPACK_DEBIAN_PACKAGE_monetdbev_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_monetdbdev_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_monetdbdev_DEPENDS "libmonetdb18, libmonetdb-stream-dev") -set(CPACK_DEBIAN_PACKAGE_monetdbdev_DESRCIPTION "MonetDB development files") -set(CPACK_DEBIAN_PACKAGE_streamdev_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_STREAM_PACKAGE_NAME "libmonetdb-stream${STREAM_VERSION_MAJOR}") +set(CPACK_DEBIAN_STREAM_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}") +set(CPACK_COMPONENT_STREAM_DESCRIPTION "MonetDB stream library + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains a shared library (libstream) which is needed by + various other components. +") + +set(CPACK_DEBIAN_STREAMDEV_PACKAGE_NAME "libmonetdb-stream-dev") +set(CPACK_DEBIAN_STREAMDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, libmonetdb-stream${STREAM_VERSION_MAJOR} (= \\\${source:Version}") +set(CPACK_COMPONENT_STREAMDEV_DESCRIPTION "MonetDB stream library development files + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the files to develop with the + libmonetdb-stream13 library. +") -set(CPACK_DEBIAN_PACKAGE_stream_NAME "${CMAKE_PROJECT_NAME}-stream13") -set(CPACK_DEBIAN_PACKAGE_stream_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_stream_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_stream_DESRCIPTION "MonetDB stream library") -set(CPACK_DEBIAN_PACKAGE_stream_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_CLIENT_PACKAGE_NAME "libmonetdb-client${MAPI_VERSION_MAJOR}") +set(CPACK_DEBIAN_CLIENT_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}") +set(CPACK_COMPONENT_CLIENT_DESCRIPTION "MonetDB client/server interface library + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains a shared library (libmapi) which is needed by + various other components. +") + +set(CPACK_DEBIAN_CLIENTDEV_PACKAGE_NAME "libmonetdb-client-dev") +set(CPACK_DEBIAN_CLIENTDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, libmonetdb-client${MAPI_VERSION_MAJOR} (= \\\${source:Version}") +set(CPACK_COMPONENT_CLIENTDEV_DESCRIPTION "MonetDB client/server interface library development files + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the files to develop with the libmonetdb-client12 + library. +") -set(CPACK_DEBIAN_PACKAGE_streamdev_NAME "${CMAKE_PROJECT_NAME}-stream-dev") -set(CPACK_DEBIAN_PACKAGE_streamdev_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_streamdev_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_streamdev_DESRCIPTION "MonetDB stream library development files") -set(CPACK_DEBIAN_PACKAGE_streamdev_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_MCLIENT_PACKAGE_NAME "monetdb-client") +set(CPACK_DEBIAN_MCLIENT_PACKAGE_RECOMMENDS "monetdb5-sql (= \\\${source:Version}") +set(CPACK_DEBIAN_MCLIENT_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}") +set(CPACK_COMPONENT_MCLIENT_DESCRIPTION "MonetDB database client + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains mclient, the main client program to communicate + with the MonetDB database server, and msqldump, a program to dump the + SQL database so that it can be loaded back later. If you want to use + MonetDB, you will very likely need this package. +") -set(CPACK_DEBIAN_PACKAGE_client_NAME "${CMAKE_PROJECT_NAME}-client${MAPI_VERSION_MAJOR}") -set(CPACK_DEBIAN_PACKAGE_client_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_client_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_client_DESRCIPTION "MonetDB client/server interface library") -set(CPACK_DEBIAN_PACKAGE_client_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_ODBC_PACKAGE_NAME "libmonetdb-client-odbc") +set(CPACK_DEBIAN_ODBC_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}") +set(CPACK_COMPONENT_ODBC_DESCRIPTION "MonetDB ODBC driver + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the MonetDB ODBC driver. +") -set(CPACK_DEBIAN_PACKAGE_clientdev_NAME "${CMAKE_PROJECT_NAME}-client-dev") -set(CPACK_DEBIAN_PACKAGE_clientdev_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_clientdev_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_clientdev_DEPENDS "${CMAKE_PROJECT_NAME}-client${MAPI_VERSION_MAJOR} (= \\\${source:Version}") -set(CPACK_DEBIAN_PACKAGE_clientdev_DESRCIPTION "MonetDB client/server interface library development files") -set(CPACK_DEBIAN_PACKAGE_clientdev_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_CLIENTTEST_PACKAGE_NAME "monetdb-client-testing") +set(CPACK_DEBIAN_CLIENTTEST_PACKAGE_DEPENDS "\\\${shlibs:Depends} ,libmonetdb-client-odbc (= \\\${source:Version}), + monetdb5-server (= \\\${source:Version}), + libdbd-monetdb-perl (>= 1.0), + php-monetdb (>= 1.0), + python3-pymonetdb (>= 1.0.6), + monetdb5-sql (= \\\${source:Version})") +set(CPACK_COMPONENT_CLIENTTEST_DESCRIPTION "MonetDB client testing tools + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the sample MAPI programs used for testing other + MonetDB packages. You probably don't need this, unless you are a + developer. +") -set(CPACK_DEBIAN_PACKAGE_mclient_NAME "${CMAKE_PROJECT_NAME}-monetdb-client") -set(CPACK_DEBIAN_PACKAGE_mclient_ARCH "any") -set(CPACK_DEBIAN_PACKAGE_mclient_VERSION "0.4.12") -set(CPACK_DEBIAN_PACKAGE_mclient_RECOMMENDS "monetdb5-sql (= \\\${source:Version}") -set(CPACK_DEBIAN_PACKAGE_mclient_DESRCIPTION "MonetDB database client") -set(CPACK_DEBIAN_PACKAGE_mclient_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_GEOM_PACKAGE_NAME "libmonetdb5-server-geom") +set(CPACK_DEBIAN_GEOM_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}") +set(CPACK_DEBIAN_GEOM_PACKAGE_SECTION "libs") +set(CPACK_COMPONENT_GEOM_DESCRIPTION "MonetDB5 SQL GIS support module + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the GIS (Geographic Information System) + extensions for MonetDB-SQL-server5. +") -set(CPACK_DEBIAN_TOOLS_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-monetdb-client-tools") -set(CPACK_DEBIAN_TOOLS_PACKAGE_SECTION "misc") -set(CPACK_COMPONENT_TOOLS_DESCRIPTION "MonetDB database client") -set(CPACK_DEBIAN_PACKAGE_TOOLS_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_LIDAR_PACKAGE_NAME "libmonetdb5-server-lidar") +set(CPACK_DEBIAN_LIDAR_PACKAGE_DEPENDS "\\\${shlibs:Depends}\\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}") +set(CPACK_DEBIAN_LIDAR_PACKAGE_SECTION "libs") +set(CPACK_COMPONENT_LIDAR_DESCRIPTION "MonetDB5 SQL GIS support module + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains support for reading and writing LiDAR data. +") -set(CPACK_DEBIAN_SERVER_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-monetdb5-server") -set(CPACK_DEBIAN_SERVER_PACKAGE_SECTION "misc") -set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "\\\${misc:Depends}, adduser") +set(CPACK_DEBIAN_FITS_PACKAGE_NAME "libmonetdb5-server-cfitsio") +set(CPACK_DEBIAN_FITS_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, monetdb5-sql (= \\\${source:Version}") +set(CPACK_DEBIAN_FITS_PACKAGE_SECTION "libs") +set(CPACK_COMPONENT_FITS_DESCRIPTION "MonetDB5 SQL GIS support module + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains a module for accessing data in the FITS file + format. +") + +set(CPACK_DEBIAN_SERVER_PACKAGE_NAME "monetdb5-server") +#set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "\\\${misc:Depends}, adduser") +set(CPACK_DEBIAN_SERVER_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, adduser") set(CPACK_DEBIAN_SERVER_PACKAGE_SUGGESTS "monetdb-client (= \\\${source:Version})") set(CPACK_DEBIAN_SERVER_PACKAGE_CONFLICTS "python-pymonetdb (<< 1.0.6)") -set(CPACK_COMPONENT_SERVER_DESCRIPTION "MonetDB database server version 5") -set(CPACK_DEBIAN_SERVER_PACKAGE_MAINTAINER "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_COMPONENT_SERVER_DESCRIPTION "MonetDB database server version 5 + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains the MonetDB server component. You need this + package if you want to use the MonetDB database system. If you want + to use the SQL front end, you also need monetdb5-sql. +") set(CPACK_DEBIAN_SERVER_PACKAGE_CONTROL_FILES ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.dirs ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.docs @@ -81,33 +195,155 @@ set(CPACK_DEBIAN_SERVER_PACKAGE_CONTROL_ ${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.postinst ) -#set(CPACK_DEBIAN_SERVERDEV_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-monetdb5-server") -#set(CPACK_DEBIAN_SERVERDEV_PACKAGE_SECTION "misc") -#set(CPACK_DEBIAN_SERVERDEV_PACKAGE_DEPENDS -# "${shlibs:Depends}" -# "${misc:Depends}" -# "monetdb5-server (= ${source:Version})" -# "libmonetdb-dev (= ${source:Version})") -#set(CPACK_COMPONENT_SERVERDEV_DESCRIPTION "MonetDB database server version 5") -#set(CPACK_DEBIAN_SERVERDEV_PACKAGE_MAINTAINER -# "${CPACK_DEBIAN_PACKAGE_MAINTAINER}") +set(CPACK_DEBIAN_HUGEINT_PACKAGE_NAME "monetdb5-server-hugeint") +set(CPACK_DEBIAN_HUGEINT_PACKAGE_DEPENDS "monetdb5-server (= \\\${source:Version})") +set(CPACK_DEBIAN_HUGEINT_PACKAGE_ARCHITECTURE "amd64") +set(CPACK_COMPONENT_HUGEINT_DESCRIPTION "MonetDB - 128-bit integer support for MonetDB5-server + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package provides HUGEINT (128-bit integer) support for the + MonetDB5-server component. +") -set(CPACK_DEBIAN_SQL_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-monetdb5-sql") -set(CPACK_DEBIAN_SQL_PACKAGE_SECTION "misc") +set(CPACK_DEBIAN_SERVERDEV_PACKAGE_NAME "monetdb5-server-dev") +set(CPACK_DEBIAN_SERVERDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends}, \\\${misc:Depends}, + monetdb5-server (= \\\${source:Version}), libmonetdb-dev (= \\\${source:Version})") +set(CPACK_COMPONENT_SERVERDEV_DESCRIPTION "MonetDB database server version 5 + MonetDB is a database management system that is developed from a + main-memory perspective with use of a fully decomposed storage model, + automatic index management, extensibility of data types and search + accelerators. It also has an SQL front end. + . + This package contains files needed to develop extensions that can be + used from the MAL level. +") + +set(CPACK_DEBIAN_SQL_PACKAGE_NAME "monetdb5-sql") _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list