Changeset: a557e84dab3c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a557e84dab3c
Modified Files:
MonetDB.spec
tools/monetdbe/CMakeLists.txt
Branch: default
Log Message:
Merged with Oct2020
diffs (truncated from 445 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -784,8 +784,6 @@ export CFLAGS
%endif
%cmake3 \
-DRELEASE_VERSION=ON \
- -DRUNDIR=%{_rundir}/monetdb \
- -DLOGDIR=%{_localstatedir}/log/monetdb \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -817,7 +815,10 @@ export CFLAGS
%cmake3_build
%install
+mkdir -p "%{buildroot}/usr"
+for d in etc var; do mkdir "%{buildroot}/$d"; ln -s ../$d
"%{buildroot}/usr/$d"; done
%cmake3_install
+rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc"
# move file to correct location
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in
--- a/buildtools/conf/monetdbd.conf.in
+++ b/buildtools/conf/monetdbd.conf.in
@@ -1,3 +1,3 @@
# this file is for systemd
# monetdbd needs a directory in /run that is owned by monetdb:monetdb
-d @RUNDIR@ 0775 monetdb monetdb -
+d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb -
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
@@ -8,7 +8,7 @@
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_PACKAGE_GENERATE_SHLIBS OFF)
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
set(CPACK_DEBIAN_PACKAGE_SECTION "misc")
set(CPACK_DEBIAN_PACKAGE_SOURCE "monetdb")
@@ -171,18 +171,6 @@ set(CPACK_DEBIAN_SERVER_PACKAGE_CONTROL_
${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-server.postinst
)
-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_SERVERDEV_PACKAGE_NAME "monetdb5-server-dev")
set(CPACK_DEBIAN_SERVERDEV_PACKAGE_DEPENDS "\\\${shlibs:Depends},
\\\${misc:Depends},
monetdb5-server (= \\\${source:Version}), libmonetdb-dev (=
\\\${source:Version})")
@@ -200,8 +188,6 @@ set(CPACK_DEBIAN_SQL_PACKAGE_DEPENDS
"\\\${shlibs:Depends}"
"\\\${misc:Depends}"
"monetdb5-server (= \\\${source:Version})")
-set(CPACK_DEBIAN_SQL_PACKAGE_RECOMMENDS
- "monetdb5-sql-hugeint (= \\\${source:Version}) [amd64]")
set(CPACK_DEBIAN_SQL_PACKAGE_SUGGEST "monetdb-client (= \\\${source:Version})")
set(CPACK_COMPONENT_SQL_DESCRIPTION "MonetDB SQL support for monetdb5
MonetDB is a database management system that is developed from a
@@ -218,20 +204,6 @@ set(CPACK_DEBIAN_SQL_PACKAGE_CONTROL_FIL
${CMAKE_CURRENT_SOURCE_DIR}/debian/monetdb5-sql.postinst
)
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_NAME "monetdb5-sql-hugeint")
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_DEPENDS
- "monetdb5-sql (= \\\${source:Version})"
- "monetdb5-server-hugeint (= \\\${source:Version})")
-set(CPACK_DEBIAN_SQLINT128_PACKAGE_ARCHITECTURE "amd64")
-set(CPACK_COMPONENT_SQLINT128_DESCRIPTION "MonetDB5 128 bit integer (hugeint)
support for SQL
- 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 SQL
- front end of MonetDB.")
-
set(CPACK_DEBIAN_PYAPI3_PACKAGE_NAME "monetdb-python3")
set(CPACK_DEBIAN_PYAPI3_PACKAGE_DEPENDS
"\\\${shlibs:Depends}"
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -206,7 +206,6 @@ macro(monetdb_macro_variables)
set(BINDIR "${CMAKE_INSTALL_FULL_BINDIR}")
set(LIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}")
set(DATADIR "${CMAKE_INSTALL_FULL_DATADIR}")
- set(DATA_DIR "${CMAKE_INSTALL_FULL_DATADIR}")
set(LOCALSTATEDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
if(WIN32)
# Fix cmake conversions
@@ -219,22 +218,12 @@ macro(monetdb_macro_variables)
endif()
set(DATAROOTDIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}")
- set(BIN_DIR "${CMAKE_INSTALL_FULL_BINDIR}")
set(INCLUDEDIR "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
set(INFODIR "${CMAKE_INSTALL_FULL_INFODIR}")
- set(LIB_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
set(LIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}")
- set(LOCALSTATE_DIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}")
# set(MANDIR "${CMAKE_INSTALL_FULL_MANDIR}")
set(SYSCONFDIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}")
- set(LOGDIR "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb"
- CACHE PATH
- "Where to put log files (default LOCALSTATEDIR/log/monetdb)")
set(PKGCONFIGDIR "${LIBDIR}/pkgconfig")
- set(RUNDIR
- "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb"
- CACHE PATH
- "Where to put pid files (default LOCALSTATEDIR/run/monetdb)")
endmacro()
macro(monetdb_configure_crypto)
diff --git a/cmake/monetdb-rpm-packages.cmake b/cmake/monetdb-rpm-packages.cmake
--- a/cmake/monetdb-rpm-packages.cmake
+++ b/cmake/monetdb-rpm-packages.cmake
@@ -20,6 +20,7 @@ set(CPACK_RPM_PACKAGE_LICENSE "MPLv2.0")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Databases")
set(CPACK_RPM_PACKAGE_URL "https://www.monetdb.org/";)
set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_SOURCE_DIR}/misc/packages/rpm/changelog")
+set(CPACK_RPM_PACKAGE_RELOCATABLE OFF)
set(CPACK_RPM_monetdb_PACKAGE_NAME "${CMAKE_PROJECT_NAME}")
set(CPACK_RPM_monetdb_FILE_NAME "${CMAKE_PROJECT_NAME}-${MONETDB_VERSION}.rpm")
@@ -87,18 +88,13 @@ set(CPACK_RPM_server_PACKAGE_NAME "Monet
set(CPACK_RPM_server_FILE_NAME
"${CPACK_RPM_server_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_server_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
set(CPACK_RPM_server_PACKAGE_REQUIRES "%{name}-client%{?_isa} =
%{version}-%{release}")
-# TODO: check for hugeint
-set(CPACK_RPM_server_PACKAGE_RECOMMENDS "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}, MonetDB5-server-hugeint%{?_isa} = %{version}-%{release}")
+set(CPACK_RPM_server_PACKAGE_RECOMMENDS "%{name}-SQL-server5%{?_isa} =
%{version}-%{release}")
+
set(CPACK_RPM_server_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_server_PACKAGE_CONFLICTS "python-pymonetdb < 1.0.6")
# TODO: check for rhel
set(CPACK_RPM_server_PACKAGE_REQUIRES_PRE "shadow-utils, systemd")
-set(CPACK_RPM_hugeint_PACKAGE_NAME "MonetDB5-server-hugeint")
-set(CPACK_RPM_hugeint_FILE_NAME
"${CPACK_RPM_hugeint_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_hugeint_PACKAGE_SUMMARY "MonetDB - 128-bit integer support for
MonetDB5-server")
-set(CPACK_RPM_hugeint_PACKAGE_REQUIRES "MonetDB5-server%{?_isa}")
-
set(CPACK_RPM_serverdev_PACKAGE_NAME "MonetDB5-server-devel")
set(CPACK_RPM_serverdev_FILE_NAME
"${CPACK_RPM_serverdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_serverdev_PACKAGE_SUMMARY "MonetDB development files")
@@ -108,16 +104,9 @@ set(CPACK_RPM_sql_PACKAGE_NAME "SQL-serv
set(CPACK_RPM_sql_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_sql_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_sql_PACKAGE_SUMMARY "MonetDB5 SQL server modules")
set(CPACK_RPM_sql_PACKAGE_REQUIRES_PRE "MonetDB5-server%{?_isa} =
%{version}-%{release}")
-# TODO: check hugeint
-set(CPACK_RPM_sql_PACKAGE_RECOMMENDS "%{name}-SQL-server5-hugeint%{?_isa} =
%{version}-%{release}")
set(CPACK_RPM_sql_PACKAGE_SUGGESTS "%{name}-client%{?_isa} =
%{version}-%{release}")
# TODO: systemd_requires?
-set(CPACK_RPM_sqlint128_PACKAGE_NAME "SQL-server5-hugeint")
-set(CPACK_RPM_sqlint128_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_sqlint128_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
-set(CPACK_RPM_sqlint128_PACKAGE_SUMMARY "MonetDB5 128 bit integer (hugeint)
support for SQL")
-set(CPACK_RPM_sqlint128_PACKAGE_REQUIRES "MonetDB5-server-hugeint%{?_isa} =
%{version}-%{release}, MonetDB-SQL-server5%{?_isa} = %{version}-%{release}")
-
set(CPACK_RPM_testing_PACKAGE_NAME "testing")
set(CPACK_RPM_testing_FILE_NAME
"${CMAKE_PROJECT_NAME}-${CPACK_RPM_testing_PACKAGE_NAME}-${MONETDB_VERSION}.rpm")
set(CPACK_RPM_TESTING_PACKAGE_SUMMARY "MonetDB - Monet Database Management
System")
diff --git a/debian/rules b/debian/rules
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,6 @@ DH_VERBOSE=1
override_dh_auto_configure:
dh_auto_configure -- \
-DRELEASE_VERSION=ON \
- -DRUNDIR=/run/monetdb \
- -DLOGDIR=/var/log/monetdb \
-DASSERT=OFF \
-DCINTEGRATION=ON \
-DFITS=ON \
diff --git a/misc/selinux/monetdb.fc.in b/misc/selinux/monetdb.fc.in
--- a/misc/selinux/monetdb.fc.in
+++ b/misc/selinux/monetdb.fc.in
@@ -1,7 +1,7 @@
@CMAKE_INSTALL_FULL_BINDIR@/monetdbd --
gen_context(system_u:object_r:monetdbd_exec_t,s0)
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 --
gen_context(system_u:object_r:mserver5_exec_t,s0)
@CMAKE_INSTALL_FULL_LIBDIR@/systemd/system/monetdbd.*
gen_context(system_u:object_r:monetdbd_unit_file_t,s0)
-@LOGDIR@(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
+@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_log_t,s0)
# for some reason we cannot use /run/monetdb here, even though that is the
real name
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/run/monetdb(/.*)?
gen_context(system_u:object_r:monetdbd_var_run_t,s0)
# database "farm"
diff --git a/misc/selinux/post_install_script_file.in
b/misc/selinux/post_install_script_file.in
--- a/misc/selinux/post_install_script_file.in
+++ b/misc/selinux/post_install_script_file.in
@@ -5,5 +5,5 @@ do
done
# use /var/run/monetdb since that's what it says in the monetdb.fc file
# it says that because /run/monetdb for some reason doesn't work
-/sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5 @LOGDIR@
@RUNDIR@ @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
+/sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb
@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
/usr/bin/systemctl try-restart monetdbd.service
diff --git a/misc/selinux/post_uninstall_script_file.in
b/misc/selinux/post_uninstall_script_file.in
--- a/misc/selinux/post_uninstall_script_file.in
+++ b/misc/selinux/post_uninstall_script_file.in
@@ -7,7 +7,7 @@ if [ $1 -eq 0 ] ; then
do
/usr/sbin/semodule -s ${selinuxvariant} -r monetdb &> /dev/null || :
done
- /sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5 @LOGDIR@
$RUNDIR@ @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
+ /sbin/restorecon -R @CMAKE_INSTALL_FULL_LOCALSTATEDIR@/monetdb5
@CMAKE_INSTALL_FULL_LOCALSTATEDIR@/log/monetdb
@CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb @CMAKE_INSTALL_FULL_BINDIR@/monetdbd
@CMAKE_INSTALL_FULL_BINDIR@/mserver5 %{_unitdir}/monetdbd.service &> /dev/null
|| :
if [ $active = active ]; then
/usr/bin/systemctl start monetdbd.service
fi
diff --git a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
--- a/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
+++ b/monetdb5/extras/mal_optimizer_template/CMakeLists.txt
@@ -38,4 +38,5 @@ set_target_properties(opt_sql_append
install(TARGETS
opt_sql_append
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT server)
diff --git a/monetdb5/modules/kernel/CMakeLists.txt
b/monetdb5/modules/kernel/CMakeLists.txt
--- a/monetdb5/modules/kernel/CMakeLists.txt
+++ b/monetdb5/modules/kernel/CMakeLists.txt
@@ -67,9 +67,11 @@ set_target_properties(microbenchmark
PROPERTIES
OUTPUT_NAME _microbenchmark)
-install(TARGETS microbenchmark
+install(TARGETS
+ microbenchmark
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
COMPONENT microbenchmark)
install(FILES
microbenchmark.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT microbenchmark)
diff --git a/monetdb5/scheduler/CMakeLists.txt
b/monetdb5/scheduler/CMakeLists.txt
--- a/monetdb5/scheduler/CMakeLists.txt
+++ b/monetdb5/scheduler/CMakeLists.txt
@@ -30,7 +30,8 @@ install(TARGETS run_adder
COMPONENT run_adder)
install(FILES
run_adder.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_adder)
add_library(run_isolate MODULE)
target_sources(run_isolate
@@ -55,7 +56,8 @@ install(TARGETS run_isolate
COMPONENT run_isolate)
install(FILES
run_isolate.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_isolate)
add_library(run_memo MODULE)
target_sources(run_memo
@@ -81,4 +83,5 @@ install(TARGETS run_memo
COMPONENT run_memo)
install(FILES
run_memo.mal
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT run_memo)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -213,23 +213,7 @@
#cmakedefine BINDIR "@BINDIR@"
#cmakedefine LIBDIR "@LIBDIR@"
-#cmakedefine DATADIR "@DATADIR@"
-#cmakedefine DATA_DIR "@DATA_DIR@"
#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@"
-// #cmakedefine QXLOCALSTATEDIR
-// #cmakedefine MONETDB_PREFIX
-#cmakedefine DATAROOTDIR "@DATAROOTDIR@"
-#cmakedefine BIN_DIR "@BIN_DIR@"
-#cmakedefine INCLUDEDIR "@INCLUDEDIR@"
-#cmakedefine INFODIR "@INFODIR@"
-#cmakedefine LIB_DIR "@LIB_DIR@"
-#cmakedefine LIBEXECDIR "@LIBEXECDIR@"
-#cmakedefine LOCALSTATE_DIR "@LOCALSTATE_DIR@"
-//#cmakedefine MANDIR "@MANDIR@"
-#cmakedefine SYSCONFDIR "@SYSCONFDIR@"
-#cmakedefine LOGDIR "@LOGDIR@"
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
