Changeset: fb71e14a9994 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb71e14a9994
Modified Files:
NT/installer32/MonetDB-ODBC-Installer.vdproj
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB-ODBC-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
buildtools/ChangeLog.Oct2014
buildtools/doc/windowsbuild.rst
clients/R/MonetDB.R/R/dbi.R
clients/R/Tests/survey.stable.err
clients/mapilib/mapi.c
clients/perl/Mapi.pm
clients/php/lib/php_mapi.inc
clients/python2/monetdb/sql/connections.py
clients/python3/monetdb/sql/connections.py
clients/ruby/lib/MonetDBData.rb
java/build.properties
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
monetdb5/tests/mapi/Tests/perl_dbi.stable.out
sql/backends/monet5/bam/bam_wrapper.c
tools/merovingian/daemon/peering.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 567 to 300 lines):
diff --git a/NT/installer32/MonetDB-ODBC-Installer.vdproj
b/NT/installer32/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer32/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer32/MonetDB-ODBC-Installer.vdproj
@@ -290,7 +290,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -1086,7 +1086,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\lib\\zdll.lib"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\lib\\zdll.lib"
"TargetName" = "8:zdll.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1326,7 +1326,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1786,7 +1786,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win32\\lib\\libxml2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win32\\lib\\libxml2.lib"
"TargetName" = "8:libxml2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1806,7 +1806,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2066,7 +2066,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2146,7 +2146,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win32\\bin\\pcre.dll"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2446,7 +2446,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2746,7 +2746,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88661B3BC7724CF992AC6079E040DE3A"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win32\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win32\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3146,7 +3146,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win32\\lib\\pcre.lib"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win32\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -4006,7 +4006,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win32\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win32\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/NT/installer64/MonetDB-ODBC-Installer.vdproj
b/NT/installer64/MonetDB-ODBC-Installer.vdproj
--- a/NT/installer64/MonetDB-ODBC-Installer.vdproj
+++ b/NT/installer64/MonetDB-ODBC-Installer.vdproj
@@ -290,7 +290,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_4F0D2367141846EFA634DA35B05CDA4D"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -330,7 +330,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_779449EF5BAD4B068A50802402E52278"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
@@ -370,7 +370,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B1B1C0011D7945F892A77F529772EA72"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_376EC0506E4F452CA2C78ACE11515435"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -1066,7 +1066,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_03431EDC85094776AD217020CB3E26D4"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\lib\\zdll.lib"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\lib\\zdll.lib"
"TargetName" = "8:zdll.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1306,7 +1306,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_13440C2EDE6842BF8D9F24F554EEB87F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win64\\lib\\libxml2.dll"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\lib\\libxml2.dll"
"TargetName" = "8:libxml2.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1766,7 +1766,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2CC8B012C0CB4DFC8F2223F62310125F"
{
- "SourcePath" =
"8:C:\\Libraries\\libxml2-2.7.8.win64\\lib\\libxml2.lib"
+ "SourcePath" =
"8:C:\\Libraries\\libxml2-2.9.2.win64\\lib\\libxml2.lib"
"TargetName" = "8:libxml2.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -1786,7 +1786,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2E0FEE7726DA47369758C263666F3DB1"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\lib\\libeay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\lib\\libeay32.lib"
"TargetName" = "8:libeay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2066,7 +2066,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_45C820B6483D494EBFE6F9A28A30760C"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\bin\\ssleay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\ssleay32.dll"
"TargetName" = "8:ssleay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2146,7 +2146,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_52DCEC5806254D3F9246489B9C5DFC27"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win64\\bin\\pcre.dll"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\bin\\pcre.dll"
"TargetName" = "8:pcre.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2426,7 +2426,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_732094CE07974147A084EDD6A5F43C6F"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\lib\\ssleay32.lib"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\lib\\ssleay32.lib"
"TargetName" = "8:ssleay32.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -2726,7 +2726,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_88661B3BC7724CF992AC6079E040DE3A"
{
- "SourcePath" = "8:C:\\Libraries\\zlib-1.2.5.win64\\bin\\zlib1.dll"
+ "SourcePath" = "8:C:\\Libraries\\zlib-1.2.8.win64\\bin\\zlib1.dll"
"TargetName" = "8:zlib1.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3126,7 +3126,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_A3D31DA50E0F4AE1873E390D5B7F1F33"
{
- "SourcePath" = "8:C:\\Libraries\\pcre-8.13.win64\\lib\\pcre.lib"
+ "SourcePath" = "8:C:\\Libraries\\pcre-8.36.win64\\lib\\pcre.lib"
"TargetName" = "8:pcre.lib"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
@@ -3966,7 +3966,7 @@
}
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_E80B0549492B4D76B7EB93941A6BF89D"
{
- "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1g.win64\\bin\\libeay32.dll"
+ "SourcePath" =
"8:C:\\Libraries\\openssl-1.0.1j.win64\\bin\\libeay32.dll"
"TargetName" = "8:libeay32.dll"
"Tag" = "8:"
"Folder" = "8:_A3C9BE5CA72B42628868618D180581DA"
diff --git a/buildtools/ChangeLog.Oct2014 b/buildtools/ChangeLog.Oct2014
--- a/buildtools/ChangeLog.Oct2014
+++ b/buildtools/ChangeLog.Oct2014
@@ -1,3 +1,7 @@
# ChangeLog file for buildtools
# This file is updated with Maddlog
+* Fri Nov 7 2014 Sjoerd Mullender <[email protected]>
+- The libraries included in the Windows installers have been upgraded.
+ We now use libxml2-2.9.2, openssl-1.0.1j, pcre-8.36, and zlib-1.2.8.
+
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -172,8 +172,7 @@ the build process would be much more lik
here).
We currently use Microsoft Visual Studio 2010 and Intel(R) C++
-Compiler Professional 11.1.046, the latter using Microsoft Visual
-Studio 9.0.
+Compiler XE 13.1.2.190, the latter using Microsoft Visual Studio 10.0.
__ http://www.cygwin.com/
__ http://www.mingw.org/
@@ -209,19 +208,6 @@ However, we use the version of bison tha
__ http://www.cygwin.com/
-Flex
-----
-
-Flex is a fast lexical analyzer generator.
-
-A version of Flex for Windows can be gotten from the GnuWin32 project
-at http://gnuwin32.sourceforge.net/. Click on the Packages link on
-the left and then on Flex, and get the Setup file and install it.
-
-However, we use the version of bison that comes with Cygwin__.
-
-__ http://www.cygwin.com/
-
Diff
----
@@ -259,17 +245,21 @@ the Win32 Installer, install it, and run
window where you have to fill in the location of the source code and
where to build the binaries. Fill in where you extracted the PCRE
sources, and some other folder (I used a ``build`` folder which I
-created within the PCRE source tree). You need to configure some PCRE
-build options. I chose to do build shared libs, to match newlines
-with the ``ANYCRLF`` option, and to do have UTF-8 support and support
-for Unicode properties. When you're satisfied with the options, click
-on Configure, and then on Generate. Then in the build folder you've
-chosen, open the PCRE.sln file with Visual Studio, and build and
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
