Changeset: d1217ab88258 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/d1217ab88258 Branch: strheapvacuum Log Message:
merge default diffs (truncated from 2544 to 300 lines): diff --git a/.bumpversion.cfg b/.bumpversion.cfg --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 11.40.0 +current_version = 11.42.0 commit = False tag = False diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -800,3 +800,4 @@ 17d27ad30941c81e4bc700300912e84e9b9a8c37 17d27ad30941c81e4bc700300912e84e9b9a8c37 Oct2020_SP3_release 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_15 6b71a8cc3498561815ac88d6c652922359efd13a Oct2020_SP4_release +02fd591b7d3311d566007e1bfb0c59682b17f12c Jul2021_root diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,3 @@ # ChangeLog file for devel # This file is updated with Maddlog -* Thu Apr 15 2021 svetlin <[email protected]> -- preserve in query comments - diff --git a/ChangeLog b/ChangeLog.Jul2021 copy from ChangeLog copy to ChangeLog.Jul2021 diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1,5 +1,5 @@ %global name MonetDB -%global version 11.40.0 +%global version 11.42.0 %{!?buildno: %global buildno %(date +%Y%m%d)} # Use bcond_with to add a --with option; i.e., "without" is default. diff --git a/clients/ChangeLog b/clients/ChangeLog.Jul2021 copy from clients/ChangeLog copy to clients/ChangeLog.Jul2021 diff --git a/clients/mapiclient/CMakeLists.txt b/clients/mapiclient/CMakeLists.txt --- a/clients/mapiclient/CMakeLists.txt +++ b/clients/mapiclient/CMakeLists.txt @@ -93,6 +93,6 @@ install(FILES mclient.1 msqldump.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 - COMPONENT mclient) + COMPONENT client) # vim: set ts=2:sw=2:et diff --git a/clients/mapilib/ChangeLog b/clients/mapilib/ChangeLog.Jul2021 copy from clients/mapilib/ChangeLog copy to clients/mapilib/ChangeLog.Jul2021 diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc --- a/clients/mapilib/mapi.rc +++ b/clients/mapilib/mapi.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB Application Interface DLL\0" - VALUE "FileVersion", sversion(11,40,0) + VALUE "FileVersion", sversion(11,42,0) VALUE "InternalName", "Mapi\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "Mapi.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB Client Libraries\0" - VALUE "ProductVersion", sversion(11,40,0) + VALUE "ProductVersion", sversion(11,42,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/ChangeLog b/clients/odbc/ChangeLog.Jul2021 copy from clients/odbc/ChangeLog copy to clients/odbc/ChangeLog.Jul2021 diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc --- a/clients/odbc/driver/driver.rc +++ b/clients/odbc/driver/driver.rc @@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U #define sversion(major,minor,patch) #major "." #minor "." #patch "\0" 1 VERSIONINFO - FILEVERSION version(11,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,0) FILEFLAGSMASK 0x3fL FILEFLAGS 0 FILEOS VOS_NT_WINDOWS32 @@ -21,14 +21,14 @@ BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "MonetDB B.V.\0" VALUE "FileDescription", "MonetDB ODBC Driver DLL\0" - VALUE "FileVersion", sversion(11,40,0) + VALUE "FileVersion", sversion(11,42,0) VALUE "InternalName", "MonetODBC\0" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "MonetODBC.dll\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "MonetDB SQL Server\0" - VALUE "ProductVersion", sversion(11,40,0) + VALUE "ProductVersion", sversion(11,42,0) VALUE "SpecialBuild", "\0" END END diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc --- a/clients/odbc/winsetup/setup.rc +++ b/clients/odbc/winsetup/setup.rc @@ -65,8 +65,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION version(11,40,0) - PRODUCTVERSION version(11,40,0) + FILEVERSION version(11,42,0) + PRODUCTVERSION version(11,42,0) FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -83,12 +83,12 @@ BEGIN BEGIN VALUE "CompanyName", "MonetDB B.V." VALUE "FileDescription", "MonetDB ODBC Setup DLL" - VALUE "FileVersion", sversion(11,40,0) + VALUE "FileVersion", sversion(11,42,0) VALUE "InternalName", "MonetODBCs.dll" VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2021" VALUE "OriginalFilename", "MonetODBCs.dll" VALUE "ProductName", "MonetDB SQL Server" - VALUE "ProductVersion", sversion(11,40,0) + VALUE "ProductVersion", sversion(11,42,0) END END BLOCK "VarFileInfo" 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 @@ -23,64 +23,64 @@ set(CPACK_RPM_CHANGELOG_FILE "${CMAKE_SO 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") +set(CPACK_RPM_monetdb_FILE_NAME "${CPACK_RPM_monetdb_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_monetdb_PACKAGE_SUGGESTS "%{name}-client%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_monetdbdev_PACKAGE_NAME "devel") -set(CPACK_RPM_monetdbdev_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_monetdbdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_monetdbdev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-devel") +set(CPACK_RPM_monetdbdev_FILE_NAME "${CPACK_RPM_monetdbdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_monetdbdev_PACKAGE_SUMMARY "MonetDB development files") set(CPACK_RPM_monetdbdev_PACKAGE_REQUIRES "%{name}%{?_isa} = %{version}-%{release}, %{name}-stream-devel%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_stream_PACKAGE_NAME "stream") -set(CPACK_RPM_stream_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_stream_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_stream_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-stream") +set(CPACK_RPM_stream_FILE_NAME "${CPACK_RPM_stream_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_stream_SUMMARY "MonetDB stream library") -set(CPACK_RPM_streamdev_PACKAGE_NAME "stream-devel") -set(CPACK_RPM_streamdev_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_streamdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_streamdev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-stream-devel") +set(CPACK_RPM_streamdev_FILE_NAME "${CPACK_RPM_streamdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_streamdev_SUMMARY "MonetDB stream library") set(CPACK_RPM_streamdev_REQUIRES "%{name}-stream%{?_isa} = %{version}-%{release}, bzip2-devel, libcurl-devel, zlib-devel") -set(CPACK_RPM_client_PACKAGE_NAME "client") -set(CPACK_RPM_client_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_client_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_client_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client") +set(CPACK_RPM_client_FILE_NAME "${CPACK_RPM_client_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_client_PACKAGE_SUMMARY "MonetDB - Monet Database Management System Client Programs") set(CPACK_RPM_client_RECCOMMENDS "%{name}-SQL-server5%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_clientdev_PACKAGE_NAME "client-devel") -set(CPACK_RPM_clientdev_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_clientdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_clientdev_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client-devel") +set(CPACK_RPM_clientdev_FILE_NAME "${CPACK_RPM_clientdev_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_clientdev_PACKAGE_SUMMARY "MonetDB - Monet Database Management System Client Programs") set(CPACK_RPM_clientdev_PACKAGE_REQUIRES "%{name}-client%{?_isa} = %{version}-%{release}, %{name}-stream-devel%{?_isa} = %{version}-%{release}, openssl-devel") -set(CPACK_RPM_odbc_PACKAGE_NAME "client-odbc") -set(CPACK_RPM_odbc_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_odbc_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_odbc_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client-odbc") +set(CPACK_RPM_odbc_FILE_NAME "${CPACK_RPM_odbc_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_odbc_PACKAGE_SUMMARY "MonetDB ODBC driver") set(CPACK_RPM_odbc_PACKAGE_REQUIRES "%{name}-client%{?_isa} = %{version}-%{release}") set(CPACK_RPM_odbc_PACKAGE_REQUIRES_POST "unixODBC") set(CPACK_RPM_odbc_PACKAGE_REQUIRES_POSTUN "unixODBC") -set(CPACK_RPM_clienttest_PACKAGE_NAME "client-test") -set(CPACK_RPM_clienttest_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_clienttest_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_clienttest_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-client-test") +set(CPACK_RPM_clienttest_FILE_NAME "${CPACK_RPM_clienttest_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_clienttest_PACKAGE_SUMMARY "MonetDB Client tests package") set(CPACK_RPM_clienttest_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} = %{version}-%{release}, %{name}-client%{?_isa} = %{version}-%{release}, %{name}-client-odbc%{?_isa} = %{version}-%{release}, %{name}-SQL-server5%{?_isa} = %{version}-%{release}, python3-pymonetdb >= 1.0.6") set(CPACK_RPM_clienttest_PACKAGE_RECOMMENDS "perl-DBD-monetdb >= 1.0, php-monetdb >= 1.0") -set(CPACK_RPM_geom_PACKAGE_NAME "geom-MonetDB5") -set(CPACK_RPM_geom_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_geom_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_geom_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-geom-MonetDB5") +set(CPACK_RPM_geom_FILE_NAME "${CPACK_RPM_geom_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_geom_PACKAGE_SUMMARY "MonetDB5 SQL GIS support module") set(CPACK_RPM_geom_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_rapi_PACKAGE_NAME "R") -set(CPACK_RPM_rapi_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_rapi_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_rapi_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-R") +set(CPACK_RPM_rapi_FILE_NAME "${CPACK_RPM_rapi_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_rapi_PACKAGE_SUMMARY "Integration of MonetDB and R, allowing use of R from within SQL") set(CPACK_RPM_rapi_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_pyapi3_PACKAGE_NAME "python3") -set(CPACK_RPM_pyapi3_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_pyapi3_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_pyapi3_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-python3") +set(CPACK_RPM_pyapi3_FILE_NAME "${CPACK_RPM_pyapi3_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_pyapi3_PACKAGE_SUMMARY "Integration of MonetDB and Python, allowing use of Python from within SQL") set(CPACK_RPM_pyapi3_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_fits_PACKAGE_NAME "cfitsio") -set(CPACK_RPM_fits_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_fits_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_fits_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-cfitsio") +set(CPACK_RPM_fits_FILE_NAME "${CPACK_RPM_fits_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_fits_PACKAGE_SUMMARY "MonetDB: Add on module that provides support for FITS files") set(CPACK_RPM_fits_PACKAGE_REQUIRES "MonetDB-SQL-server5%{?_isa} = %{version}-%{release}") @@ -100,26 +100,26 @@ set(CPACK_RPM_serverdev_FILE_NAME "${CPA set(CPACK_RPM_serverdev_PACKAGE_SUMMARY "MonetDB development files") set(CPACK_RPM_serverdev_PACKAGE_REQUIRES "MonetDB5-server%{?_isa} = %{version}-%{release}, %{name}-devel%{?_isa} = %{version}-%{release}") -set(CPACK_RPM_sql_PACKAGE_NAME "SQL-server5") -set(CPACK_RPM_sql_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_sql_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_sql_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-SQL-server5") +set(CPACK_RPM_sql_FILE_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}") set(CPACK_RPM_sql_PACKAGE_SUGGESTS "%{name}-client%{?_isa} = %{version}-%{release}") # TODO: systemd_requires? -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_NAME "${CMAKE_PROJECT_NAME}-testing") +set(CPACK_RPM_testing_FILE_NAME "${CPACK_RPM_testing_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_TESTING_PACKAGE_SUMMARY "MonetDB - Monet Database Management System") -set(CPACK_RPM_pytesting_PACKAGE_NAME "testing-python") -set(CPACK_RPM_pytesting_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_pytesting_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_pytesting_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-testing-python") +set(CPACK_RPM_pytesting_FILE_NAME "${CPACK_RPM_pytesting_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_pytesting_PACKAGE_SUMMARY "MonetDB - Monet Database Management System") set(CPACK_RPM_pytesting_PACKAGE_REQUIRES "%{name}-testing = %{version}-%{release}, %{name}-client-tests = %{version}-%{release}, /usr/bin/python3") set(CPACK_RPM_pytesting_PACKAGE_ARCHITECTURE "noarch") # TODO: detect rhel -set(CPACK_RPM_selinux_PACKAGE_NAME "selinux") -set(CPACK_RPM_selinux_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_selinux_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") +set(CPACK_RPM_selinux_PACKAGE_NAME "${CMAKE_PROJECT_NAME}-selinux") +set(CPACK_RPM_selinux_FILE_NAME "${CPACK_RPM_selinux_PACKAGE_NAME}-${MONETDB_VERSION}.rpm") set(CPACK_RPM_selinux_PACKAGE_SUMMARY "SELinux policy files for MonetDB") set(CPACK_RPM_selinux_PACKAGE_ARCHITECTURE "noarch") set(CPACK_RPM_selinux_PACKAGE_REQUIRES_POST "MonetDB5-server%{?_isa} = %{version}-%{release}, %{name}-SQL-server5%{?_isa} = %{version}-%{release}, /usr/sbin/semodule, /sbin/restorecon, /sbin/fixfiles") @@ -134,6 +134,7 @@ set(CPACK_RPM_selinux_POST_UNINSTALL_SCR # might change this, or add the option to generate one based # on the cmake options. set(buildrequireslist + "cmake >= 3.12" "gcc" "bison" "/usr/bin/python3") diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake --- a/cmake/monetdb-versions.cmake +++ b/cmake/monetdb-versions.cmake @@ -7,7 +7,7 @@ #]] set(MONETDB_VERSION_MAJOR "11") -set(MONETDB_VERSION_MINOR "40") +set(MONETDB_VERSION_MINOR "42") set(MONETDB_VERSION_PATCH "0") if(RELEASE_VERSION) diff --git a/common/stream/ChangeLog b/common/stream/ChangeLog.Jul2021 copy from common/stream/ChangeLog _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
