Changeset: 45de46c451cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=45de46c451cc
Modified Files:
NT/Makefile
NT/monetdb_config.h.in
NT/rules.msc
buildtools/autogen/autogen/msc.py
buildtools/doc/windowsbuild.rst
clients/mapiclient/mclient.c
clients/odbc/winsetup/Makefile.ag
gdk/gdk_utils.c
monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
sql/server/sql_symbol.c
Branch: Jul2015
Log Message:
Ported to Visual Studio 2015 RC.
diffs (160 lines):
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -25,7 +25,6 @@ install: targetdirs all
$(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
$(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
- if not exist "C:\Program Files (x86)\Microsoft Visual Studio 10.0" if
not exist "C:\Program Files\Microsoft Visual Studio 10.0" cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Format Version 11.00/Format Version
10.00/;s/Visual Studio 2010/Visual Studio
2008/;s/-vs10//;s/_VC100_CRT_x64/_VC90_CRT_x86_x64/;s/_VC100_/_VC90_/" *.vdproj
*.sln
$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
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
@@ -16,6 +16,7 @@
* _MSC_VER = 1500: Visual Studio 9.0
* _MSC_VER = 1600: Visual Studio 10.0
* _MSC_VER = 1800: Visual Studio 12.0
+ * _MSC_VER = 1900: Visual Studio 14.0
*/
#ifndef _SEEN_MONETDB_CONFIG_H
@@ -993,9 +994,11 @@
/* Define to `unsigned int' if <sys/types.h> does not define. */
/* #undef size_t */
+#if _MSC_VER < 1900
#ifndef snprintf
#define snprintf _snprintf
#endif
+#endif
/* type used by connect */
#define socklen_t int
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -66,7 +66,7 @@ PTHREAD_INCS =
PTHREAD_LIBS =
!ENDIF
-ODBCINST_LIBS = odbccp32.lib user32.lib
+ODBCINST_LIBS = odbccp32.lib user32.lib $(LEGACY_STDIO_DEFINITIONS)
ODBC_LIBS = odbc32.lib
!IFNDEF PYTHON2BASE
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
@@ -229,7 +229,7 @@ def msc_additional_libs(fd, name, sep, t
if l == "@LIBOBJS@":
l = "$(LIBOBJS)"
# special case (hack) for system libraries
- elif l in ('-lodbc32', '-lodbccp32', '-lversion', '-lshlwapi',
'-luser32'):
+ elif l in ('-lodbc32', '-lodbccp32', '-lversion', '-lshlwapi',
'-luser32', '-llegacy_stdio_definitions'):
l = l[2:] + '.lib'
elif l[:2] == "-l":
l = "lib"+l[2:]+".lib"
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -313,17 +313,17 @@ required for the MonetDB5 component, and
the clients component when it needs to talk to a MonetDB5 server.
Download the source from http://www.openssl.org/. We used the latest
-stable version (1.0.2a). Follow the instructions in the file
+stable version (1.0.2c). Follow the instructions in the file
``INSTALL.W32`` or ``INSTALL.W64``. We used the option
``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.2a.win32
+ perl Configure VC-WIN32 no-asm enable-static-engine
--prefix=C:\Libraries\openssl-1.0.2c.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.2a.win64
+ perl Configure VC-WIN64A enable-static-engine
--prefix=C:\Libraries\openssl-1.0.2c.win64
ms\do_win64a.bat
nmake /f ms\ntdll.mak
nmake /f ms\ntdll.mak install
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1507,7 +1507,7 @@ setFormatter(const char *s)
free(separator);
separator = NULL;
csvheader = 0;
-#ifdef WIN32
+#ifdef _TWO_DIGIT_EXPONENT
if (formatter == TESTformatter)
_set_output_format(0);
#endif
@@ -1543,7 +1543,7 @@ setFormatter(const char *s)
} else if (strcmp(s, "xml") == 0) {
formatter = XMLformatter;
} else if (strcmp(s, "test") == 0) {
-#ifdef WIN32
+#ifdef _TWO_DIGIT_EXPONENT
_set_output_format(_TWO_DIGIT_EXPONENT);
#endif
formatter = TESTformatter;
diff --git a/clients/odbc/winsetup/Makefile.ag
b/clients/odbc/winsetup/Makefile.ag
--- a/clients/odbc/winsetup/Makefile.ag
+++ b/clients/odbc/winsetup/Makefile.ag
@@ -11,16 +11,16 @@ INCLUDES = \
$(ODBC_INCS)
DEFS = @DEFS@
-ODBCLIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
+ODBCLIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
$(LEGACY_STDIO_DEFINITIONS)
lib_MonetODBCs = {
SOURCES = setup.c setup.rc setup.syms resource.h
- LIBS = -lodbccp32 -luser32
+ LIBS = -lodbccp32 -luser32 $(LEGACY_STDIO_DEFINITIONS)
}
bin_odbcinstall = {
SOURCES = install.c
- LIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
+ LIBS = -lodbc32 -lodbccp32 -lversion -lshlwapi -luser32
$(LEGACY_STDIO_DEFINITIONS)
}
EXTRA_DIST = banner.bmp
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1621,6 +1621,9 @@ THRget(int tid)
return (GDKthreads + tid - 1);
}
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+#pragma warning(disable : 4172)
+#endif
static inline size_t
THRsp(void)
{
diff --git a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
b/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
--- a/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
+++ b/monetdb5/tests/mapi/Tests/perl_dbi.MAL.bat
@@ -3,4 +3,4 @@
prompt # $t $g
echo on
-malsample.pl %MAPIPORT% %TSTDB%
+perl malsample.pl %MAPIPORT% %TSTDB%
diff --git a/sql/server/sql_symbol.c b/sql/server/sql_symbol.c
--- a/sql/server/sql_symbol.c
+++ b/sql/server/sql_symbol.c
@@ -44,7 +44,7 @@ symbol_create_list(sql_allocator *sa, in
symbol_init(s, token, type_list);
s->data.lval = data;
if (symbol_debug)
- fprintf(stderr, "" PTRFMT " =
symbol_create_list(%s,%ld)\n", PTRFMTCAST s, token2string(s->token), (long)
s->data.lval);
+ fprintf(stderr, "" PTRFMT " = symbol_create_list(%s,"
PTRFMT ")\n", PTRFMTCAST s, token2string(s->token), PTRFMTCAST s->data.lval);
}
return s;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
