Changeset: 75e489c8fdcc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=75e489c8fdcc
Modified Files:
NT/monetdb_config.h.in
buildtools/conf/rules.mk
buildtools/doc/windowsbuild.rst
clients/odbc/driver/ODBC.syms
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetConnectOption.c
clients/odbc/driver/SQLSetConnectOption.c
common/stream/stream.c
common/utils/mutils.c
configure.ag
gdk/gdk_atoms.c
gdk/gdk_select.c
monetdb5/modules/kernel/mmath.c
monetdb5/modules/kernel/mmath.h
sql/backends/monet5/generator/generator.c
Branch: Oct2014
Log Message:
merged
diffs (truncated from 672 to 300 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
@@ -26,6 +26,7 @@
* _MSC_VER = 1400: Visual Studio 8
* _MSC_VER = 1500: Visual Studio 9.0
* _MSC_VER = 1600: Visual Studio 10.0
+ * _MSC_VER = 1800: Visual Studio 12.0
*/
/* Prevent pollution through excessive inclusion of include files by
@@ -145,13 +146,17 @@
/* #undef HAVE_FDATASYNC */
/* Define to 1 if you have the <fenv.h> header file. */
-/* #undef HAVE_FENV_H */
+#if _MSC_VER > 1600
+#define HAVE_FENV_H 1
+#endif
/* Define to 1 if you have the `fpclass' function. */
-#define HAVE_FPCLASS 1
+#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */
/* Define to 1 if you have the `fpclassify' function. */
-/* #undef HAVE_FPCLASSIFY */
+#if _MSC_VER > 1600
+#define HAVE_FPCLASSIFY 1
+#endif
/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
/* #undef HAVE_FSEEKO */
@@ -226,7 +231,9 @@
#define HAVE_IO_H 1
/* Define to 1 if you have the `isinf' function. */
-/* #undef HAVE_ISINF */
+#if _MSC_VER > 1600
+#define HAVE_ISINF 1
+#endif
/* Define that you want to build the jsonstore library */
/* #undef HAVE_JSONSTORE */
@@ -296,7 +303,9 @@
/* Define to 1 if you have the `llabs' function. */
#define HAVE_LLABS 1
+#if _MSC_VER <= 1500
#define llabs _abs64
+#endif
/* Define to 1 if you have the <locale.h> header file. */
#define HAVE_LOCALE_H 1
@@ -310,7 +319,7 @@
/* #undef HAVE_LOCKF */
/* Define to 1 if the system has the type `long long'. */
-#if defined(__ICL) && __ICL >= 1010
+#if _MSC_VER > 1600 || (defined(__ICL) && __ICL >= 1010)
#define HAVE_LONG_LONG 1
#else
#if _MSC_VER >= 1300
@@ -318,8 +327,6 @@
* format is interpreted the same as %ld, i.e. useless
*/
/* #define HAVE_LONG_LONG 1 */
-#else
-/* #undef HAVE_LONG_LONG */
#endif
#endif
@@ -368,6 +375,11 @@
/* Define to 1 if you have the `nl_langinfo' function. */
/* #undef HAVE_NL_LANGINFO */
+/* Define to 1 if you have the `nextafterf' function. */
+#if _MSC_VER > 1600
+#define HAVE_NEXTAFTERF 1
+#endif
+
/* Define to 1 if you have the `_NSGetExecutablePath' function. */
/* #undef HAVE__NSGETEXECUTABLEPATH */
@@ -442,7 +454,9 @@
/* #undef HAVE_RLIMIT_H */
/* Define to 1 if you have the `round' function. */
-/* #undef HAVE_ROUND */
+#if _MSC_VER > 1600
+#define HAVE_ROUND 1
+#endif
/* Define if you have the samtools (providing the bam library) */
/* #undef HAVE_SAMTOOLS */
@@ -511,7 +525,9 @@
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
-/* #undef HAVE_STDINT_H */
+#if _MSC_VER > 1600
+#define HAVE_STDINT_H 1
+#endif
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
@@ -526,7 +542,9 @@
/* #undef HAVE_STRCASESTR */
/* Define to 1 if you have the `strftime' function. */
-/* #undef HAVE_STRFTIME */
+#if _MSC_VER >= 1500
+#define HAVE_STRFTIME 1
+#endif
/* Define to 1 if you have the <strings.h> header file. */
/* #undef HAVE_STRINGS_H */
@@ -553,28 +571,26 @@
#define HAVE_STRTOD 1
/* Define to 1 if you have the `strtof' function. */
-/* #undef HAVE_STRTOF */
+#if _MSC_VER > 1600
+#define HAVE_STRTOF 1
+#endif
#define strtok_r(t,d,c) strtok_s(t,d,c)
/* Define to 1 if you have the `strtoll' function. */
#if _MSC_VER >= 1300
#define HAVE_STRTOLL 1
-#ifndef strtoll
+#if _MSC_VER <= 1600 && !defined(strtoll)
#define strtoll _strtoi64
#endif
-#else
-/* #undef HAVE_STRTOLL */
#endif
/* Define to 1 if you have the `strtoull' function. */
#if _MSC_VER >= 1300
#define HAVE_STRTOULL 1
-#ifndef strtoull
+#if _MSC_VER <= 1600 && !defined(strtoull)
#define strtoull _strtoui64
#endif
-#else
-/* #undef HAVE_STRTOULL */
#endif
/* Define if you have struct mallinfo */
@@ -649,7 +665,9 @@
#define HAVE_TIME_H 1
/* Define to 1 if you have the `trunc' function. */
-/* #undef HAVE_TRUNC */
+#if _MSC_VER > 1600
+#define HAVE_TRUNC 1
+#endif
/* Define to 1 if you have the `uname' function. */
/* #undef HAVE_UNAME */
@@ -682,7 +700,9 @@
#define HAVE_WINSOCK_H 1
/* Define to 1 if you have the <xmmintrin.h> header file. */
-/* #undef HAVE_XMMINTRIN_H */
+#if _MSC_VER > 1600
+#define HAVE_XMMINTRIN_H 1
+#endif
/* Define to 1 if the system has the type `_Bool'. */
/* #undef HAVE__BOOL */
@@ -990,8 +1010,10 @@
#define ssize_t int
#endif
+#if _MSC_VER <= 1600
/* no va_copy in win32 */
#define va_copy(x,y) ((x) = (y))
+#endif
typedef unsigned char uint8_t;
typedef unsigned short uint16_t;
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -47,7 +47,7 @@ MV=mv
$(RM) waiting
%.def: %.syms
- case `(uname -s) 2> /dev/null || echo unknown` in CYGWIN*) cat $<;; *)
grep -v DllMain $<;; esac > $@
+ case `(uname -s) 2> /dev/null || echo unknown` in CYGWIN*) cat $<;; *)
sed '/DllMain/d;s/=.*//' $<;; esac > $@
SUFFIXES-local: $(BUILT_SOURCES)
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -300,21 +300,21 @@ stable version (1.0.1j). Follow the ins
``enable-static-engine`` as described in the instructions.
.. The actual commands used were::
- perl Configure VC-WIN32 no-asm enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1b.win32
+ perl Configure VC-WIN32 no-asm enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1j.win32
ms\do_ms.bat
nmake /f ms\ntdll.mak
nmake /f ms\ntdll.mak install
and::
- perl Configure VC-WIN64A enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1b.win64
+ perl Configure VC-WIN64A enable-static-engine
--prefix=C:\Libraries\openssl-1.0.1j.win64
ms\do_win64a
nmake /f ms\ntdll.mak
nmake /f ms\ntdll.mak install
- For the debug versions, use debug-VC-WIN32 and debug-VC-WIN64A and
- edit the file ``ms/ntdll.mak`` to add a ``d`` to the definitions of
- ``O_SSL``, ``O_CRYPTO``, ``L_SSL``, and ``L_CRYPTO`` before
- building.
+ For the debug versions, use ``debug-VC-WIN32`` and
+ ``debug-VC-WIN64A`` and edit the file ``ms/ntdll.mak`` to add a
+ ``d`` to the definitions of ``O_SSL``, ``O_CRYPTO``, ``L_SSL``, and
+ ``L_CRYPTO`` before building.
-Fix the ``LIBOPENSSL`` definition in ``NT\winrules.msc`` so that it
+Fix the ``LIBOPENSSL`` definition in ``NT\rules.msc`` so that it
refers to the location where you installed the library and call
``nmake`` with the extra parameter ``HAVE_OPENSSL=1``.
@@ -328,7 +328,7 @@ Libxml2__ is the XML C parser and toolki
The home of the library is http://xmlsoft.org/. But Windows binaries
can be gotten from http://www.zlatkovic.com/libxml.en.html. Click on
Win32 Binaries on the right, and download libxml2, iconv, and zlib.
-Install these in e.g. ``C:\``.
+Install these in e.g. ``C:\Libraries``.
Note that we hit a bug in version 2.6.31 of libxml2. See the
bugreport__. Use version 2.6.30 or 2.6.32 or later.
@@ -339,10 +339,10 @@ optional prerequisites iconv_ and zlib_,
Run the following commands in the ``win32`` subfolder, substituting
the correct locations for the iconv and zlib libraries::
- cscript configure.js compiler=msvc prefix=C:\libxml2-2.7.8.win64 ^
- include=C:\iconv-1.11.win64\include;C:\zlib-1.2.5.win64\include ^
- lib=C:\iconv-1.11.win64\lib;C:\zlib-1.2.5.win64\lib iconv=yes zlib=yes ^
- vcmanifest=yes
+ cscript configure.js compiler=msvc prefix=C:\Libraries\libxml2-2.9.2.win64 ^
+
include=C:\Libraries\iconv-1.11.1.win64\include;C:\Libraries\zlib-1.2.8.win64\include
^
+ lib=C:\Libraries\iconv-1.11.1.win64\lib;C:\Libraries\zlib-1.2.8.win64\lib ^
+ iconv=yes zlib=yes vcmanifest=yes
nmake /f Makefile.msvc
nmake /f Makefile.msvc install
@@ -353,6 +353,9 @@ older compiler, remove the line that con
Visual Studio 2010 will give an error with this option, and Visual
Studio 2008 a warning.
+In the 2.9.2 there is another problem. In the ``win32\configure.js``
+file near the top, change ``configure.in`` to ``configure.ac``.
+
.. For a debug version, add ``debug=yes cruntime=/MDd`` to the
``cscript`` command and edit the file ``Makefile.msvc`` to add a
``d`` to the definitions of ``XML_SO``, ``XML_IMP``, ``XML_A``, and
@@ -407,7 +410,7 @@ in the instructions.
autogen.bat
nmake /f makefile.vc MSVC_VER=1600
-.. On Windows64, add WIN64=YES to the nmake command line.
+.. On Windows64, add ``WIN64=YES`` to the nmake command line.
.. For a debug build, add ``BUILD_DEBUG=YES`` to the ``nmake`` command
line.
@@ -436,18 +439,18 @@ of the ``OBJ`` macro and to the list of
command for ``$(CDLLNAME)`` in ``src\Makefile.vc``.
After this, install the library somewhere, e.g. in
-``C:\geos-3.4.2.win32``::
+``C:\Libraries\geos-3.4.2.win32``::
- mkdir C:\geos-3.4.2.win32
- mkdir C:\geos-3.4.2.win32\lib
- mkdir C:\geos-3.4.2.win32\bin
- mkdir C:\geos-3.4.2.win32\include
- mkdir C:\geos-3.4.2.win32\include\geos
- copy src\geos_c_i.lib C:\geos-3.4.2.win32\lib
- copy src\geos_c.dll C:\geos-3.4.2.win32\bin
- copy include C:\geos-3.4.2.win32\include
- copy include\geos C:\geos-3.4.2.win32\include\geos
- copy capi\geos_c.h C:\geos-3.4.2.win32\include
+ mkdir C:\Libraries\geos-3.4.2.win32
+ mkdir C:\Libraries\geos-3.4.2.win32\lib
+ mkdir C:\Libraries\geos-3.4.2.win32\bin
+ mkdir C:\Libraries\geos-3.4.2.win32\include
+ mkdir C:\Libraries\geos-3.4.2.win32\include\geos
+ copy src\geos_c_i.lib C:\Libraries\geos-3.4.2.win32\lib
+ copy src\geos_c.dll C:\Libraries\geos-3.4.2.win32\bin
+ copy include C:\Libraries\geos-3.4.2.win32\include
+ copy include\geos C:\Libraries\geos-3.4.2.win32\include\geos
+ copy capi\geos_c.h C:\Libraries\geos-3.4.2.win32\include
__ http://geos.refractions.net/
__ http://trac.osgeo.org/geos/wiki/BuildingOnWindowsWithNMake
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
