Changeset: 5cd130fceba2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5cd130fceba2
Modified Files:
Makefile.ag
monetdb5/tools/Makefile.ag
monetdb5/tools/monet_version.c.in
monetdb5/tools/monet_version.h
monetdb5/tools/mserver5.mx
sql/backends/monet5/Makefile.ag
sql/backends/monet5/merovingian/ChangeLog
sql/backends/monet5/merovingian/ChangeLog-Archive
sql/backends/monet5/merovingian/ChangeLog.Jun2010
sql/backends/monet5/merovingian/ChangeLog.Oct2010
sql/backends/monet5/merovingian/Makefile.ag
sql/backends/monet5/merovingian/client/Makefile.ag
sql/backends/monet5/merovingian/client/monetdb.1.in
sql/backends/monet5/merovingian/client/monetdb.c
sql/backends/monet5/merovingian/daemon/Makefile.ag
sql/backends/monet5/merovingian/daemon/client.c
sql/backends/monet5/merovingian/daemon/client.h
sql/backends/monet5/merovingian/daemon/connections.c
sql/backends/monet5/merovingian/daemon/connections.h
sql/backends/monet5/merovingian/daemon/controlrunner.c
sql/backends/monet5/merovingian/daemon/controlrunner.h
sql/backends/monet5/merovingian/daemon/discoveryrunner.c
sql/backends/monet5/merovingian/daemon/discoveryrunner.h
sql/backends/monet5/merovingian/daemon/forkmserver.c
sql/backends/monet5/merovingian/daemon/forkmserver.h
sql/backends/monet5/merovingian/daemon/handlers.c
sql/backends/monet5/merovingian/daemon/handlers.h
sql/backends/monet5/merovingian/daemon/merovingian.c
sql/backends/monet5/merovingian/daemon/merovingian.h
sql/backends/monet5/merovingian/daemon/monetdbd.1.in
sql/backends/monet5/merovingian/daemon/multiplex-funnel.c
sql/backends/monet5/merovingian/daemon/multiplex-funnel.h
sql/backends/monet5/merovingian/daemon/peering.c
sql/backends/monet5/merovingian/daemon/peering.h
sql/backends/monet5/merovingian/daemon/proxy.c
sql/backends/monet5/merovingian/daemon/proxy.h
sql/backends/monet5/merovingian/utils/Makefile.ag
sql/backends/monet5/merovingian/utils/control.c
sql/backends/monet5/merovingian/utils/control.h
sql/backends/monet5/merovingian/utils/database.c
sql/backends/monet5/merovingian/utils/database.h
sql/backends/monet5/merovingian/utils/glob.c
sql/backends/monet5/merovingian/utils/glob.h
sql/backends/monet5/merovingian/utils/properties.c
sql/backends/monet5/merovingian/utils/properties.h
sql/backends/monet5/merovingian/utils/utils.c
sql/backends/monet5/merovingian/utils/utils.h
tools/Makefile.ag
tools/merovingian/ChangeLog
tools/merovingian/ChangeLog-Archive
tools/merovingian/ChangeLog.Jun2010
tools/merovingian/ChangeLog.Oct2010
tools/merovingian/Makefile.ag
tools/merovingian/client/Makefile.ag
tools/merovingian/client/monetdb.1.in
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/Makefile.ag
tools/merovingian/daemon/client.c
tools/merovingian/daemon/client.h
tools/merovingian/daemon/connections.c
tools/merovingian/daemon/connections.h
tools/merovingian/daemon/controlrunner.c
tools/merovingian/daemon/controlrunner.h
tools/merovingian/daemon/discoveryrunner.c
tools/merovingian/daemon/discoveryrunner.h
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/forkmserver.h
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/handlers.h
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/merovingian.h
tools/merovingian/daemon/monetdbd.1.in
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/daemon/multiplex-funnel.h
tools/merovingian/daemon/peering.c
tools/merovingian/daemon/peering.h
tools/merovingian/daemon/proxy.c
tools/merovingian/daemon/proxy.h
tools/merovingian/utils/Makefile.ag
tools/merovingian/utils/control.c
tools/merovingian/utils/control.h
tools/merovingian/utils/database.c
tools/merovingian/utils/database.h
tools/merovingian/utils/glob.c
tools/merovingian/utils/glob.h
tools/merovingian/utils/properties.c
tools/merovingian/utils/properties.h
tools/merovingian/utils/utils.c
tools/merovingian/utils/utils.h
tools/mserver/Makefile.ag
tools/mserver/monet_version.c.in
tools/mserver/monet_version.h
tools/mserver/mserver5.mx
Branch: default
Log Message:
create top-level directory 'tools'
moved mserver5 and merovingian inside these
diffs (truncated from 316 to 300 lines):
diff --git a/Makefile.ag b/Makefile.ag
--- a/Makefile.ag
+++ b/Makefile.ag
@@ -21,6 +21,7 @@
HAVE_SQL?sql \
HAVE_GEOM?geom \
HAVE_PATHFINDER?pathfinder \
+ tools \
HAVE_JAVA?java \
HAVE_TESTING?testing \
diff --git a/monetdb5/tools/Makefile.ag b/monetdb5/tools/Makefile.ag
--- a/monetdb5/tools/Makefile.ag
+++ b/monetdb5/tools/Makefile.ag
@@ -42,12 +42,4 @@
$(LTLIBICONV) $(zlib_LIBS)
}
-bin_mserver5 = {
- SOURCES = mserver5.mx monet_version.h monet_version.c.in
- LIBS = libmonetdb5 @SHARED_LIBS@ \
- ../../gdk/libbat \
- $(SOCKET_LIBS) $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) \
- $(curl_LIBS) $(pcre_LIBS) $(openssl_LIBS)
-}
-
EXTRA_DIST_DIR = Tests
diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -15,7 +15,7 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = NOT_WIN32?merovingian NOT_WIN32?vaults
+SUBDIRS = NOT_WIN32?vaults
# force sql.o to not depend on .../rdf/rdf.h since it only optionally created
RDF_INC = -I../../../monetdb5/extras/rdf
diff --git a/tools/Makefile.ag b/tools/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/tools/Makefile.ag
@@ -0,0 +1,18 @@
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+# Copyright August 2008-2011 MonetDB B.V.
+# All Rights Reserved.
+
+SUBDIRS = HAVE_MONETDB5?mserver HAVE_MONETDB5?merovingian
diff --git a/sql/backends/monet5/merovingian/ChangeLog
b/tools/merovingian/ChangeLog
rename from sql/backends/monet5/merovingian/ChangeLog
rename to tools/merovingian/ChangeLog
diff --git a/sql/backends/monet5/merovingian/ChangeLog-Archive
b/tools/merovingian/ChangeLog-Archive
rename from sql/backends/monet5/merovingian/ChangeLog-Archive
rename to tools/merovingian/ChangeLog-Archive
diff --git a/sql/backends/monet5/merovingian/ChangeLog.Jun2010
b/tools/merovingian/ChangeLog.Jun2010
rename from sql/backends/monet5/merovingian/ChangeLog.Jun2010
rename to tools/merovingian/ChangeLog.Jun2010
diff --git a/sql/backends/monet5/merovingian/ChangeLog.Oct2010
b/tools/merovingian/ChangeLog.Oct2010
rename from sql/backends/monet5/merovingian/ChangeLog.Oct2010
rename to tools/merovingian/ChangeLog.Oct2010
diff --git a/sql/backends/monet5/merovingian/Makefile.ag
b/tools/merovingian/Makefile.ag
rename from sql/backends/monet5/merovingian/Makefile.ag
rename to tools/merovingian/Makefile.ag
--- a/sql/backends/monet5/merovingian/Makefile.ag
+++ b/tools/merovingian/Makefile.ag
@@ -15,4 +15,4 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = utils client daemon
+SUBDIRS = NOT_WIN32?utils NOT_WIN32?client NOT_WIN32?daemon
diff --git a/sql/backends/monet5/merovingian/client/Makefile.ag
b/tools/merovingian/client/Makefile.ag
rename from sql/backends/monet5/merovingian/client/Makefile.ag
rename to tools/merovingian/client/Makefile.ag
--- a/sql/backends/monet5/merovingian/client/Makefile.ag
+++ b/tools/merovingian/client/Makefile.ag
@@ -19,9 +19,9 @@
# MONETDB5: Sabaoth
# COMMON: stream
-INCLUDES = ../../../../../monetdb5/misc \
- ../../../../../common/stream \
- ../../../../../common/utils \
+INCLUDES = ../../../monetdb5/misc \
+ ../../../common/stream \
+ ../../../common/utils \
../utils
EXTRA_DIST = $(man_MANS)
@@ -30,9 +30,9 @@
# hack: include monetdb.1.in here to get it expanded
SOURCES = monetdb.c monetdb.1.in
LIBS = ../utils/libmeroutil \
- ../../../../../monetdb5/misc/libsabaoth \
- ../../../../../common/stream/libstream \
- ../../../../../common/utils/libmutils \
+ ../../../monetdb5/misc/libsabaoth \
+ ../../../common/stream/libstream \
+ ../../../common/utils/libmutils \
$(UUID_LIBS) \
$(curl_LIBS) \
$(SOCKET_LIBS) \
diff --git a/sql/backends/monet5/merovingian/client/monetdb.1.in
b/tools/merovingian/client/monetdb.1.in
rename from sql/backends/monet5/merovingian/client/monetdb.1.in
rename to tools/merovingian/client/monetdb.1.in
diff --git a/sql/backends/monet5/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
rename from sql/backends/monet5/merovingian/client/monetdb.c
rename to tools/merovingian/client/monetdb.c
diff --git a/sql/backends/monet5/merovingian/daemon/Makefile.ag
b/tools/merovingian/daemon/Makefile.ag
rename from sql/backends/monet5/merovingian/daemon/Makefile.ag
rename to tools/merovingian/daemon/Makefile.ag
--- a/sql/backends/monet5/merovingian/daemon/Makefile.ag
+++ b/tools/merovingian/daemon/Makefile.ag
@@ -19,10 +19,10 @@
# MONETDB5: Sabaoth
INCLUDES = .. \
- ../../../../../monetdb5/misc \
- ../../../../../common/stream \
- ../../../../../common/utils \
- ../../../../../clients/mapilib
+ ../../../monetdb5/misc \
+ ../../../common/stream \
+ ../../../common/utils \
+ ../../../clients/mapilib
EXTRA_DIST = $(man_MANS) \
merovingian.h \
@@ -50,10 +50,10 @@
peering.c \
proxy.c
LIBS = ../utils/libmeroutil \
- ../../../../../monetdb5/misc/libsabaoth \
- ../../../../../common/stream/libstream \
- ../../../../../clients/mapilib/libmapi \
- ../../../../../common/utils/libmutils \
+ ../../../monetdb5/misc/libsabaoth \
+ ../../../common/stream/libstream \
+ ../../../clients/mapilib/libmapi \
+ ../../../common/utils/libmutils \
$(UUID_LIBS) \
$(curl_LIBS) \
$(SOCKET_LIBS) \
diff --git a/sql/backends/monet5/merovingian/daemon/client.c
b/tools/merovingian/daemon/client.c
rename from sql/backends/monet5/merovingian/daemon/client.c
rename to tools/merovingian/daemon/client.c
diff --git a/sql/backends/monet5/merovingian/daemon/client.h
b/tools/merovingian/daemon/client.h
rename from sql/backends/monet5/merovingian/daemon/client.h
rename to tools/merovingian/daemon/client.h
diff --git a/sql/backends/monet5/merovingian/daemon/connections.c
b/tools/merovingian/daemon/connections.c
rename from sql/backends/monet5/merovingian/daemon/connections.c
rename to tools/merovingian/daemon/connections.c
diff --git a/sql/backends/monet5/merovingian/daemon/connections.h
b/tools/merovingian/daemon/connections.h
rename from sql/backends/monet5/merovingian/daemon/connections.h
rename to tools/merovingian/daemon/connections.h
diff --git a/sql/backends/monet5/merovingian/daemon/controlrunner.c
b/tools/merovingian/daemon/controlrunner.c
rename from sql/backends/monet5/merovingian/daemon/controlrunner.c
rename to tools/merovingian/daemon/controlrunner.c
diff --git a/sql/backends/monet5/merovingian/daemon/controlrunner.h
b/tools/merovingian/daemon/controlrunner.h
rename from sql/backends/monet5/merovingian/daemon/controlrunner.h
rename to tools/merovingian/daemon/controlrunner.h
diff --git a/sql/backends/monet5/merovingian/daemon/discoveryrunner.c
b/tools/merovingian/daemon/discoveryrunner.c
rename from sql/backends/monet5/merovingian/daemon/discoveryrunner.c
rename to tools/merovingian/daemon/discoveryrunner.c
diff --git a/sql/backends/monet5/merovingian/daemon/discoveryrunner.h
b/tools/merovingian/daemon/discoveryrunner.h
rename from sql/backends/monet5/merovingian/daemon/discoveryrunner.h
rename to tools/merovingian/daemon/discoveryrunner.h
diff --git a/sql/backends/monet5/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
rename from sql/backends/monet5/merovingian/daemon/forkmserver.c
rename to tools/merovingian/daemon/forkmserver.c
diff --git a/sql/backends/monet5/merovingian/daemon/forkmserver.h
b/tools/merovingian/daemon/forkmserver.h
rename from sql/backends/monet5/merovingian/daemon/forkmserver.h
rename to tools/merovingian/daemon/forkmserver.h
diff --git a/sql/backends/monet5/merovingian/daemon/handlers.c
b/tools/merovingian/daemon/handlers.c
rename from sql/backends/monet5/merovingian/daemon/handlers.c
rename to tools/merovingian/daemon/handlers.c
diff --git a/sql/backends/monet5/merovingian/daemon/handlers.h
b/tools/merovingian/daemon/handlers.h
rename from sql/backends/monet5/merovingian/daemon/handlers.h
rename to tools/merovingian/daemon/handlers.h
diff --git a/sql/backends/monet5/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
rename from sql/backends/monet5/merovingian/daemon/merovingian.c
rename to tools/merovingian/daemon/merovingian.c
diff --git a/sql/backends/monet5/merovingian/daemon/merovingian.h
b/tools/merovingian/daemon/merovingian.h
rename from sql/backends/monet5/merovingian/daemon/merovingian.h
rename to tools/merovingian/daemon/merovingian.h
diff --git a/sql/backends/monet5/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
rename from sql/backends/monet5/merovingian/daemon/monetdbd.1.in
rename to tools/merovingian/daemon/monetdbd.1.in
diff --git a/sql/backends/monet5/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
rename from sql/backends/monet5/merovingian/daemon/multiplex-funnel.c
rename to tools/merovingian/daemon/multiplex-funnel.c
diff --git a/sql/backends/monet5/merovingian/daemon/multiplex-funnel.h
b/tools/merovingian/daemon/multiplex-funnel.h
rename from sql/backends/monet5/merovingian/daemon/multiplex-funnel.h
rename to tools/merovingian/daemon/multiplex-funnel.h
diff --git a/sql/backends/monet5/merovingian/daemon/peering.c
b/tools/merovingian/daemon/peering.c
rename from sql/backends/monet5/merovingian/daemon/peering.c
rename to tools/merovingian/daemon/peering.c
diff --git a/sql/backends/monet5/merovingian/daemon/peering.h
b/tools/merovingian/daemon/peering.h
rename from sql/backends/monet5/merovingian/daemon/peering.h
rename to tools/merovingian/daemon/peering.h
diff --git a/sql/backends/monet5/merovingian/daemon/proxy.c
b/tools/merovingian/daemon/proxy.c
rename from sql/backends/monet5/merovingian/daemon/proxy.c
rename to tools/merovingian/daemon/proxy.c
diff --git a/sql/backends/monet5/merovingian/daemon/proxy.h
b/tools/merovingian/daemon/proxy.h
rename from sql/backends/monet5/merovingian/daemon/proxy.h
rename to tools/merovingian/daemon/proxy.h
diff --git a/sql/backends/monet5/merovingian/utils/Makefile.ag
b/tools/merovingian/utils/Makefile.ag
rename from sql/backends/monet5/merovingian/utils/Makefile.ag
rename to tools/merovingian/utils/Makefile.ag
--- a/sql/backends/monet5/merovingian/utils/Makefile.ag
+++ b/tools/merovingian/utils/Makefile.ag
@@ -16,10 +16,10 @@
# All Rights Reserved.
# MONETDB5: Sabaoth
-INCLUDES = ../../../../../monetdb5/misc \
- ../../../../../common/stream \
- ../../../../../common/options \
- ../../../../../common/utils
+INCLUDES = ../../../monetdb5/misc \
+ ../../../common/stream \
+ ../../../common/options \
+ ../../../common/utils
EXTRA_DIST = \
control.h \
diff --git a/sql/backends/monet5/merovingian/utils/control.c
b/tools/merovingian/utils/control.c
rename from sql/backends/monet5/merovingian/utils/control.c
rename to tools/merovingian/utils/control.c
diff --git a/sql/backends/monet5/merovingian/utils/control.h
b/tools/merovingian/utils/control.h
rename from sql/backends/monet5/merovingian/utils/control.h
rename to tools/merovingian/utils/control.h
diff --git a/sql/backends/monet5/merovingian/utils/database.c
b/tools/merovingian/utils/database.c
rename from sql/backends/monet5/merovingian/utils/database.c
rename to tools/merovingian/utils/database.c
diff --git a/sql/backends/monet5/merovingian/utils/database.h
b/tools/merovingian/utils/database.h
rename from sql/backends/monet5/merovingian/utils/database.h
rename to tools/merovingian/utils/database.h
diff --git a/sql/backends/monet5/merovingian/utils/glob.c
b/tools/merovingian/utils/glob.c
rename from sql/backends/monet5/merovingian/utils/glob.c
rename to tools/merovingian/utils/glob.c
diff --git a/sql/backends/monet5/merovingian/utils/glob.h
b/tools/merovingian/utils/glob.h
rename from sql/backends/monet5/merovingian/utils/glob.h
rename to tools/merovingian/utils/glob.h
diff --git a/sql/backends/monet5/merovingian/utils/properties.c
b/tools/merovingian/utils/properties.c
rename from sql/backends/monet5/merovingian/utils/properties.c
rename to tools/merovingian/utils/properties.c
diff --git a/sql/backends/monet5/merovingian/utils/properties.h
b/tools/merovingian/utils/properties.h
rename from sql/backends/monet5/merovingian/utils/properties.h
rename to tools/merovingian/utils/properties.h
diff --git a/sql/backends/monet5/merovingian/utils/utils.c
b/tools/merovingian/utils/utils.c
rename from sql/backends/monet5/merovingian/utils/utils.c
rename to tools/merovingian/utils/utils.c
diff --git a/sql/backends/monet5/merovingian/utils/utils.h
b/tools/merovingian/utils/utils.h
rename from sql/backends/monet5/merovingian/utils/utils.h
rename to tools/merovingian/utils/utils.h
diff --git a/tools/mserver/Makefile.ag b/tools/mserver/Makefile.ag
new file mode 100644
--- /dev/null
+++ b/tools/mserver/Makefile.ag
@@ -0,0 +1,32 @@
+# The contents of this file are subject to the MonetDB Public License
+# Version 1.1 (the "License"); you may not use this file except in
+# compliance with the License. You may obtain a copy of the License at
+# http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html
+#
+# Software distributed under the License is distributed on an "AS IS"
+# basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+# License for the specific language governing rights and limitations
+# under the License.
+#
+# The Original Code is the MonetDB Database System.
+#
+# The Initial Developer of the Original Code is CWI.
+# Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
+# Copyright August 2008-2011 MonetDB B.V.
+# All Rights Reserved.
+
+MTSAFE
+INCLUDES = ../../monetdb5/mal \
+ ../../monetdb5/misc \
+ ../../gdk \
+ ../../common/stream \
+ ../../common/options \
+ $(openssl_CFLAGS) $(pcre_CFLAGS) $(libxml2_CFLAGS)
+
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
