Changeset: ca76a7ecb361 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ca76a7ecb361 Removed Files: tools/embedded/windows/monetdb_config.h.in Modified Files: NT/monetdb_config.h.in tools/embedded/build-rpkg.sh tools/embedded/windows/sedscript.tpl Branch: embedded Log Message:
configure updates for windows diffs (truncated from 1190 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 @@ -22,12 +22,6 @@ #ifndef _SEEN_MONETDB_CONFIG_H #define _SEEN_MONETDB_CONFIG_H 1 -#ifdef __MINGW32__ -/* for now, compiling with mingw implies we're compiling for embedded */ -#define HAVE_EMBEDDED 1 -#define HAVE_EMBEDDED_R 1 -#endif - /* Prevent pollution through excessive inclusion of include files by * Windows.h. */ #ifndef WIN32_LEAN_AND_MEAN @@ -1137,4 +1131,9 @@ typedef __uint128_t uhge; #define PTRFMT "%p" #define PTRFMTCAST +#ifdef HAVE_EMBEDDED_R +#define _MSC_EXTENSIONS 1 +#undef HAVE_CTIME_R +#endif + #endif /* _SEEN_MONETDB_CONFIG_H */ diff --git a/tools/embedded/build-rpkg.sh b/tools/embedded/build-rpkg.sh --- a/tools/embedded/build-rpkg.sh +++ b/tools/embedded/build-rpkg.sh @@ -38,7 +38,7 @@ cp sourcetree/NT/monetdb_config.h.in rpa export R_INCLUDE_DIR=`R CMD config --cppflags | sed s/^-I//` -# # inline mal/sql scripts, we need R with the stringr package for that +# # inline mal/sql scripts # python sourcetree/tools/embedded/inline.py dummytarget/libs/monetdb5/ rpackage/src/monetdb5/mal/mal_init_inline.h mkdir -p rpackage/src/monetdb5/extras/rapi diff --git a/tools/embedded/windows/monetdb_config.h.in b/tools/embedded/windows/monetdb_config.h.in deleted file mode 100644 --- a/tools/embedded/windows/monetdb_config.h.in +++ /dev/null @@ -1,1135 +0,0 @@ -/* - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * Copyright 2008-2015 MonetDB B.V. - */ - -/* Manual config.h. needed for win32 . */ - -/* We use the value of _MSC_VER to distinguish the various versions of - * Microsoft Visual Studio: - * _MSC_VER = 1200: Visual Studio 6 - * _MSC_VER = 1310: Visual Studio .NET 2003 (a.k.a. Visual Studio 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 - * _MSC_VER = 1900: Visual Studio 14.0 - */ - -#ifndef _SEEN_MONETDB_CONFIG_H -#define _SEEN_MONETDB_CONFIG_H 1 - -#define HAVE_EMBEDDED 1 -#define HAVE_EMBEDDED_R 1 - -/* Prevent pollution through excessive inclusion of include files by - * Windows.h. */ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif - -/* Visual Studio 8 has deprecated lots of stuff: suppress warnings */ -#ifndef _CRT_SECURE_NO_DEPRECATE -#define _CRT_SECURE_NO_DEPRECATE 1 -#endif - -#include <malloc.h> - -#if defined(_DEBUG) && defined(_CRTDBG_MAP_ALLOC) -/* In this case, malloc and friends are redefined in crtdbg.h to debug - versions. We need to include stdlib.h and malloc.h first or else - we get conflicting declarations. -*/ -#include <stdlib.h> -#include <crtdbg.h> -#endif - -#include <process.h> -#include <windows.h> -#include <stddef.h> -#include <ws2tcpip.h> - -#include <sys/types.h> -#include <stdio.h> /* NULL, printf etc. */ -#include <stdlib.h> -#include <errno.h> -#include <stdarg.h> /* va_alist.. */ - -#include <assert.h> - -#define _MSC_EXTENSIONS 1 - -/* indicate to sqltypes.h that windows.h has already been included and - that it doesn't have to define Windows constants */ -#define ALREADY_HAVE_WINDOWS_TYPE 1 - -#define NATIVE_WIN32 1 - -/* Define if building universal (internal helper macro) */ -/* #undef AC_APPLE_UNIVERSAL_BUILD */ - -/* location where binaries are installed */ -/* #undef BINDIR */ - -#define BINDIR "foo" -// TODO: fixme - -/* read-only architecture-independent data */ -#define DATA_DIR PREFIX "\\share" - -/* Directory separator */ -#define DIR_SEP '\\' - -/* Directory separator */ -#define DIR_SEP_STR "\\" - -/* architecture-dependent files */ -#define EXEC_PREFIX PREFIX - -/* Define to 1 if you have the `asctime_r' function. */ -#define HAVE_ASCTIME_R 1 - -/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */ -#define HAVE_ASCTIME_R3 1 -/* there is something very similar to asctime_r on Windows: */ -#define asctime_r(t,b,s) asctime_s(b,s,t) - -/* Define to nothing if C supports flexible array members, and to 1 if it does - not. That way, with a declaration like `struct s { int n; double - d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99 - compilers. When computing the size of such an object, don't use 'sizeof - (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)' - instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with - MSVC and with C++ compilers. */ -#define FLEXIBLE_ARRAY_MEMBER - -/* If the console should be used */ -#define HAVE_CONSOLE 1 - -/* crypt */ -/* #undef HAVE_CRYPT */ - -/* Define to 1 if you have the <crypt.h> header file. */ -/* #undef HAVE_CRYPT_H */ - -/* Define to 1 if you have the `ctime_r' function. */ -//#define HAVE_CTIME_R 1 - -/* Define if you have ctime_r(time_t*,char *buf,size_t s) */ -//#define HAVE_CTIME_R3 1 -/* there is something very similar to ctime_r on Windows: */ -//#define ctime_r(t,b,s) (ctime_s(b,s,t) ? NULL : (b)) - -/* Define if you have the cURL library */ -/* #undef HAVE_CURL */ - -/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. - */ -/* #undef HAVE_DIRENT_H */ - -/* Define to 1 if you have the <dlfcn.h> header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the <execinfo.h> header file. */ -/* #undef HAVE_EXECINFO_H */ - -/* Define to 1 if you have the `fabsf' function. */ -#define HAVE_FABSF 1 - -/* Define to 1 if you have the `fallocate' function. */ -/* #undef HAVE_FALLOCATE */ - -/* Define to 1 if you have the `fcntl' function. */ -/* #undef HAVE_FCNTL */ - -/* Define to 1 if you have the <fcntl.h> header file. */ -#define HAVE_FCNTL_H 1 - -/* If the system has a working fdatasync */ -/* #undef HAVE_FDATASYNC */ - -/* Define to 1 if you have the <fenv.h> header file. */ -#if _MSC_VER > 1600 -#define HAVE_FENV_H 1 -#endif - -/* Define if the fits module is to be enabled */ -/* #undef HAVE_FITS */ - -/* Define to 1 if you have the `fpclass' function. */ -#define HAVE_FPCLASS 1 /* uses _fpclass, see mmath.c */ - -/* Define to 1 if you have the `fpclassify' function. */ -#if _MSC_VER > 1600 -#define HAVE_FPCLASSIFY 1 -#endif - -/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -/* #undef HAVE_FSEEKO */ - -/* Define to 1 if you have the `fsync' function. */ -/* #undef HAVE_FSYNC */ - -/* Define to 1 if you have the `ftime' function. */ -#define HAVE_FTIME 1 - -/* Define to 1 if you have the `ftruncate' function. */ -#define HAVE_FTRUNCATE 1 -//#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0)) - -/* Define if you use garbage collection */ -/* #undef HAVE_GC */ - -/* Define to 1 if you have the <geos_c.h> header file. */ -/* #undef HAVE_GEOS_C_H */ - -/* Define to 1 if you have the `getaddrinfo' function. */ -#define HAVE_GETADDRINFO 1 - -/* Define to 1 if you have the `getexecname' function. */ -/* #undef HAVE_GETEXECNAME */ - -/* Define to 1 if you have the `getlogin' function. */ -/* #undef HAVE_GETLOGIN */ - -/* Define to 1 if you have the `getopt' function. */ -/* #undef HAVE_GETOPT */ - -/* Define to 1 if you have the <getopt.h> header file. */ -/* #undef HAVE_GETOPT_H */ - -/* Define to 1 if you have the `getopt_long' function. */ -/* #undef HAVE_GETOPT_LONG */ - -/* Define to 1 if you have the `getrlimit' function. */ -/* #undef HAVE_GETRLIMIT */ - -/* Define to 1 if you have the `GetSystemInfo' function. */ -/* #undef HAVE_GETSYSTEMINFO */ - -/* Define to 1 if you have the `gettimeofday' function. */ -/* #undef HAVE_GETTIMEOFDAY */ - -/* Define if you have the gsl library */ -/* #undef HAVE_GSL */ - -/* Define to 1 if you have the `getuid' function. */ -/* #undef HAVE_GETUID */ - -/* Define if you have the iconv() function and it works. */ -/* #undef HAVE_ICONV */ /* optionally defined in rules.msc */ - -/* Define to 1 if you have the <iconv.h> header file. */ -#ifdef HAVE_ICONV -#define HAVE_ICONV_H 1 -#endif - -/* Define to 1 if you have the <ieeefp.h> header file. */ -/* #undef HAVE_IEEEFP_H */ - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 /* generated by the Makefile */ - -/* Define to 1 if you have the <io.h> header file. */ -#define HAVE_IO_H 1 - -/* Define to 1 if you have the `isinf' function. */ -#if _MSC_VER > 1600 -#define HAVE_ISINF 1 -#endif - -/* Define to 1 if you have the `kill' function. */ -/* #undef HAVE_KILL */ - -/* Define to 1 if you have the <kvm.h> header file. */ -/* #undef HAVE_KVM_H */ - -/* Define to 1 if you have the <langinfo.h> header file. */ -/* #undef HAVE_LANGINFO_H */ - -/* Define if you have the atomic_ops library */ -/* #undef HAVE_LIBATOMIC_OPS */ - -/* Define if you have the bz2 library */ -/* #undef HAVE_LIBBZ2 */ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
