Changeset: 77a9ad16c479 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/77a9ad16c479
Branch: Oct2020
Log Message:
merged
diffs (56 lines):
diff --git a/NT/ChangeLog.Oct2020 b/NT/ChangeLog.Oct2020
new file mode 100644
--- /dev/null
+++ b/NT/ChangeLog.Oct2020
@@ -0,0 +1,6 @@
+# ChangeLog file for NT
+# This file is updated with Maddlog
+
+* Fri Apr 23 2021 Sjoerd Mullender <sjo...@acm.org>
+- Added the monetdbe library to the Windows installer.
+
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -143,6 +143,7 @@ def main():
r'bin\bat.dll',
r'bin\mapi.dll',
r'bin\monetdb5.dll',
+ r'bin\monetdbe.dll',
r'bin\monetdbsql.dll',
r'bin\stream.dll',
vcpkg.format(r'bin\iconv-2.dll'),
@@ -198,6 +199,7 @@ def main():
[r'lib\bat.lib',
r'lib\mapi.lib',
r'lib\monetdb5.lib',
+ r'lib\monetdbe.lib',
r'lib\monetdbsql.lib',
r'lib\stream.lib',
vcpkg.format(r'lib\iconv.lib'),
diff --git a/tools/mserver/monet_version.c.in b/tools/mserver/monet_version.c.in
--- a/tools/mserver/monet_version.c.in
+++ b/tools/mserver/monet_version.c.in
@@ -77,10 +77,19 @@ monet_version(void)
GDKnr_threads, GDKnr_threads != 1 ? "s" : ""); */
printf("Libraries:\n");
#ifdef HAVE_LIBPCRE
+ /* PCRE_PRERELEASE may be defined as an empty value. In order
+ * to get the proper amount of white space between various
+ * parts of the version string on different compilers (none
+ * between minor and prerelease, a single one between that
+ * combination and the date), we need to resort to some
+ * run-time trickery since we can't do it with the
+ * preprocessor */
print_libversion("libpcre",
- pcre_version(),
- XSTRING(PCRE_MAJOR.PCRE_MINOR)
XSTRING(PCRE_PRERELEASE)
- " " XSTRING(PCRE_DATE));
+ pcre_version(),
+ XSTRING(Z PCRE_PRERELEASE)[1] == 0
+ ? XSTRING(PCRE_MAJOR.PCRE_MINOR PCRE_DATE)
+ : XSTRING(PCRE_MAJOR.PCRE_MINOR)
+ XSTRING(PCRE_PRERELEASE PCRE_DATE));
#endif
#ifdef HAVE_OPENSSL
print_libversion("openssl",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
