Changeset: 2bac09d39855 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2bac09d39855 Removed Files: buildtools/selinux/ChangeLog.Jun2020 misc/packages/rpm/COPYING Modified Files: COPYING buildtools/CMakeLists.txt buildtools/conf/CMakeLists.txt clients/CMakeLists.txt clients/NT/CMakeLists.txt cmake/Modules/FindAwk.cmake cmake/Modules/FindSemodule.cmake gdk/ChangeLog.Jun2020 misc/CMakeLists.txt misc/selinux/ChangeLog-Archive misc/selinux/ChangeLog.Jun2020 monetdb5/CMakeLists.txt monetdb5/modules/atoms/json.c sql/CMakeLists.txt sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.ppc64.int128 sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.ppc64 sql/test/json/Tests/All sql/test/sysmon/Tests/sysqueue.sql sql/test/sysmon/Tests/sysqueue.stable.err sql/test/sysmon/Tests/sysqueue.stable.out tools/monetdbe/CMakeLists.txt Branch: atom_strings Log Message:
Merge branch 'master' into local_atom_strings diffs (truncated from 197248 to 300 lines): diff --git a/.editorconfig b/.editorconfig --- a/.editorconfig +++ b/.editorconfig @@ -19,4 +19,4 @@ charset = utf-8 [gdk/*.{c,h}] tab_width = 8 -max_line_length = 80 +max_line_length = 72 diff --git a/.hgignore b/.hgignore --- a/.hgignore +++ b/.hgignore @@ -15,32 +15,7 @@ syntax: glob # recommended build process plus a few patterns of files that we never # want in the repository (object files and such). -# files generated by bootstrap -Makefile.am -Makefile.in -Makefile.msc -aclocal.m4 -acout.in -autom4te.cache -buildtools/conf/compile -buildtools/conf/config.guess -buildtools/conf/config.sub -buildtools/conf/install-sh -buildtools/conf/libtool.m4 -buildtools/conf/ltmain.sh -buildtools/conf/ltoptions.m4 -buildtools/conf/ltsugar.m4 -buildtools/conf/ltversion.m4 -buildtools/conf/lt~obsolete.m4 -buildtools/conf/missing -buildtools/conf/ylwrap -configure -configure.ac -doc.lst -install.lst -monetdb_config.h.in *.pyc -sql/backends/monet5/UDF/capi/cheader.text.h # files generated by various editors *.swp @@ -73,21 +48,6 @@ tags *.rej *.orig -# build results on Windows -NT/.monetdb -NT/buildtools -NT/clients -NT/common -NT/gdk -NT/geom -NT/java -NT/monetdb5 -NT/monetdb_config.h -NT/sql -NT/testing -NT/tools -NT/unistd.h - # package building on Mac OS X MacOSX/build MacOSX/usr diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -775,3 +775,8 @@ 28480e096722b7f76ab021c0d16c68c6949f41b4 80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_7 28480e096722b7f76ab021c0d16c68c6949f41b4 Jun2020_release 80bd3e89c48032840f493a63d6c4c12ee6273b3d Jun2020_release +1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_9 +1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release +bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_11 +1e3bd8cd485a0880a7557aa5307e986a210a1e00 Jun2020_SP1_release +bb157905ecb86908dcfb112d102a8c6152557b5d Jun2020_SP1_release diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,6 @@ include(monetdb-toolchain) monetdb_default_toolchain() #monetdb_default_compiler_options() - include(monetdb-defines) monetdb_hg_revision() @@ -155,6 +154,7 @@ add_subdirectory(tools) if(TESTING) add_subdirectory(testing) endif() +add_subdirectory(buildtools) include(CMakePackageConfigHelpers) configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in diff --git a/misc/packages/rpm/COPYING b/COPYING rename from misc/packages/rpm/COPYING rename to COPYING diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -7,7 +7,7 @@ # The --with OPTION and --without OPTION arguments can be passed on # the commandline of both rpmbuild and mock. -# On 64 bit architectures we build "hugeint" packages. +# On 64 bit architectures compile with 128 bit integer support. %if "%{?_lib}" == "lib64" %bcond_without hugeint %endif @@ -65,6 +65,9 @@ # operators. Otherwise the POSIX regex functions are used. %bcond_without pcre +# By default, include C integration +%bcond_without cintegration + %if %{fedpkgs} # By default, create the MonetDB-R package. %bcond_without rintegration @@ -94,7 +97,7 @@ Group: Applications/Databases License: MPLv2.0 URL: https://www.monetdb.org/ BugURL: https://bugs.monetdb.org/ -Source: https://www.monetdb.org/downloads/sources/Jun2020/%{name}-%{version}.tar.bz2 +Source: https://www.monetdb.org/downloads/sources/Jun2020-SP1/%{name}-%{version}.tar.bz2 # The Fedora packaging document says we need systemd-rpm-macros for # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7 @@ -108,6 +111,7 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: hardlink %endif +BuildRequires: cmake >= 3.12 BuildRequires: gcc BuildRequires: bison BuildRequires: /usr/bin/python3 @@ -187,6 +191,7 @@ functionality of MonetDB. %{_includedir}/monetdb/gdk*.h %{_includedir}/monetdb/matomic.h %{_includedir}/monetdb/mstring.h +%exclude %{_includedir}/monetdb/monetdbe.h %{_includedir}/monetdb/monet*.h %{_libdir}/libbat.so %{_libdir}/pkgconfig/monetdb-gdk.pc @@ -379,9 +384,6 @@ extensions for %{name}-SQL-server5. %files geom-MonetDB5 %defattr(-,root,root) -%{_libdir}/monetdb5/autoload/*_geom.mal -%{_libdir}/monetdb5/createdb/*_geom.sql -%{_libdir}/monetdb5/geom.mal %{_libdir}/monetdb5/lib_geom.so %endif @@ -406,8 +408,7 @@ install it. %files R %defattr(-,root,root) -%{_libdir}/monetdb5/rapi.* -%{_libdir}/monetdb5/autoload/*_rapi.mal +%{_libdir}/monetdb5/rapi.R %{_libdir}/monetdb5/lib_rapi.so %endif @@ -432,8 +433,6 @@ install it. %files python3 %defattr(-,root,root) -%{_libdir}/monetdb5/pyapi3.* -%{_libdir}/monetdb5/autoload/*_pyapi3.mal %{_libdir}/monetdb5/lib_pyapi3.so %endif @@ -454,9 +453,6 @@ format. %files cfitsio %defattr(-,root,root) -%{_libdir}/monetdb5/fits.mal -%{_libdir}/monetdb5/autoload/*_fits.mal -%{_libdir}/monetdb5/createdb/*_fits.sql %{_libdir}/monetdb5/lib_fits.so %endif @@ -465,11 +461,12 @@ Summary: MonetDB - Monet Database Manage Group: Applications/Databases Requires(pre): shadow-utils Requires: %{name}-client%{?_isa} = %{version}-%{release} +Obsoletes: MonetDB5-server-hugeint < 11.38.0 +%if %{with hugeint} +Provides: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release} +%endif %if (0%{?fedora} >= 22) Recommends: %{name}-SQL-server5%{?_isa} = %{version}-%{release} -%if %{with hugeint} -Recommends: MonetDB5-server-hugeint%{?_isa} = %{version}-%{release} -%endif Suggests: %{name}-client%{?_isa} = %{version}-%{release} %endif # versions up to 1.0.5 don't accept the queryid field in the result set @@ -521,38 +518,11 @@ exit 0 %exclude %{_bindir}/stethoscope %{_libdir}/libmonetdb5.so.* %dir %{_libdir}/monetdb5 -%dir %{_libdir}/monetdb5/autoload -%if %{with fits} -%exclude %{_libdir}/monetdb5/fits.mal -%exclude %{_libdir}/monetdb5/autoload/*_fits.mal -%endif -%if %{with geos} -%exclude %{_libdir}/monetdb5/geom.mal -%endif -%if %{with py3integration} -%exclude %{_libdir}/monetdb5/pyapi3.mal -%endif -%if %{with rintegration} -%exclude %{_libdir}/monetdb5/rapi.mal +%{_libdir}/monetdb5/microbenchmark.mal +%{_libdir}/monetdb5/run_*.mal +%if %{with cintegration} +%{_libdir}/monetdb5/lib_capi.so %endif -%exclude %{_libdir}/monetdb5/sql*.mal -%if %{with hugeint} -%exclude %{_libdir}/monetdb5/*_hge.mal -%exclude %{_libdir}/monetdb5/autoload/*_hge.mal -%endif -%{_libdir}/monetdb5/*.mal -%if %{with geos} -%exclude %{_libdir}/monetdb5/autoload/*_geom.mal -%endif -%if %{with py3integration} -%exclude %{_libdir}/monetdb5/autoload/*_pyapi3.mal -%endif -%if %{with rintegration} -%exclude %{_libdir}/monetdb5/autoload/*_rapi.mal -%endif -%exclude %{_libdir}/monetdb5/autoload/??_sql*.mal -%{_libdir}/monetdb5/autoload/*.mal -%{_libdir}/monetdb5/lib_capi.so %{_libdir}/monetdb5/lib_generator.so %{_libdir}/monetdb5/lib_udf.so %doc %{_mandir}/man1/mserver5.1.gz @@ -560,28 +530,6 @@ exit 0 %docdir %{_datadir}/doc/MonetDB %{_datadir}/doc/MonetDB/* -%if %{with hugeint} -%package -n MonetDB5-server-hugeint -Summary: MonetDB - 128-bit integer support for MonetDB5-server -Group: Applications/Databases -Requires: MonetDB5-server%{?_isa} - -%description -n MonetDB5-server-hugeint -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. - -%files -n MonetDB5-server-hugeint -%exclude %{_libdir}/monetdb5/sql*_hge.mal -%{_libdir}/monetdb5/*_hge.mal -%exclude %{_libdir}/monetdb5/autoload/??_sql_hge.mal -%{_libdir}/monetdb5/autoload/*_hge.mal -%endif - %package -n MonetDB5-server-devel Summary: MonetDB development files Group: Applications/Databases @@ -608,10 +556,11 @@ used from the MAL level. Summary: MonetDB5 SQL server modules Group: Applications/Databases Requires(pre): MonetDB5-server%{?_isa} = %{version}-%{release} -%if (0%{?fedora} >= 22) +Obsoletes: %{name}-SQL-server5-hugeint < 11.38.0 %if %{with hugeint} -Recommends: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} +Provides: %{name}-SQL-server5-hugeint%{?_isa} = %{version}-%{release} %endif +%if (0%{?fedora} >= 22) Suggests: %{name}-client%{?_isa} = %{version}-%{release} %endif %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7 @@ -657,49 +606,45 @@ 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}/monetdb5/autoload/??_sql.mal -%{_libdir}/monetdb5/lib_sql.so -%dir %{_libdir}/monetdb5/createdb -%if %{with fits} -%exclude %{_libdir}/monetdb5/createdb/*_fits.sql -%endif -%if %{with geos} _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list