Changeset: 0ff52c4d989a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0ff52c4d989a
Modified Files:
Branch: default
Log Message:
Merge with default
diffs (89 lines):
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
@@ -310,6 +310,9 @@
/* Define to 1 if you have the `mallopt' function. */
/* #undef HAVE_MALLOPT */
+/* Define to 1 if you have the `MD5' function. */
+#define HAVE_MD5 1
+
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
@@ -392,6 +395,9 @@
/* Define if the compiler supports the restrict keyword */
/* #undef HAVE_RESTRICT */
+/* Define to 1 if you have the `RIPEMD160' function. */
+#define HAVE_RIPEMD160 1
+
/* Define to 1 if you have the <rlimit.h> header file. */
/* #undef HAVE_RLIMIT_H */
@@ -421,6 +427,21 @@
/* Define to 1 if you have the `setsid' function. */
/* #undef HAVE_SETSID */
+/* Define to 1 if you have the `SHA1' function. */
+#define HAVE_SHA1 1
+
+/* Define to 1 if you have the `SHA224' function. */
+#define HAVE_SHA224 1
+
+/* Define to 1 if you have the `SHA256' function. */
+#define HAVE_SHA256 1
+
+/* Define to 1 if you have the `SHA384' function. */
+#define HAVE_SHA384 1
+
+/* Define to 1 if you have the `SHA512' function. */
+#define HAVE_SHA512 1
+
/* Define to 1 if you have the `shutdown' function. */
#define HAVE_SHUTDOWN 1
diff --git a/clients/python/setup.py b/clients/python/setup.py
--- a/clients/python/setup.py
+++ b/clients/python/setup.py
@@ -20,7 +20,7 @@
from distutils.core import setup
setup(name='python-monetdb',
- version='1.0',
+ version='11.4.0',
description='Native MonetDB client Python API',
long_description='''\
MonetDB is a database management system that is developed from a
@@ -35,6 +35,6 @@
author_email='i...@monetdb.org',
url='http://monetdb.cwi.nl/',
packages=['monetdb', 'monetdb.sql'],
- download_url='<will be filled in before a
release>/python-monetdb-1.0.tar.gz',
+ download_url='<will be filled in before a
release>/python-monetdb-11.4.0.tar.gz',
)
diff --git a/vertoo.config b/vertoo.config
--- a/vertoo.config
+++ b/vertoo.config
@@ -17,8 +17,8 @@
arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
main.addAnchors("clients/odbc/winsetup/setup.rc",
- 'VALUE "FileVersion", "%v"',
- 'VALUE "ProductVersion", "%v"',
+ '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",
@@ -31,6 +31,9 @@
'VALUE "ProductVersion", "%v\\0"',
arguments(pattern = 'FILEVERSION %v', format = '@winrc'),
arguments(pattern = 'PRODUCTVERSION %v', format = '@winrc'))
+main.addAnchors("clients/python/setup.py",
+ "version=%q,",
+ "python-monetdb-%v.tar")
main.addAnchors("monetdb5/tools/libmonetdb5.rc",
'VALUE "FileVersion", "%v\\0"',
'VALUE "ProductVersion", "%v\\0"',
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
