Changeset: 41ffbf5adfb7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/41ffbf5adfb7
Modified Files:
.bumpversion.cfg
MonetDB.spec
NT/monetdb_config.h.in
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
configure.ag
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Jun2020
Log Message:
Post release build.
diffs (227 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.37.13
+current_version = 11.37.14
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.37.13
+%global version 11.37.14
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -607,7 +607,7 @@
#define MONETDB5_PASSWDHASH_TOKEN SHA512
/* Release name or "unreleased" */
-#define MONETDB_RELEASE "Jun2020-SP2"
+/* #define MONETDB_RELEASE "unreleased" */
/* Define if you do not want assertions */
/* #undef NDEBUG */
@@ -631,7 +631,7 @@
#define PACKAGE_URL "https://www.monetdb.org/";
/* Define to the version of this package. */
-#define PACKAGE_VERSION "11.37.13"
+#define PACKAGE_VERSION "11.37.14"
/* Path separator */
#define PATH_SEP ';'
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -6,7 +6,7 @@
#
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
-VERSION=11.37.13
+VERSION=11.37.14
!IFDEF MAKE_INCLUDEFILE
!INCLUDE $(MAKE_INCLUDEFILE)
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,37,13)
- PRODUCTVERSION version(11,37,13)
+ FILEVERSION version(11,37,14)
+ PRODUCTVERSION version(11,37,14)
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,37,13)
+ VALUE "FileVersion", sversion(11,37,14)
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,37,13)
+ VALUE "ProductVersion", sversion(11,37,14)
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,37,13)
- PRODUCTVERSION version(11,37,13)
+ FILEVERSION version(11,37,14)
+ PRODUCTVERSION version(11,37,14)
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,37,13)
+ VALUE "FileVersion", sversion(11,37,14)
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,37,13)
+ VALUE "ProductVersion", sversion(11,37,14)
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,37,13)
- PRODUCTVERSION version(11,37,13)
+ FILEVERSION version(11,37,14)
+ PRODUCTVERSION version(11,37,14)
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,37,13)
+ VALUE "FileVersion", sversion(11,37,14)
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,37,13)
+ VALUE "ProductVersion", sversion(11,37,14)
END
END
BLOCK "VarFileInfo"
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -52,7 +52,7 @@ dnl configure file, whereas comments st
dnl (including their trailing newline).
AC_PREREQ([2.63b])
-AC_INIT([MonetDB], [11.37.13], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
+AC_INIT([MonetDB], [11.37.14], [https://bugs.monetdb.org/], [MonetDB],
[https://www.monetdb.org/])
AC_COPYRIGHT([Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.])
AC_CONFIG_AUX_DIR([buildtools/conf])
AC_CONFIG_MACRO_DIR([buildtools/conf])
@@ -68,7 +68,7 @@ HOST=[$target]
AC_DEFINE_UNQUOTED([HOST], ["$HOST"], [Host identifier])
dnl The next line is modified for a release and commented between releases
-AC_DEFINE([MONETDB_RELEASE], ["Jun2020-SP2"], [Release name])
+dnl AC_DEFINE([MONETDB_RELEASE], ["unreleased"], [Release name])
AS_VAR_IF([target_os], [cygwin],
[AC_DEFINE([WIN32], 1, [Define on Microsoft Windows (also under
Cygwin)])])
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,37,13)
- PRODUCTVERSION version(11,37,13)
+ FILEVERSION version(11,37,14)
+ PRODUCTVERSION version(11,37,14)
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,37,13)
+ VALUE "FileVersion", sversion(11,37,14)
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,37,13)
+ VALUE "ProductVersion", sversion(11,37,14)
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,37,13)
- PRODUCTVERSION version(11,37,13)
+ FILEVERSION version(11,37,14)
+ PRODUCTVERSION version(11,37,14)
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,37,13)
+ VALUE "FileVersion", sversion(11,37,14)
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,37,13)
+ VALUE "ProductVersion", sversion(11,37,14)
VALUE "SpecialBuild", "\0"
END
END
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
