Changeset: e4c258720e4a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e4c258720e4a
Modified Files:
MonetDB4/src/modules/plain/ascii_io.mx
MonetDB4/src/monet/monet_client.mx
MonetDB4/src/tools/Makefile.ag
MonetDB4/src/tools/embeddedclient.h
MonetDB5/src/mal/mal_client.mx
MonetDB5/src/modules/mal/mal_mapi.mx
MonetDB5/src/modules/mal/remote.mx
MonetDB5/src/modules/mal/replication.mx
MonetDB5/src/modules/mal/tablet.mx
MonetDB5/src/optimizer/opt_tarantula.mx
MonetDB5/src/scheduler/run_octopus.mx
MonetDB5/src/scheduler/run_tarantula.mx
MonetDB5/src/tools/Makefile.ag
MonetDB5/src/tools/embeddedclient.h
clients/src/examples/C/Makefile.ag
clients/src/examples/C/sample0.c
clients/src/examples/C/sample1.c
clients/src/examples/C/sample2.c
clients/src/examples/C/sample3.c
clients/src/examples/C/sample4.c
clients/src/examples/C/smack00.c
clients/src/examples/C/smack01.c
clients/src/mapiclient/Makefile.ag
clients/src/mapiclient/ReadlineTools.c
clients/src/mapiclient/ReadlineTools.h
clients/src/mapiclient/dump.c
clients/src/mapiclient/mclient.c
clients/src/mapiclient/msqldump.c
clients/src/mapiclient/prompt.c
clients/src/mapiclient/stethoscope.c
clients/src/mapilib/Makefile.ag
clients/src/mapilib/Mapi.mx
clients/src/mapilib/Mapi.rc
clients/src/mapilib/mapi.mx
clients/src/mapilib/mapi.rc
clients/src/mapilib/monetdb-mapi.pc.in
clients/src/mapilib/tests/mapi_structs.h
clients/src/odbc/driver/Makefile.ag
clients/src/odbc/driver/ODBCDbc.h
clients/src/odbc/samples/Makefile.ag
clients/src/perl/Cimpl/Makefile.ag
clients/src/perl/Cimpl/MapiLib.pm.i
clients/src/php/Cimpl/Makefile.ag
clients/src/php/Cimpl/php_monetdb.h
gdk/Makefile.ag
gdk/monetdb-gdk.pc.in
pathfinder/src/tools/Makefile.ag
pathfinder/src/tools/embeddedclient.h
sql/src/backends/monet5/Makefile.ag
sql/src/backends/monet5/embeddedclient.h
sql/src/backends/monet5/merovingian/daemon/Makefile.ag
sql/src/backends/monet5/merovingian/daemon/multiplex-funnel.c
sql/src/backends/monet5/merovingian/daemon/multiplex-funnel.h
sql/src/server/sql_mvc.h
Branch: default
Log Message:
Mapi: rename to mapi
install as libmapi.soext in prefix/lib, headers in prefix/include/monetdb
diffs (truncated from 12006 to 300 lines):
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB4/src/modules/plain/ascii_io.mx
--- a/MonetDB4/src/modules/plain/ascii_io.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB4/src/modules/plain/ascii_io.mx Fri Jan 14 19:40:18 2011 +0100
@@ -306,7 +306,7 @@
#include "monetdb_config.h"
#include <gdk.h>
-#include <Mapi.h> /* for PROMPT2 */
+#include <mapi.h> /* for PROMPT2 */
#include "ascii_io.h"
#include <string.h>
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB4/src/monet/monet_client.mx
--- a/MonetDB4/src/monet/monet_client.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB4/src/monet/monet_client.mx Fri Jan 14 19:40:18 2011 +0100
@@ -104,7 +104,7 @@
@c
#include "monetdb_config.h"
#include "monet.h"
-#include <Mapi.h> /* for PROMPT1, PROMPT2 */
+#include <mapi.h> /* for PROMPT1, PROMPT2 */
#ifdef HAVE_SYS_SOCKET_H
# include <sys/socket.h>
#endif
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB4/src/tools/Makefile.ag
--- a/MonetDB4/src/tools/Makefile.ag Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB4/src/tools/Makefile.ag Fri Jan 14 19:40:18 2011 +0100
@@ -101,7 +101,7 @@
../monet/libmonet \
../../../gdk/libbat \
../../../common/options/libmoptions \
- ../../../clients/src/mapilib/libMapi \
+ ../../../clients/src/mapilib/libmapi \
../../../common/stream/libstream
}
@@ -112,7 +112,7 @@
../monet/libmonet \
../../../gdk/libbat \
../../../common/options/libmoptions \
- ../../../clients/src/mapilib/libMapi \
+ ../../../clients/src/mapilib/libmapi \
../../../common/stream/libstream
}
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB4/src/tools/embeddedclient.h
--- a/MonetDB4/src/tools/embeddedclient.h Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB4/src/tools/embeddedclient.h Fri Jan 14 19:40:18 2011 +0100
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <stream.h>
-#include <Mapi.h>
+#include <mapi.h>
#include <monet_options.h>
#ifdef __cplusplus
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/mal/mal_client.mx
--- a/MonetDB5/src/mal/mal_client.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/mal/mal_client.mx Fri Jan 14 19:40:18 2011 +0100
@@ -303,7 +303,7 @@
#include "mal_import.h"
#include "mal_parser.h"
#include "mal_namespace.h"
-#include <Mapi.h> /* for PROMPT1 */
+#include <mapi.h> /* for PROMPT1 */
/* This should be in src/mal/mal.h, as the function is implemented in
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/modules/mal/mal_mapi.mx
--- a/MonetDB5/src/modules/mal/mal_mapi.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/modules/mal/mal_mapi.mx Fri Jan 14 19:40:18 2011 +0100
@@ -338,7 +338,7 @@
#include "mal_mapi.h"
#include <sys/types.h>
#include <stream_socket.h>
-#include <Mapi.h>
+#include <mapi.h>
#ifdef _WIN32 /* Windows specific */
# include <winsock.h>
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/modules/mal/remote.mx
--- a/MonetDB5/src/modules/mal/remote.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/modules/mal/remote.mx Fri Jan 14 19:40:18 2011 +0100
@@ -159,7 +159,7 @@
#include <mal_interpreter.h>
#include <mal_function.h> /* for printFunction */
#include <mal_instruction.h> /* for getmodule/func macros */
-#include <Mapi.h>
+#include <mapi.h>
#include "remote.h" /* for the implementation of the functions */
#ifndef WIN32
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/modules/mal/replication.mx
--- a/MonetDB5/src/modules/mal/replication.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/modules/mal/replication.mx Fri Jan 14 19:40:18 2011 +0100
@@ -331,7 +331,7 @@
#include "mal_instruction.h"
#include "mal_interpreter.h"
#include "mal_namespace.h"
-#include <Mapi.h>
+#include <mapi.h>
#include "mtime.h"
/*#define _DEBUG_REPLICATION_ */
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/modules/mal/tablet.mx
--- a/MonetDB5/src/modules/mal/tablet.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/modules/mal/tablet.mx Fri Jan 14 19:40:18 2011 +0100
@@ -378,7 +378,7 @@
#include <mal_exception.h>
#include <mal_client.h>
#include <mal_interpreter.h>
-#include <Mapi.h> /* for PROMPT1, PROMPT2 */
+#include <mapi.h> /* for PROMPT1, PROMPT2 */
#include "histogram.h"
#ifdef WIN32
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/optimizer/opt_tarantula.mx
--- a/MonetDB5/src/optimizer/opt_tarantula.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/optimizer/opt_tarantula.mx Fri Jan 14 19:40:18 2011 +0100
@@ -243,7 +243,7 @@
#include "monetdb_config.h"
#include "mal_interpreter.h" /* for showErrors() */
#include "mal_builder.h"
-#include <Mapi.h>
+#include <mapi.h>
#include "remote.h"
#include "mal_sabaoth.h"
#include "opt_tarantula.h"
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/scheduler/run_octopus.mx
--- a/MonetDB5/src/scheduler/run_octopus.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/scheduler/run_octopus.mx Fri Jan 14 19:40:18 2011 +0100
@@ -117,7 +117,7 @@
#include "mat.h"
#include "run_octopus.h"
#include "optimizer.h"
-#include <Mapi.h>
+#include <mapi.h>
#include "remote.h"
#include "mal_sabaoth.h"
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/scheduler/run_tarantula.mx
--- a/MonetDB5/src/scheduler/run_tarantula.mx Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/scheduler/run_tarantula.mx Fri Jan 14 19:40:18 2011 +0100
@@ -79,7 +79,7 @@
#include "mat.h"
#include "run_tarantula.h"
#include "opt_tarantula.h"
-#include <Mapi.h>
+#include <mapi.h>
#include "remote.h"
#include "mal_sabaoth.h"
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/tools/Makefile.ag
--- a/MonetDB5/src/tools/Makefile.ag Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/tools/Makefile.ag Fri Jan 14 19:40:18 2011 +0100
@@ -36,7 +36,7 @@
../../../common/options/libmoptions \
../../../gdk/libbat \
../../../common/stream/libstream \
- ../../../clients/src/mapilib/libMapi $(curl_LIBS) \
+ ../../../clients/src/mapilib/libmapi $(curl_LIBS) \
$(MATH_LIBS) $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) \
$(DL_LIBS) $(READLINE_LIBS) $(openssl_LIBS) $(pcre_LIBS) \
$(LTLIBICONV) $(zlib_LIBS)
@@ -58,7 +58,7 @@
../../../common/options/libmoptions \
../../../gdk/libbat \
../../../common/stream/libstream \
- ../../../clients/src/mapilib/libMapi $(curl_LIBS) \
+ ../../../clients/src/mapilib/libmapi $(curl_LIBS) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
@@ -68,7 +68,7 @@
../../../common/options/libmoptions \
../../../gdk/libbat \
../../../common/stream/libstream \
- ../../../clients/src/mapilib/libMapi $(curl_LIBS) \
+ ../../../clients/src/mapilib/libmapi $(curl_LIBS) \
$(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS)
}
diff -r e6a76a9ce6bb -r e4c258720e4a MonetDB5/src/tools/embeddedclient.h
--- a/MonetDB5/src/tools/embeddedclient.h Fri Jan 14 18:16:33 2011 +0100
+++ b/MonetDB5/src/tools/embeddedclient.h Fri Jan 14 19:40:18 2011 +0100
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <stream.h>
-#include <Mapi.h>
+#include <mapi.h>
#include <monet_options.h>
#ifdef __cplusplus
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/Makefile.ag
--- a/clients/src/examples/C/Makefile.ag Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/Makefile.ag Fri Jan 14 19:40:18 2011 +0100
@@ -16,7 +16,7 @@
# All Rights Reserved.
MTSAFE
-INCLUDES = ../.. ../../../../common/options $(READLINE_INCS)
+INCLUDES = ../../mapilib ../../../../common/options $(READLINE_INCS)
MAPI_LIBS = $(SOCKET_LIBS)
@@ -24,7 +24,7 @@
DIR = libdir/MonetDB/Tests
SOURCES = sample0.c sample1.c sample2.c sample3.c sample4.c \
smack00.c smack01.c
- LIBS = $(MAPI_LIBS) ../../mapilib/libMapi \
+ LIBS = $(MAPI_LIBS) ../../mapilib/libmapi \
../../../../common/options/libmoptions \
$(curl_LIBS)
}
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/sample0.c
--- a/clients/src/examples/C/sample0.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/sample0.c Fri Jan 14 19:40:18 2011 +0100
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#define die(dbh,hdl) do { \
if (hdl) \
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/sample1.c
--- a/clients/src/examples/C/sample1.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/sample1.c Fri Jan 14 19:40:18 2011 +0100
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#define die(dbh,hdl) do { \
if (hdl) \
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/sample2.c
--- a/clients/src/examples/C/sample2.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/sample2.c Fri Jan 14 19:40:18 2011 +0100
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#define die(dbh,hdl) do { \
if (hdl) \
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/sample3.c
--- a/clients/src/examples/C/sample3.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/sample3.c Fri Jan 14 19:40:18 2011 +0100
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#ifdef _MSC_VER
#define LLFMT "%I64d"
#else
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/sample4.c
--- a/clients/src/examples/C/sample4.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/sample4.c Fri Jan 14 19:40:18 2011 +0100
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#ifdef _MSC_VER
#define LLFMT "%I64d"
#else
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/smack00.c
--- a/clients/src/examples/C/smack00.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/smack00.c Fri Jan 14 19:40:18 2011 +0100
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#ifdef _MSC_VER
#define snprintf _snprintf
diff -r e6a76a9ce6bb -r e4c258720e4a clients/src/examples/C/smack01.c
--- a/clients/src/examples/C/smack01.c Fri Jan 14 18:16:33 2011 +0100
+++ b/clients/src/examples/C/smack01.c Fri Jan 14 19:40:18 2011 +0100
@@ -25,7 +25,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
-#include <mapilib/Mapi.h>
+#include <mapi.h>
#ifdef _MSC_VER
#define snprintf _snprintf
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
