Changeset: 4a6e86722f79 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4a6e86722f79
Added Files:
.bumpversion.cfg
Removed Files:
vertoo.config
vertoo.data
Modified Files:
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Nov2019
Log Message:
Use bumpversion instead of vertoo for version management.
diffs (151 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
new file mode 100644
--- /dev/null
+++ b/.bumpversion.cfg
@@ -0,0 +1,34 @@
+[bumpversion]
+current_version = 11.35.20
+commit = False
+tag = False
+
+[bumpversion:file:configure.ag]
+
+[bumpversion:file:MonetDB.spec]
+search = %global version {current_version}
+replace = %global version {new_version}
+
+[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/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
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"
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
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
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"
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
@@ -82,7 +82,7 @@ BEGIN
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", "11.35.20"
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.35.20"
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
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"
diff --git a/monetdb5/tools/libmonetdb5.rc b/monetdb5/tools/libmonetdb5.rc
--- a/monetdb5/tools/libmonetdb5.rc
+++ b/monetdb5/tools/libmonetdb5.rc
@@ -23,7 +23,7 @@ BEGIN
// Maintained via vertoo. Please don't modify by hand!
// Contact [email protected] for details and/or
assistance.
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"
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",
- 'VALUE "FileVersion", "%v\\0"',
- 'VALUE "ProductVersion", "%v\\0"',
- arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
- arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
diff --git a/vertoo.data b/vertoo.data
deleted file mode 100644
--- a/vertoo.data
+++ /dev/null
@@ -1,1 +0,0 @@
-monetdb = major:11; minor:35; release:20;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
