Changeset: 0dad8d6e8d60 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0dad8d6e8d60 Removed Files: cmake/Modules/FindCandle.cmake cmake/Modules/FindCreaterepo.cmake cmake/Modules/FindDpkgBuildpackage.cmake cmake/Modules/FindReprepro.cmake cmake/Modules/FindRpmbuild.cmake cmake/monetdb-deb-packages.cmake cmake/monetdb-rpm-packages.cmake cmake/monetdb-wix-packages.cmake misc/packages/deb/changelog misc/packages/deb/copyright misc/packages/rpm/changelog Modified Files: cmake/monetdb-custom-targets.cmake cmake/monetdb-findpackages.cmake cmake/monetdb-functions.cmake cmake/monetdb-packages.cmake Branch: default Log Message:
Cleanup: remove rpm/deb/wix building from cmake files. These options are not tested and are not being maintained. diffs (truncated from 11271 to 300 lines): diff --git a/cmake/Modules/FindCandle.cmake b/cmake/Modules/FindCandle.cmake deleted file mode 100644 --- a/cmake/Modules/FindCandle.cmake +++ /dev/null @@ -1,24 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -find_program(CANDLE_EXECUTABLE NAMES candle - DOC "Create wix packages" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Candle - DEFAULT_MSG - CANDLE_EXECUTABLE -) - -mark_as_advanced(CANDLE_EXECUTABLE) diff --git a/cmake/Modules/FindCreaterepo.cmake b/cmake/Modules/FindCreaterepo.cmake deleted file mode 100644 --- a/cmake/Modules/FindCreaterepo.cmake +++ /dev/null @@ -1,24 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -find_program(CREATEREPO_EXECUTABLE NAMES createrepo - DOC "Create rpm repository" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Createrepo - DEFAULT_MSG - CREATEREPO_EXECUTABLE -) - -mark_as_advanced(CREATEREPO_EXECUTABLE) diff --git a/cmake/Modules/FindDpkgBuildpackage.cmake b/cmake/Modules/FindDpkgBuildpackage.cmake deleted file mode 100644 --- a/cmake/Modules/FindDpkgBuildpackage.cmake +++ /dev/null @@ -1,24 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -find_program(DPKGBUILDPACKAGE_EXECUTABLE NAMES dpkg-buildpackage - DOC "Create deb packages" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(DpkgBuildpackage - DEFAULT_MSG - DPKGBUILDPACKAGE_EXECUTABLE -) - -mark_as_advanced(DPKGBUILDPACKAGE_EXECUTABLE) diff --git a/cmake/Modules/FindReprepro.cmake b/cmake/Modules/FindReprepro.cmake deleted file mode 100644 --- a/cmake/Modules/FindReprepro.cmake +++ /dev/null @@ -1,24 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -find_program(REPREPRO_EXECUTABLE NAMES reprepro - DOC "Create debian package repository" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Reprepro - DEFAULT_MSG - REPREPRO_EXECUTABLE -) - -mark_as_advanced(REPREPRO_EXECUTABLE) diff --git a/cmake/Modules/FindRpmbuild.cmake b/cmake/Modules/FindRpmbuild.cmake deleted file mode 100644 --- a/cmake/Modules/FindRpmbuild.cmake +++ /dev/null @@ -1,24 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -find_program(RPMBUILD_EXECUTABLE NAMES rpmbuild - DOC "Create rpm packages" -) - -include(FindPackageHandleStandardArgs) - -find_package_handle_standard_args(Rpmbuild - DEFAULT_MSG - RPMBUILD_EXECUTABLE -) - -mark_as_advanced(RPMBUILD_EXECUTABLE) diff --git a/cmake/monetdb-custom-targets.cmake b/cmake/monetdb-custom-targets.cmake --- a/cmake/monetdb-custom-targets.cmake +++ b/cmake/monetdb-custom-targets.cmake @@ -23,81 +23,6 @@ if (TESTING) WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) endif() -if (CREATEREPO_FOUND) - add_custom_target(create-rpm-repo - COMMAND - ${CREATEREPO_EXECUTABLE} ${CMAKE_BINARY_DIR} - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -else() - add_custom_target(create-rpm-repo - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"createrepo\" was not found.') -endif() - -if(RPMBUILD_FOUND) - add_custom_target(create-rpm-packages - COMMAND - ${CMAKE_CPACK_COMMAND} -G RPM - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - - add_custom_target(create-source-rpm-packages - COMMAND - ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake -G RPM - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -else() - add_custom_target(create-rpm-packages - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"rpmbuild\" was not found.') - - add_custom_target(create-source-rpm-packages - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"rpmbuild\" was not found.') -endif() - -add_custom_target(create-rpm-distro - COMMAND - ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/distro" - COMMAND - ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/distro/repodata" - COMMAND - ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/*rpm" "${CMAKE_BINARY_DIR}/distro/" - COMMAND - ${CMAKE_COMMAND} -E copy "${CMAKE_BINARY_DIR}/_CPack_Packages/Linux-Source/RPM/SPECS/monetdb.spec" "${CMAKE_BINARY_DIR}/distro/" - COMMAND - ${CMAKE_COMMAND} -E copy_directory "${CMAKE_BINARY_DIR}/repodata" "${CMAKE_BINARY_DIR}/distro/repodata/" - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - -if(DPKGBUILDPACKAGE_FOUND) - add_custom_target(create-deb-packages - COMMAND - ${CMAKE_CPACK_COMMAND} -G DEB - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - - add_custom_target(create-source-deb-packages - COMMAND - ${CMAKE_CPACK_COMMAND} --config CPackSourceConfig.cmake -G DEB - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -else() - add_custom_target(create-deb-packages - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"dpkg-buildpackage\" was not found.') - - add_custom_target(create-source-deb-packages - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"dpkg-buildpackage\" was not found.') -endif() - -if(CANDLE_FOUND) - add_custom_target(create-wix-packages - COMMAND - ${CMAKE_CPACK_COMMAND} -G WIX -C Release - WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -else() - add_custom_target(create-wix-packages - COMMAND - ${CMAKE_COMMAND} -E echo 'Target not available because \"candle\" was not found.') -endif() - if(CTAGS_PATH) add_custom_target(tags COMMAND ${CTAGS_PATH} -R --kinds-C=+pLl --fields=+iaS --exclude=*.js --exclude=build --exclude=install diff --git a/cmake/monetdb-deb-packages.cmake b/cmake/monetdb-deb-packages.cmake deleted file mode 100644 --- a/cmake/monetdb-deb-packages.cmake +++ /dev/null @@ -1,292 +0,0 @@ -#[[ -# SPDX-License-Identifier: MPL-2.0 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# -# Copyright 2024 MonetDB Foundation; -# Copyright August 2008 - 2023 MonetDB B.V.; -# Copyright 1997 - July 2008 CWI. -#]] - -set(CPACK_DEBIAN_PACKAGE_MAINTAINER "MonetDB Foundation <i...@monetdb.org>") -set(CPACK_DEB_COMPONENT_INSTALL ON) -set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS OFF) -set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT) -set(CPACK_DEBIAN_PACKAGE_SECTION "misc") -set(CPACK_DEBIAN_PACKAGE_SOURCE "monetdb") -# set(CPACK_DEBIAN_PACKAGE_DEPENDS "") - -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_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_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. _______________________________________________ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
