Changeset: 2f6d89d762ed for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f6d89d762ed
Modified Files:
NT/mkgeomwxs.py
NT/mkodbcwxs.py
NT/mksqlwxs.py
buildtools/autogen/autogen/msc.py
monetdb5/modules/mal/pcre.c
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (108 lines):
diff --git a/NT/mkgeomwxs.py b/NT/mkgeomwxs.py
--- a/NT/mkgeomwxs.py
+++ b/NT/mkgeomwxs.py
@@ -83,7 +83,7 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.endswith('.mal') and ('geom' in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(features, id, 16,
- [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' in x),
os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\%s' % x for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
print(r' </Directory>')
print(r' </Directory>')
print(r' </Directory>')
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -67,10 +67,10 @@ def main():
id = 1
print(r' <Directory Id="lib" Name="lib">')
id = comp(features, id, 14,
- [r'lib\libmapi.dll',
- r'lib\libMonetODBC.dll',
- r'lib\libMonetODBCs.dll',
- r'lib\libstream.dll',
+ [r'lib\libmapi.dll', r'lib\libmapi.pdb',
+ r'lib\libMonetODBC.dll', r'lib\libMonetODBC.pdb',
+ r'lib\libMonetODBCs.dll', r'lib\libMonetODBCs.pdb',
+ r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -74,14 +74,14 @@ def main():
id = 1
print(r' <Directory Id="bin" Name="bin">')
id = comp(features, id, 14,
- [r'bin\mclient.exe',
- r'bin\mserver5.exe',
- r'bin\msqldump.exe',
- r'bin\stethoscope.exe',
- r'lib\libbat.dll',
- r'lib\libmapi.dll',
- r'lib\libmonetdb5.dll',
- r'lib\libstream.dll',
+ [r'bin\mclient.exe', r'bin\mclient.pdb',
+ r'bin\mserver5.exe', r'bin\mserver5.pdb',
+ r'bin\msqldump.exe', r'bin\msqldump.pdb',
+ r'bin\stethoscope.exe', r'bin\stethoscope.pdb',
+ r'lib\libbat.dll', r'lib\libbat.pdb',
+ r'lib\libmapi.dll', r'lib\libmapi.pdb',
+ r'lib\libmonetdb5.dll', r'lib\libmonetdb5.pdb',
+ r'lib\libstream.dll', r'lib\libstream.pdb',
r'%s\bin\iconv.dll' % makedefs['LIBICONV'],
r'%s\bin\libbz2.dll' % makedefs['LIBBZIP2'],
r'%s\bin\libeay32.dll' % makedefs['LIBOPENSSL'],
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -693,6 +693,7 @@ def msc_library(fd, var, libmap, msc):
sep = ""
pref = 'lib'
dll = '.dll'
+ pdb = '.pdb'
if "NAME" in libmap:
libname = libmap['NAME'][0]
else:
@@ -823,9 +824,6 @@ def msc_library(fd, var, libmap, msc):
fd.write("%s%s: $(%s_DEPS) \n" % (ln, dll, ln.replace('-','_')))
fd.write('\tpython "$(TOPDIR)\\..\\NT\\wincompile.py" $(CC) $(CFLAGS)
-LD -Fe%s%s @<< /link @<<\n$(%s_OBJS)\n<<\n$(%s_LIBS)%s\n<<\n' % (ln, dll,
ln.replace('-','_'), ln.replace('-','_'), deffile))
fd.write("\tif exist $@.manifest $(MT) -manifest $@.manifest
-outputresource:$@;2\n");
- if sep == '_':
- fd.write('\tif not exist .libs $(MKDIR) .libs\n')
- fd.write('\t$(INSTALL) "%s%s" ".libs\\%s%s"\n' % (ln, dll, ln,
dll))
fd.write("\n")
if SCRIPTS:
@@ -1039,6 +1037,7 @@ def output(tree, cwd, topdir):
fd.write('install_bin_%s: %s\n' % (dst, src))
fd.write('\tif not exist "$(%sdir)" $(MKDIR) "$(%sdir)"\n' %
(dst.replace('-','_'), dst.replace('-','_')))
fd.write('\t$(INSTALL) %s "$(%sdir)"\n' %
(src,dst.replace('-','_')))
+ fd.write('\t$(INSTALL) %s.pdb "$(%sdir)"\n' %
(dst,dst.replace('-','_')))
if cond:
fd.write('!ELSE\n')
fd.write('install_bin_%s:\n' % dst)
@@ -1053,6 +1052,8 @@ def output(tree, cwd, topdir):
fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' % (src, dir, dst, ext))
if instlib:
fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' % (instlib, dir,
dst, '.lib'))
+ if src.endswith('.dll'):
+ fd.write('\t$(INSTALL) "%s" "%s\\%s%s"\n' %
(src.replace('.dll', '.pdb'), dir, dst, '.pdb'))
if cond:
fd.write('!ELSE\n')
fd.write('install_%s:\n' % dst)
diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -26,6 +26,10 @@
#ifdef HAVE_LIBPCRE
#include <pcre.h>
+#ifndef PCRE_STUDY_JIT_COMPILE
+/* old library version on e.g. EPEL 6 */
+#define pcre_free_study(x) pcre_free(x)
+#endif
#else
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
