Changeset: c5739bd470a5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c5739bd470a5
Modified Files:
monetdb5/extras/xml/05_xml.mal
monetdb5/extras/xml/Makefile.ag
monetdb5/extras/xml/Tests/All
monetdb5/extras/xml/Tests/batxml100.mal
monetdb5/extras/xml/Tests/xml100.mal
monetdb5/extras/xml/Tests/xml100.modules
monetdb5/extras/xml/Tests/xml100.stable.err
monetdb5/extras/xml/Tests/xml100.stable.out
monetdb5/extras/xml/batxml.mx
monetdb5/extras/xml/xml.mx
monetdb5/modules/mal/Tests/xml00.mal
monetdb5/modules/mal/Tests/xml00.modules
monetdb5/modules/mal/Tests/xml00.stable.err
monetdb5/modules/mal/Tests/xml00.stable.out
monetdb5/modules/mal/Tests/xml01.mal
monetdb5/modules/mal/Tests/xml01.modules
monetdb5/modules/mal/Tests/xml01.stable.err
monetdb5/modules/mal/Tests/xml01.stable.out
monetdb5/modules/mal/Tests/xml02.mal
monetdb5/modules/mal/Tests/xml02.modules
monetdb5/modules/mal/Tests/xml02.stable.err
monetdb5/modules/mal/Tests/xml02.stable.out
monetdb5/modules/mal/Tests/xml03.mal
monetdb5/modules/mal/Tests/xml03.modules
monetdb5/modules/mal/Tests/xml03.stable.err
monetdb5/modules/mal/Tests/xml03.stable.out
monetdb5/modules/mal/Tests/xml04.mal
monetdb5/modules/mal/Tests/xml04.modules
monetdb5/modules/mal/Tests/xml04.stable.err
monetdb5/modules/mal/Tests/xml04.stable.out
monetdb5/modules/mal/Tests/xml05.mal
monetdb5/modules/mal/Tests/xml05.modules
monetdb5/modules/mal/Tests/xml05.stable.err
monetdb5/modules/mal/Tests/xml05.stable.out
monetdb5/modules/mal/Tests/xml06.mal
monetdb5/modules/mal/Tests/xml06.modules
monetdb5/modules/mal/Tests/xml10.mal
monetdb5/modules/mal/Tests/xml10.modules
monetdb5/modules/mal/Tests/xml10.stable.err
monetdb5/modules/mal/Tests/xml10.stable.out
Branch: headless
Log Message:
Merged from default
diffs (truncated from 471 to 300 lines):
diff --git a/HowToStart.rst b/HowToStart.rst
--- a/HowToStart.rst
+++ b/HowToStart.rst
@@ -99,16 +99,23 @@
- php
libxml2
- The XML parsing library `libxml2`__ is only used by
+ The XML parsing library `libxml2`__ is used by
the xml module of monetdb5.
If libxml2 is not available on your system, this module is skipped
and it will not be available at runtime.
+pcre
+ The Perl Compatible Regular Expressions library `pcre`__ is used by
+ monetdb5 and sql. Most prominently, complex SQL LIKE expressions are
+ evaluated with help of the pcre library.
+
__ http://dev.monetdb.org/downloads/sources/
__ http://www.gnu.org/software/autoconf/
__ http://www.gnu.org/software/automake/
__ http://www.gnu.org/software/libtool/
+__ http://www.xmlsoft.org/
+__ http://www.pcre.org/
Space Requirements
~~~~~~~~~~~~~~~~~~
diff --git a/buildtools/conf/rules.mk b/buildtools/conf/rules.mk
--- a/buildtools/conf/rules.mk
+++ b/buildtools/conf/rules.mk
@@ -23,7 +23,7 @@
MX = $(top_builddir)/buildtools/Mx/Mx
# in the next few rules, make sure that "$(CONFIG_H)" is included
-# first, also with [f]lex- and bison-generated files. This is crucial
+# first, also with bison-generated files. This is crucial
# to prevent inconsistent (re-)definitions of macros.
%.tab.c: %.y
$(LOCKFILE) waiting
@@ -55,9 +55,6 @@
%.y: %.mx
$(MX) $(MXFLAGS) -x y $<
-%.l: %.mx
- $(MX) $(MXFLAGS) -x l $<
-
%.mal: %.mx
$(MX) $(MXFLAGS) -l -x mal $<
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2128,11 +2128,18 @@
PKG_CHECK_EXISTS([libxml-2.0], [have_libxml2="yes"], [have_libxml2="no"])
-if test x"$have_libxml2" = x"yes" ; then
+case "$enable_monetdb5-$have_libxml2" in
+yes-no)
+ AC_MSG_ERROR([libxml2 library not found but required for MonetDB5])
+ ;;
+auto-no)
+ enable_monetdb5=no
+ ;;
+*-yes)
PKG_CHECK_MODULES([libxml2], [libxml-2.0])
- AC_DEFINE(HAVE_LIBXML2, 1, [Define if you have the libxml2 library])
-fi
-AM_CONDITIONAL(HAVE_LIBXML2, test x"$have_libxml2" != xno)
+ ;;
+esac
+
have_raptor=no
if test "x$enable_rdf" != xno; then
diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx
--- a/gdk/gdk_bbp.mx
+++ b/gdk/gdk_bbp.mx
@@ -1012,8 +1012,8 @@
if (bn->htype != TYPE_void ) {
@:linkHeap(H,heap,bufhead,head)@
- if (bn->tvarsized) {
- @:linkvHeap(T,bufhheap,hheap)@
+ if (bn->hvarsized) {
+ @:linkvHeap(H,bufhheap,hheap)@
}
}
if (bn->ttype != TYPE_void ) {
diff --git a/monetdb5/extras/Makefile.ag b/monetdb5/extras/Makefile.ag
--- a/monetdb5/extras/Makefile.ag
+++ b/monetdb5/extras/Makefile.ag
@@ -15,5 +15,5 @@
# Copyright August 2008-2011 MonetDB B.V.
# All Rights Reserved.
-SUBDIRS = compiler crackers HAVE_LIBXML2?xml HAVE_RAPTOR?rdf
HAVE_SPHINXCLIENT?sphinx
+SUBDIRS = compiler crackers HAVE_RAPTOR?rdf HAVE_SPHINXCLIENT?sphinx
diff --git a/monetdb5/extras/xml/05_xml.mal b/monetdb5/extras/xml/05_xml.mal
deleted file mode 100644
--- a/monetdb5/extras/xml/05_xml.mal
+++ /dev/null
@@ -1,20 +0,0 @@
-# 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.
-
-# This loads the MonetDB/XML module
-include xml;
-include batxml;
diff --git a/monetdb5/extras/xml/Makefile.ag b/monetdb5/extras/xml/Makefile.ag
deleted file mode 100644
--- a/monetdb5/extras/xml/Makefile.ag
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.
-
-INCLUDES = ../../mal \
- ../../../common/options \
- ../../../gdk \
- ../../../common/stream \
- $(libxml2_CFLAGS)
-MTSAFE
-
-lib__xml = {
- MODULE
- DIR = libdir/monetdb5
- SOURCES = xml.mx
-
- LIBS = ../../tools/libmonetdb5 \
- ../../../gdk/libbat \
- $(MALLOC_LIBS) $(libxml2_LIBS)
-}
-
-headers_xml_autoload = {
- HEADERS = mal
- DIR = libdir/monetdb5/autoload
- SOURCES = 05_xml.mal
-}
-
-headers_xml_mal = {
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = xml.mx
-}
-
-lib_batxml = {
- MODULE
- DIR = libdir/monetdb5
- SEP = _
- SOURCES = batxml.mx
- LIBS = lib_xml ../../tools/libmonetdb5 \
- ../../../gdk/libbat \
- $(MATH_LIBS) $(MALLOC_LIBS) $(libxml2_LIBS)
-}
-
-headers_batxml_mal = {
- HEADERS = mal
- DIR = libdir/monetdb5
- SOURCES = batxml.mx
-}
-
-EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/extras/xml/Tests/All b/monetdb5/extras/xml/Tests/All
deleted file mode 100644
--- a/monetdb5/extras/xml/Tests/All
+++ /dev/null
@@ -1,1 +0,0 @@
-HAVE_LIBXML2?xml100
diff --git a/monetdb5/modules/atoms/Makefile.ag
b/monetdb5/modules/atoms/Makefile.ag
--- a/monetdb5/modules/atoms/Makefile.ag
+++ b/monetdb5/modules/atoms/Makefile.ag
@@ -18,12 +18,14 @@
INCLUDES = ../../mal \
../../../common/options \
../../../common/stream \
- ../../../gdk
+ ../../../gdk \
+ $(libxml2_CFLAGS)
MTSAFE
lib_atoms = {
NOINST
SOURCES = \
+ batxml.mx \
blob.mx \
color.mx \
identifier.mx \
@@ -31,14 +33,24 @@
mtime.mx \
streams.mx \
str.mx \
- url.mx
+ url.mx \
+ xml.mx
}
headers_mal = {
HEADERS = mal
DIR = libdir/monetdb5
- SOURCES = str.mx blob.mx url.mx mtime.mx streams.mx inet.mx color.mx \
- identifier.mx
+ SOURCES = \
+ batxml.mx \
+ blob.mx \
+ color.mx \
+ identifier.mx \
+ inet.mx \
+ mtime.mx \
+ streams.mx \
+ str.mx \
+ url.mx \
+ xml.mx
}
EXTRA_DIST_DIR = Tests
diff --git a/monetdb5/modules/atoms/Tests/All b/monetdb5/modules/atoms/Tests/All
--- a/monetdb5/modules/atoms/Tests/All
+++ b/monetdb5/modules/atoms/Tests/All
@@ -5,3 +5,12 @@
time00
strmax
+
+xml00
+xml01
+xml02
+xml03
+xml04
+xml05
+xml10
+xml100
diff --git a/monetdb5/extras/xml/Tests/batxml100.mal
b/monetdb5/modules/atoms/Tests/batxml100.mal
rename from monetdb5/extras/xml/Tests/batxml100.mal
rename to monetdb5/modules/atoms/Tests/batxml100.mal
diff --git a/monetdb5/modules/mal/Tests/xml00.mal
b/monetdb5/modules/atoms/Tests/xml00.mal
rename from monetdb5/modules/mal/Tests/xml00.mal
rename to monetdb5/modules/atoms/Tests/xml00.mal
diff --git a/monetdb5/modules/mal/Tests/xml00.modules
b/monetdb5/modules/atoms/Tests/xml00.modules
rename from monetdb5/modules/mal/Tests/xml00.modules
rename to monetdb5/modules/atoms/Tests/xml00.modules
diff --git a/monetdb5/modules/mal/Tests/xml00.stable.err
b/monetdb5/modules/atoms/Tests/xml00.stable.err
rename from monetdb5/modules/mal/Tests/xml00.stable.err
rename to monetdb5/modules/atoms/Tests/xml00.stable.err
diff --git a/monetdb5/modules/mal/Tests/xml00.stable.out
b/monetdb5/modules/atoms/Tests/xml00.stable.out
rename from monetdb5/modules/mal/Tests/xml00.stable.out
rename to monetdb5/modules/atoms/Tests/xml00.stable.out
diff --git a/monetdb5/modules/mal/Tests/xml01.mal
b/monetdb5/modules/atoms/Tests/xml01.mal
rename from monetdb5/modules/mal/Tests/xml01.mal
rename to monetdb5/modules/atoms/Tests/xml01.mal
diff --git a/monetdb5/modules/mal/Tests/xml01.modules
b/monetdb5/modules/atoms/Tests/xml01.modules
rename from monetdb5/modules/mal/Tests/xml01.modules
rename to monetdb5/modules/atoms/Tests/xml01.modules
diff --git a/monetdb5/modules/mal/Tests/xml01.stable.err
b/monetdb5/modules/atoms/Tests/xml01.stable.err
rename from monetdb5/modules/mal/Tests/xml01.stable.err
rename to monetdb5/modules/atoms/Tests/xml01.stable.err
diff --git a/monetdb5/modules/mal/Tests/xml01.stable.out
b/monetdb5/modules/atoms/Tests/xml01.stable.out
rename from monetdb5/modules/mal/Tests/xml01.stable.out
rename to monetdb5/modules/atoms/Tests/xml01.stable.out
diff --git a/monetdb5/modules/mal/Tests/xml02.mal
b/monetdb5/modules/atoms/Tests/xml02.mal
rename from monetdb5/modules/mal/Tests/xml02.mal
rename to monetdb5/modules/atoms/Tests/xml02.mal
diff --git a/monetdb5/modules/mal/Tests/xml02.modules
b/monetdb5/modules/atoms/Tests/xml02.modules
rename from monetdb5/modules/mal/Tests/xml02.modules
rename to monetdb5/modules/atoms/Tests/xml02.modules
diff --git a/monetdb5/modules/mal/Tests/xml02.stable.err
b/monetdb5/modules/atoms/Tests/xml02.stable.err
rename from monetdb5/modules/mal/Tests/xml02.stable.err
rename to monetdb5/modules/atoms/Tests/xml02.stable.err
diff --git a/monetdb5/modules/mal/Tests/xml02.stable.out
b/monetdb5/modules/atoms/Tests/xml02.stable.out
rename from monetdb5/modules/mal/Tests/xml02.stable.out
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
