Changeset: bf1aadb3c5ee for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf1aadb3c5ee Modified Files: monetdb5/modules/mal/mal_mapi.c tools/Makefile.ag tools/embedded/build-rpkg.sh tools/embedded/windows/libtool.sh tools/embedded/windows/pmc.sh tools/embedded/windows/sedscript Branch: embedded Log Message:
Some more windows fixes diffs (117 lines): diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c --- a/monetdb5/modules/mal/mal_mapi.c +++ b/monetdb5/modules/mal/mal_mapi.c @@ -33,7 +33,9 @@ #include <sys/types.h> #include <stream_socket.h> #include <mapi.h> -#include <openssl/rand.h> /* RAND_bytes() */ +#ifdef HAVE_OPENSSL +# include <openssl/rand.h> /* RAND_bytes() */ +#endif #ifdef _WIN32 /* Windows specific */ # include <winsock.h> diff --git a/tools/Makefile.ag b/tools/Makefile.ag --- a/tools/Makefile.ag +++ b/tools/Makefile.ag @@ -4,4 +4,4 @@ # # Copyright 2008-2015 MonetDB B.V. -SUBDIRS = HAVE_MONETDB5?mserver NOT_WIN32?merovingian HAVE_EMBEDDED?embedded HAVE_EMBEDDED?embeddedpy +SUBDIRS = HAVE_MONETDB5?mserver NOT_WIN32?merovingian HAVE_EMBEDDED?embedded 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 @@ -17,10 +17,26 @@ echo "SUBDIRS = buildtools common client ./bootstrap # we need this directory since sql/server depends on it - cd .. mv sourcetree/tools/embedded/rpackage . rsync -av --exclude-from sourcetree/tools/embedded/pkg-excludes sourcetree/ rpackage/src + +# generate sql_parser.tab.c/h to remove our dependency on bison on Windows. +cd sourcetree +./configure +make sql/server/sql_parser.tab.h +make sql/server/sql_parser.tab.c +cd .. +cpsh +cp sourcetree/sql/server/sql_parser.tab.* rpackage/src/tools/embedded/windows/ + +# bundle pcre for windows (TODO: also iconv/zlib/ ...?) +wget http://dev.monetdb.org/downloads/Windows/Libraries/libs-win64.zip +umask 666 +unzip libs-win64.zip +umask 644 +cp -r pcre-8.37.win64 rpackage/src/tools/embedded/windows/ + mkdir -p rpackage/src/monetdb5/extras/rapi touch rpackage/src/monetdb5/extras/rapi/placeholder R CMD build rpackage diff --git a/tools/embedded/windows/libtool.sh b/tools/embedded/windows/libtool.sh --- a/tools/embedded/windows/libtool.sh +++ b/tools/embedded/windows/libtool.sh @@ -8,12 +8,17 @@ if [ "$1" = "--mode=link" ]; then i=1 out=1 j=$# - call="ar rvs" + call="ar rvsT" while [ $i -le $j ] do case "$1" in - -rpath) ;; + -rpath) + #shift # cough, cough + # TODO + ;; -version-info) ;; + -module) ;; + -avoid-version) ;; -D*) ;; -o) out=1 ;; *) @@ -30,4 +35,4 @@ else shift echo "$@" "$@" -fi +fi \ No newline at end of file diff --git a/tools/embedded/windows/pmc.sh b/tools/embedded/windows/pmc.sh --- a/tools/embedded/windows/pmc.sh +++ b/tools/embedded/windows/pmc.sh @@ -8,4 +8,5 @@ else find . -name "*.in" -type f -exec sh $0 {} \; fi touch config.status +cp tools/embedded/windows/sql_parser.tab.* sql/server/ # TODO: add source paths to sedscript diff --git a/tools/embedded/windows/sedscript b/tools/embedded/windows/sedscript --- a/tools/embedded/windows/sedscript +++ b/tools/embedded/windows/sedscript @@ -169,7 +169,7 @@ s|@PACKAGE_VERSION@|| s|@PATHSEP@|;| s|@PATH_SEPARATOR@|;| s|@pcreversion@|8.3.7| -s|@pcre_CFLAGS@|-I$(top_builddir)/../bundeled/libs-win64/pcre-8.37.win64/include| +s|@pcre_CFLAGS@|-I$(top_builddir)/tools/embedded/windows/pcre-8.37.win64/include| s|@pcre_LIBS@|| s|@pdfdir@|| s|@PERL@|| @@ -260,9 +260,9 @@ s|@target_os@|| s|@target_vendor@|| s|@thread_safe_flag_spec@|| s|@THREAD_SAVE_FLAGS@|| -s|@top_builddir@|c:/Users/Vanilla/MonetDB/src| +s|@top_builddir@|$(top_srcdir)| s|@top_build_prefix@|| -s|@top_srcdir@|c:/Users/Vanilla/MonetDB/src| +s|@top_srcdir@|c:/Users/Vanilla/MonetDB-2/src| s|@translatepath@|| s|@UUID_LIBS@|| s|@valgrind_CFLAGS@|| _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
