Changeset: 0aa5ba5e98a7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0aa5ba5e98a7
Added Files:
.bumpversion.cfg
Removed Files:
vertoo.config
vertoo.data
Modified Files:
NT/rules.msc
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:
Merge with Jun2020 branch.
diffs (truncated from 310 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,32 @@
+[bumpversion]
+current_version = 11.38.0
+commit = False
+tag = False
+
+[bumpversion:file:configure.ag]
+
+[bumpversion:file:MonetDB.spec]
+
+[bumpversion:file:NT/rules.msc]
+
+[bumpversion:file:NT/monetdb_config.h.in]
+
+[bumpversion:file:gdk/libbat.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/winsetup/setup.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/odbc/driver/driver.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:clients/mapilib/mapi.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
+
+[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
+parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
+serialize = {major},{minor},{patch}
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -7,9 +7,6 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
VERSION=11.38.0
-# ^^^^^^
-# Maintained via vertoo. Please don't modify by hand!
-# Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
!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
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Application Interface DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "Mapi\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\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", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,0)
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
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libMonetODBC\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\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", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,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
@@ -2,6 +2,9 @@
//
#include "resource.h"
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
//
@@ -62,8 +65,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -80,12 +83,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
- VALUE "FileVersion", "11.38.0"
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libMonetODBCs.dll"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020"
+ VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
VALUE "OriginalFilename", "libMonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
- VALUE "ProductVersion", "11.38.0"
+ VALUE "ProductVersion", sversion(11,38,0)
END
END
BLOCK "VarFileInfo"
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB Goblin Database Kernel DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libbat\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\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", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,0)
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
@@ -2,9 +2,12 @@
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#define version(major,minor,patch) major,minor,patch,1
+#define sversion(major,minor,patch) #major "." #minor "." #patch "\0"
+
1 VERSIONINFO
- FILEVERSION 11,38,0,1
- PRODUCTVERSION 11,38,0,1
+ FILEVERSION version(11,38,0)
+ PRODUCTVERSION version(11,38,0)
FILEFLAGSMASK 0x3fL
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
@@ -18,20 +21,14 @@ BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB5 Library DLL\0"
- VALUE "FileVersion", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "FileVersion", sversion(11,38,0)
VALUE "InternalName", "libmonetdb5\0"
- VALUE "LegalCopyright", "Copyright © MonetDB B.V. 2008-2020\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", "11.38.0\0"
- // ^^^^^^^^
- // Maintained via vertoo. Please don't modify by hand!
- // Contact monetdb-develop...@lists.sourceforge.net for details and/or
assistance.
+ VALUE "ProductVersion", sversion(11,38,0)
VALUE "SpecialBuild", "\0"
END
END
diff --git a/vertoo.config b/vertoo.config
deleted file mode 100644
--- a/vertoo.config
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- mode: python -*-
-addScheme('normal', '%major.%minor.%release')
-addScheme('winrc', '%major,%minor,%release')
-main = addModule('monetdb')
-main.setVersionFormat('@normal')
-
-# %v - unadorned version number
-# %q - version number surrounded by single quotes
-# %Q - version number surrounded by double quotes
-
-main.addAnchor("configure.ag", "[MonetDB], [%v]")
-main.addAnchor("MonetDB.spec", "%global version %v")
-main.addAnchors("NT/rules.msc",
- "VERSION=%v")
-main.addAnchors("NT/monetdb_config.h.in",
- 'PACKAGE_VERSION %Q')
-main.addAnchors("gdk/libbat.rc",
- 'VALUE "FileVersion", "%v\\0"',
- 'VALUE "ProductVersion", "%v\\0"',
- arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
- arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("clients/odbc/winsetup/setup.rc",
- 'VALUE "FileVersion", %Q',
- 'VALUE "ProductVersion", %Q',
- arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
- arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("clients/odbc/driver/driver.rc",
- 'VALUE "FileVersion", "%v\\0"',
- 'VALUE "ProductVersion", "%v\\0"',
- arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
- arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("clients/mapilib/mapi.rc",
- 'VALUE "FileVersion", "%v\\0"',
- 'VALUE "ProductVersion", "%v\\0"',
- arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
- arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
-main.addAnchors("monetdb5/tools/libmonetdb5.rc",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
