Changeset: 652abe9ac646 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=652abe9ac646
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (truncated from 344 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -257,6 +257,7 @@ Summary: MonetDB - Monet Database Manage
Group: Applications/Databases
%if (0%{?fedora} >= 22)
Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Recommends: MonetDB5-server%{?_isa} = %{version}-%{release}
%endif
%description client
@@ -351,7 +352,7 @@ Requires: %{name}-client-odbc%{?_isa} =
Recommends: perl-DBD-monetdb >= 1.0
Recommends: php-monetdb >= 1.0
%endif
-Requires: %{name}-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
Requires: python3-pymonetdb >= 1.0.6
%description client-tests
@@ -394,7 +395,7 @@ automatic index management, extensibilit
accelerators. It also has an SQL front end.
This package contains the GIS (Geographic Information System)
-extensions for %{name}-SQL-server5.
+extensions for MonetDB5-server.
%files geom-MonetDB5
%defattr(-,root,root)
@@ -405,7 +406,7 @@ extensions for %{name}-SQL-server5.
%package R
Summary: Integration of MonetDB and R, allowing use of R from within SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description R
MonetDB is a database management system that is developed from a
@@ -430,7 +431,7 @@ install it.
%package python3
Summary: Integration of MonetDB and Python, allowing use of Python from within
SQL
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description python3
MonetDB is a database management system that is developed from a
@@ -454,7 +455,7 @@ install it.
%package cfitsio
Summary: MonetDB: Add on module that provides support for FITS files
Group: Applications/Databases
-Requires: MonetDB-SQL-server5%{?_isa} = %{version}-%{release}
+Requires: MonetDB5-server%{?_isa} = %{version}-%{release}
%description cfitsio
MonetDB is a database management system that is developed from a
@@ -496,8 +497,9 @@ automatic index management, extensibilit
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 %{name}-SQL-server5.
+package if you want to use the MonetDB database system. If you want to
+use the monetdb and monetdbd programs to manage your databases
+(recommended), you also need %{name}-SQL-server5.
%pre -n MonetDB5-server
%{?sysusers_create_package:echo 'u monetdb - "MonetDB Server"
/var/lib/monetdb' | systemd-sysusers --replace=%_sysusersdir/monetdb.conf -}
@@ -531,6 +533,7 @@ exit 0
%{_bindir}/mserver5
%exclude %{_bindir}/stethoscope
%{_libdir}/libmonetdb5.so.*
+%{_libdir}/libmonetdbsql.so*
%dir %{_libdir}/monetdb5
%if %{with cintegration}
%{_libdir}/monetdb5/lib_capi.so
@@ -584,8 +587,8 @@ main-memory perspective with use of a fu
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
-This package contains the SQL front end for MonetDB. If you want to
-use SQL with MonetDB, you will need to install this package.
+This package contains the monetdb and monetdbd programs and the systemd
+configuration.
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
%post SQL-server5
@@ -617,7 +620,6 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/libmonetdbsql.so*
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -88,6 +88,16 @@ def main():
print(r' <FileSearch Id="CheckFile2" Name="gdk.h"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
+ print(r' <Property Id="GEOMMALEXISTS">')
+ print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
+ print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
+ print(r' </DirectorySearch>')
+ print(r' </Property>')
+ print(r' <Property Id="GEOMLIBEXISTS">')
+ print(r' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
+ print(r' <FileSearch Id="CheckFile4" Name="_geom.dll"/>')
+ print(r' </DirectorySearch>')
+ print(r' </Property>')
print(r' <Property Id="PYAPI3EXISTS">')
print(r' <DirectorySearch Id="CheckFileDir5" Path="[INSTALLDIR]"
Depth="0">')
print(r' <FileSearch Id="CheckFile5"
Name="pyapi_locatepython3.bat"/>')
@@ -258,7 +268,7 @@ def main():
print(r' <Feature Id="GeomModule" Level="1000" AllowAdvertise="no"
Absent="allow" Title="Geom Module" Description="The GIS (Geographic Information
System) extension for MonetDB/SQL.">')
for f in geom:
print(r' <ComponentRef Id="{}"/>'.format(f))
- print(r' <Condition Level="1">GEOMEXISTS</Condition>')
+ print(r' <Condition Level="1">GEOMMALEXISTS OR
GEOMLIBEXISTS</Condition>')
print(r' </Feature>')
print(r' </Feature>')
print(r' <UIRef Id="WixUI_Mondo"/>')
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -107,7 +107,8 @@ target_sources(MonetODBC
target_include_directories(MonetODBC
PRIVATE
- $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>
+ $<TARGET_PROPERTY:mapi,INTERFACE_INCLUDE_DIRECTORIES>
+ $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
@@ -120,8 +121,7 @@ target_link_libraries(MonetODBC
PRIVATE
monetdb_config_header
mutils
- mapi
- ODBC::ODBC)
+ mapi)
install(TARGETS
MonetODBC
diff --git a/clients/odbc/samples/CMakeLists.txt
b/clients/odbc/samples/CMakeLists.txt
--- a/clients/odbc/samples/CMakeLists.txt
+++ b/clients/odbc/samples/CMakeLists.txt
@@ -6,7 +6,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
#]]
-include_directories($<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>)
+include_directories($<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>)
if(TESTING)
add_executable(odbcsample1
diff --git a/clients/odbc/setup/CMakeLists.txt
b/clients/odbc/setup/CMakeLists.txt
--- a/clients/odbc/setup/CMakeLists.txt
+++ b/clients/odbc/setup/CMakeLists.txt
@@ -16,7 +16,7 @@ target_sources(MonetODBCs
target_include_directories(MonetODBCs
PRIVATE
- $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIR}>
+ $<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -14,7 +14,7 @@ function(monetdb_configure_defines)
check_include_file("dispatch/dispatch.h" HAVE_DISPATCH_DISPATCH_H)
check_include_file("dlfcn.h" HAVE_DLFCN_H)
check_include_file("fcntl.h" HAVE_FCNTL_H)
-# use find_path for getop.h since we need the path on Windows
+# use find_path for getopt.h since we need the path on Windows
find_path(HAVE_GETOPT_H "getopt.h")
check_include_file("io.h" HAVE_IO_H)
check_include_file("kvm.h" HAVE_KVM_H)
@@ -324,7 +324,7 @@ macro(monetdb_configure_sizes)
if(ODBC_FOUND)
cmake_push_check_state()
- set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIR}")
+ set(CMAKE_REQUIRED_INCLUDES
"${CMAKE_REQUIRED_INCLUDES};${ODBC_INCLUDE_DIRS}")
if(WIN32)
set(CMAKE_EXTRA_INCLUDE_FILES
"${CMAKE_EXTRA_INCLUDE_FILES};Windows.h;sqlext.h;sqltypes.h")
check_include_file("afxres.h" HAVE_AFXRES_H)
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -97,7 +97,8 @@ Description: MonetDB client/server inter
Package: monetdb-client
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: monetdb5-sql (= ${source:Version})
+Recommends: monetdb5-sql (= ${source:Version}),
+ monetdb5-server (= ${source:Version})
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,
@@ -111,7 +112,7 @@ Description: MonetDB database client
Package: libmonetdb-client-odbc
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, odbcinst
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,
@@ -127,7 +128,7 @@ Depends: ${shlibs:Depends}, libmonetdb-c
libdbd-monetdb-perl (>= 1.0),
php-monetdb (>= 1.0),
python3-pymonetdb (>= 1.0.6),
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
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,
@@ -142,7 +143,7 @@ Package: libmonetdb5-server-geom
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
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,
@@ -150,13 +151,13 @@ Description: MonetDB5 SQL GIS support mo
accelerators. It also has an SQL front end.
.
This package contains the GIS (Geographic Information System)
- extensions for MonetDB-SQL-server5.
+ extensions for monetdb5-server.
Package: libmonetdb5-server-cfitsio
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-server (= ${source:Version})
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,
@@ -181,8 +182,9 @@ Description: MonetDB database server ver
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.
+ package if you want to use the MonetDB database system. If you want to
+ use the monetdb and monetdbd programs to manage your databases
+ (recommended), you also need monetdb5-sql.
Package: monetdb5-server-dev
Architecture: any
@@ -210,12 +212,13 @@ Description: MonetDB SQL support for mon
automatic index management, extensibility of data types and search
accelerators. It also has an SQL front end.
.
- This package contains the SQL front end for MonetDB.
+ This package contains the monetdb and monetdbd programs and the systemd
+ configuration.
Package: monetdb-python3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version}), python3-numpy
+ monetdb5-server (= ${source:Version}), python3-numpy
Description: Integration of MonetDB and Python, allowing use of Python from
within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -232,7 +235,7 @@ Description: Integration of MonetDB and
Package: monetdb-r
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version}), r-base-core
+ monetdb5-server (= ${source:Version}), r-base-core
Description: Integration of MonetDB and R, allowing use of R from within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/debian/monetdb5-server.install b/debian/monetdb5-server.install
--- a/debian/monetdb5-server.install
+++ b/debian/monetdb5-server.install
@@ -1,5 +1,6 @@
debian/tmp/usr/bin/mserver5 usr/bin
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdb5.so.* usr/lib/x86_64-linux-gnu
+debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
# usr/lib/x86_64-linux-gnu/monetdb5/lib_*.so EXCEPT:
lib_{fits,geom,gsl,microbenchmark,opt_sql_append,pyapi*,rapi,run_*,sql}.so
debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_capi.so
usr/lib/x86_64-linux-gnu/monetdb5
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,5 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
