Changeset: 816e0dc1292b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=816e0dc1292b
Branch: octbugs
Log Message:
Merge with Oct2020 branch.
diffs (189 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.39.3
+current_version = 11.39.4
commit = False
tag = False
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -1,5 +1,5 @@
%global name MonetDB
-%global version 11.39.3
+%global version 11.39.4
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
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,39,3)
- PRODUCTVERSION version(11,39,3)
+ FILEVERSION version(11,39,4)
+ PRODUCTVERSION version(11,39,4)
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,39,3)
+ VALUE "FileVersion", sversion(11,39,4)
VALUE "InternalName", "Mapi\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "Mapi.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Client Libraries\0"
- VALUE "ProductVersion", sversion(11,39,3)
+ VALUE "ProductVersion", sversion(11,39,4)
VALUE "SpecialBuild", "\0"
END
END
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,39,3)
- PRODUCTVERSION version(11,39,3)
+ FILEVERSION version(11,39,4)
+ PRODUCTVERSION version(11,39,4)
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,39,3)
+ VALUE "FileVersion", sversion(11,39,4)
VALUE "InternalName", "libMonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libMonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
- VALUE "ProductVersion", sversion(11,39,3)
+ VALUE "ProductVersion", sversion(11,39,4)
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,39,3)
- PRODUCTVERSION version(11,39,3)
+ FILEVERSION version(11,39,4)
+ PRODUCTVERSION version(11,39,4)
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,39,3)
+ VALUE "FileVersion", sversion(11,39,4)
VALUE "InternalName", "libMonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", sversion(11,39,3)
+ VALUE "ProductVersion", sversion(11,39,4)
END
END
BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -8,10 +8,10 @@
set(MONETDB_VERSION_MAJOR "11")
set(MONETDB_VERSION_MINOR "39")
-set(MONETDB_VERSION_PATCH "3")
+set(MONETDB_VERSION_PATCH "4")
if(RELEASE_VERSION)
- set(MONETDB_RELEASE "Oct2020")
+ set(MONETDB_RELEASE "unreleased")
endif()
set(MONETDB_VERSION
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.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,39,3)
- PRODUCTVERSION version(11,39,3)
+ FILEVERSION version(11,39,4)
+ PRODUCTVERSION version(11,39,4)
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 Goblin Database Kernel DLL\0"
- VALUE "FileVersion", sversion(11,39,3)
+ VALUE "FileVersion", sversion(11,39,4)
VALUE "InternalName", "libbat\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libbat.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB Common Libraries\0"
- VALUE "ProductVersion", sversion(11,39,3)
+ VALUE "ProductVersion", sversion(11,39,4)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.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,39,3)
- PRODUCTVERSION version(11,39,3)
+ FILEVERSION version(11,39,4)
+ PRODUCTVERSION version(11,39,4)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
- VALUE "FileVersion", sversion(11,39,3)
+ VALUE "FileVersion", sversion(11,39,4)
VALUE "InternalName", "libmonetdb5\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libmonetdb5.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB5 Server\0"
- VALUE "ProductVersion", sversion(11,39,3)
+ VALUE "ProductVersion", sversion(11,39,4)
VALUE "SpecialBuild", "\0"
END
END
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
