Changeset: c02090b5d67e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c02090b5d67e
Modified Files:
ChangeLog.Dec2023
MonetDB.spec
clients/Tests/exports.stable.out
debian/control
debian/libmonetdb-client-dev.install
debian/libmonetdb-dev.install
debian/libmonetdb-stream-dev.install
debian/monetdb5-server-dev.install
debian/monetdb5-sql-dev.install
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_remap.c
monetdb5/optimizer/opt_support.c
sql/backends/monet5/sql.c
sql/server/rel_unnest.c
Branch: Aug2024
Log Message:
Merge with Dec2023 branch.
diffs (149 lines):
diff --git a/ChangeLog.Dec2023 b/ChangeLog.Dec2023
--- a/ChangeLog.Dec2023
+++ b/ChangeLog.Dec2023
@@ -1,3 +1,7 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+* Tue Aug 6 2024 Sjoerd Mullender <sjo...@acm.org>
+- The CMake configuration files for building extensions have now been
+ included in the various MonetDB development RPMs and debs.
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -211,6 +211,12 @@ functionality of MonetDB.
%{_includedir}/monetdb/monet*.h
%{_libdir}/libbat*.so
%{_libdir}/pkgconfig/monetdb-gdk.pc
+%dir %{_datadir}/monetdb
+%dir %{_datadir}/monetdb/cmake
+%{_datadir}/monetdb/cmake/gdkTargets*.cmake
+%{_datadir}/monetdb/cmake/matomicTargets.cmake
+%{_datadir}/monetdb/cmake/mstringTargets.cmake
+%{_datadir}/monetdb/cmake/monetdb_config_headerTargets.cmake
%endif
%package stream
@@ -258,6 +264,7 @@ library.
%{_includedir}/monetdb/stream.h
%{_includedir}/monetdb/stream_socket.h
%{_libdir}/pkgconfig/monetdb-stream.pc
+%{_datadir}/monetdb/cmake/streamTargets*.cmake
%endif
%package client-lib
@@ -338,6 +345,7 @@ This package contains the files needed t
%{_includedir}/monetdb/mapi*.h
%{_includedir}/monetdb/msettings.h
%{_libdir}/pkgconfig/monetdb-mapi.pc
+%{_datadir}/monetdb/cmake/mapiTargets*.cmake
%endif
%if %{without compat}
@@ -644,6 +652,7 @@ used from the MAL level.
%{_includedir}/monetdb/mel.h
%{_libdir}/libmonetdb5*.so
%{_libdir}/pkgconfig/monetdb5.pc
+%{_datadir}/monetdb/cmake/monetdb5Targets*.cmake
%endif
%package SQL
@@ -701,6 +710,7 @@ Summary: MonetDB SQL server modules deve
Group: Applications/Databases
Requires: %{name}-SQL%{?_isa} = %{version}-%{release}
Requires: %{name}-server-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-embedded-devel%{?_isa} = %{version}-%{release}
%description SQL-devel
MonetDB is a database management system that is developed from a
@@ -716,6 +726,8 @@ This package contains files needed to de
%{_includedir}/monetdb/rel_*.h
%{_includedir}/monetdb/sql*.h
%{_includedir}/monetdb/store_*.h
+%{_datadir}/monetdb/cmake/MonetDBConfig*.cmake
+%{_datadir}/monetdb/cmake/sqlTargets*.cmake
%endif
%if %{without compat}
@@ -759,6 +771,7 @@ program that uses MonetDB as an embeddab
%{_libdir}/libmonetdbe.so
%{_includedir}/monetdb/monetdbe.h
%{_libdir}/pkgconfig/monetdbe.pc
+%{_datadir}/monetdb/cmake/monetdbeTargets*.cmake
%package embedded-tests
Summary: MonetDBe tests package
@@ -938,7 +951,6 @@ rm -f "${RPM_BUILD_ROOT}"%{_libdir}/mone
rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_microbenchmark*.so
rm -f "${RPM_BUILD_ROOT}"%{_libdir}/monetdb5*/lib_udf*.so
rm -f "${RPM_BUILD_ROOT}"%{_bindir}/monetdb_mtest.sh
-rm -rf "${RPM_BUILD_ROOT}"%{_datadir}/monetdb # /cmake
if [ -x /usr/sbin/hardlink ]; then
/usr/sbin/hardlink -cv "${RPM_BUILD_ROOT}"%{_datadir}/selinux
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -274,7 +274,8 @@ Package: monetdb-sql-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
monetdb-server-dev (= ${source:Version}),
- monetdb-sql (= ${source:Version})
+ monetdb-sql (= ${source:Version})),
+ libmonetdbe-dev (= ${source:Version})
Replaces: monetdb5-sql-dev (<< 11.50.0)
Break: monetdb5-sql-dev (<< 11.50.0)
Description: MonetDB SQL support
diff --git a/debian/libmonetdb-client-dev.install
b/debian/libmonetdb-client-dev.install
--- a/debian/libmonetdb-client-dev.install
+++ b/debian/libmonetdb-client-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libm
debian/tmp/usr/include/monetdb/mapi*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/msettings.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-mapi.pc
usr/lib/x86_64-linux-gnu/pkgconfig
+debian/tmp/usr/share/monetdb/cmake/mapiTargets*.cmake usr/share/monetdb/cmake
diff --git a/debian/libmonetdb-dev.install b/debian/libmonetdb-dev.install
--- a/debian/libmonetdb-dev.install
+++ b/debian/libmonetdb-dev.install
@@ -7,3 +7,7 @@ debian/tmp/usr/include/monetdb/mstring.h
debian/tmp/usr/include/monetdb/monet_*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/monetdb_*.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-gdk.pc
usr/lib/x86_64-linux-gnu/pkgconfig
+debian/tmp/usr/share/monetdb/cmake/gdkTargets*.cmake usr/share/monetdb/cmake
+debian/tmp/usr/share/monetdb/cmake/matomicTargets.cmake usr/share/monetdb/cmake
+debian/tmp/usr/share/monetdb/cmake/mstringTargets.cmake usr/share/monetdb/cmake
+debian/tmp/usr/share/monetdb/cmake/monetdb_config_headerTargets.cmake
usr/share/monetdb/cmake
diff --git a/debian/libmonetdb-stream-dev.install
b/debian/libmonetdb-stream-dev.install
--- a/debian/libmonetdb-stream-dev.install
+++ b/debian/libmonetdb-stream-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libs
debian/tmp/usr/include/monetdb/stream.h usr/include/monetdb
debian/tmp/usr/include/monetdb/stream_socket.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb-stream.pc
usr/lib/x86_64-linux-gnu/pkgconfig
+debian/tmp/usr/share/monetdb/cmake/streamTargets*.cmake usr/share/monetdb/cmake
diff --git a/debian/libmonetdbe-dev.install b/debian/libmonetdbe-dev.install
--- a/debian/libmonetdbe-dev.install
+++ b/debian/libmonetdbe-dev.install
@@ -1,3 +1,4 @@
debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbe.so usr/lib/x86_64-linux-gnu
debian/tmp/usr/include/monetdb/monetdbe.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdbe.pc
usr/lib/x86_64-linux-gnu/pkgconfig
+debian/tmp/usr/share/monetdb/cmake/monetdbeTargets.cmake
usr/share/monetdb/cmake
diff --git a/debian/monetdb5-server-dev.install
b/debian/monetdb5-server-dev.install
--- a/debian/monetdb5-server-dev.install
+++ b/debian/monetdb5-server-dev.install
@@ -2,3 +2,4 @@ debian/tmp/usr/lib/x86_64-linux-gnu/libm
debian/tmp/usr/include/monetdb/mal*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/mel.h usr/include/monetdb
debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/monetdb5.pc
usr/lib/x86_64-linux-gnu/pkgconfig
+debian/tmp/usr/share/monetdb/cmake/monetdb5Targets*.cmake
usr/share/monetdb/cmake
diff --git a/debian/monetdb5-sql-dev.install b/debian/monetdb5-sql-dev.install
--- a/debian/monetdb5-sql-dev.install
+++ b/debian/monetdb5-sql-dev.install
@@ -2,3 +2,5 @@ debian/tmp/usr/include/monetdb/opt_backe
debian/tmp/usr/include/monetdb/rel_*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/sql*.h usr/include/monetdb
debian/tmp/usr/include/monetdb/store_*.h usr/include/monetdb
+debian/tmp/usr/share/monetdb/cmake/MonetDBConfigTargets*.cmake
usr/share/monetdb/cmake
+debian/tmp/usr/share/monetdb/cmake/sqlTargets*.cmake usr/share/monetdb/cmake
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
