Changeset: 506a59451ca1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=506a59451ca1
Modified Files:
clients/mapilib/mapi.mx
debian/libmonetdb4-server-geom.install
debian/libmonetdb4-xquery.install
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:
Merge with default branch.
diffs (truncated from 7519 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -74,3 +74,19 @@
*.pyo
*.rej
*.orig
+
+# build results on Windows
+NT/.monetdb
+NT/buildtools
+NT/clients
+NT/common
+NT/gdk
+NT/geom
+NT/inttypes.h
+NT/java
+NT/monetdb5
+NT/monetdb_config.h
+NT/sql
+NT/testing
+NT/tools
+NT/unistd.h
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 module of monetdb5.
+ 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.
+ MonetDB5 cannot be compiled without libxml2. Current Linux
+ distributions all come with libxml2.
+
+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/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -287,7 +287,7 @@
%files client-tests
%defattr(-,root,root)
-%{_bindir}/odbcsample1
+# %{_bindir}/odbcsample1
%{_bindir}/sample0
%{_bindir}/sample1
%{_bindir}/sample2
@@ -295,7 +295,7 @@
%{_bindir}/sample4
%{_bindir}/smack00
%{_bindir}/smack01
-%{_bindir}/testgetinfo
+# %{_bindir}/testgetinfo
%{_bindir}/malsample.pl
%{_bindir}/sqlsample.php
%{_bindir}/sqlsample.pl
@@ -378,7 +378,6 @@
%{_libdir}/monetdb5/*.mal
%{_libdir}/monetdb5/autoload/*_fits.mal
%{_libdir}/monetdb5/autoload/*_vault.mal
-%{_libdir}/monetdb5/autoload/*_xml.mal
%exclude %{_libdir}/monetdb5/lib_geom.so
# %exclude %{_libdir}/monetdb5/lib_rdf.so
%exclude %{_libdir}/monetdb5/lib_sql.so
diff --git a/NT/Makefile b/NT/Makefile
--- a/NT/Makefile
+++ b/NT/Makefile
@@ -18,27 +18,27 @@
# All Rights Reserved.
TOPDIR = .
-SRCDIR = $(TOPDIR)\..
+srcdir = $(TOPDIR)\..
prefix = $(MAKEDIR)
!INCLUDE "$(TOPDIR)\..\NT\rules.msc"
-all: "$(SRCDIR)\Makefile.msc" monetdb_config.h unistd.h inttypes.h .monetdb
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
+all: "$(srcdir)\Makefile.msc" monetdb_config.h unistd.h inttypes.h .monetdb
+ $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
install: targetdirs all
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
+ $(MAKE) /nologo /f "$(srcdir)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
$(INSTALL) .monetdb "$(sysconfdir)"
$(INSTALL) ..\NT\installer$(bits)\*.sln "$(prefix)"
$(INSTALL) ..\NT\installer$(bits)\*.vdproj "$(prefix)"
-if exist "C:\Program Files (x86)" if $(bits)==32 cd
"$(prefix)"&&C:\cygwin\bin\sed.exe -i "s/Program Files/Program Files (x86)/"
*.vdproj
-$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
- cd "$(SRCDIR)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
+$(srcdir)\Makefile.msc: "$(srcdir)\Makefile.ag"
+ cd "$(srcdir)"&&set PYTHONPATH=buildtools\autogen&&python
buildtools\autogen\autogen.py
-monetdb_config.h: "$(SRCDIR)\NT\monetdb_config.h.in"
- $(CONFIGURE) "$(SRCDIR)\NT\monetdb_config.h.in" > monetdb_config.h
+monetdb_config.h: "$(srcdir)\NT\monetdb_config.h.in"
+ $(CONFIGURE) "$(srcdir)\NT\monetdb_config.h.in" > monetdb_config.h
unistd.h:
$(ECHO) #ifndef UNISTD_H > unistd.h
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -73,15 +73,6 @@
ODBC_LIBS = odbccp32.lib user32.lib
-!IFNDEF PHP_INSTDIR
-PHP_INSTDIR = C:\php-525
-!ENDIF
-!IFNDEF PHP_SRCDIR
-PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.5
-!ENDIF
-# for these, also see winconfig.py
-PHP_EXTENSIONDIR = lib\php5
-
!IFNDEF PYTHONBASE
PYTHONBASE=C:\Python27
!ENDIF
@@ -129,7 +120,7 @@
!IFNDEF LIBICONV
LIBICONV = C:\iconv-1.9.2.win$(bits)
!ENDIF
-ICONV_LIBS = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
+LTLIBICONV = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
!ENDIF
@@ -210,7 +201,7 @@
COMPILERFLAGS = -GF -W3 $(W_CFLAGS) -wd4273 -wd4102 -MD -nologo -Ox
NO_INLINE_CFLAGS = -Od -Ob0gysi-
!ENDIF
-CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS)
+CFLAGS = $(COMPILERFLAGS) -I. -I$(TOPDIR) $(LIBC_INCS) $(INCLUDES)
$(WINCONFIG_INCS) $(ICONV_CFLAGS)
# No general LDFLAGS needed
INSTALL = copy
@@ -352,7 +343,6 @@
"LIBZLIB=$(LIBZLIB)" \
"PACKAGE=$(pkg)" \
"PERL_LIBDIR=$(PERL_LIBDIR)" \
- "PHP_EXTENSIONDIR=$(PHP_EXTENSIONDIR)" \
"PROFILING_FALSE=$(PROFILING_FALSE)" \
"PYTHON=$(PYTHON)" \
"PYTHON_LIBDIR=$(PYTHON_LIBDIR)" \
@@ -405,24 +395,21 @@
!ENDIF
!ENDIF
-PHP_INCS = "-I$(PHP_SRCDIR)" "-I$(PHP_SRCDIR)\main" "-I$(PHP_SRCDIR)\TSRM"
"-I$(PHP_SRCDIR)\Zend" -DPHP_WIN32 -DZEND_WIN32 -DZEND_DEBUG=0 -DZTS=1
-PHP_LIBS = "$(PHP_INSTDIR)\php5embed.lib"
-
CONFIG_H = monetdb_config.h
-{$(SRCDIR)}.mx.h:
+{$(srcdir)}.mx.h:
$(MX) $(MXFLAGS) -l -x h $<
.mx.h:
$(MX) $(MXFLAGS) -l -x h $<
-{$(SRCDIR)}.mx.c:
+{$(srcdir)}.mx.c:
$(MX) $(MXFLAGS) -x c $<
.mx.c:
$(MX) $(MXFLAGS) -x c $<
-{$(SRCDIR)}.mx.mal:
+{$(srcdir)}.mx.mal:
$(MX) $(MXFLAGS) -l -x mal $<
if not exist .libs $(MKDIR) .libs
$(INSTALL) $@ .libs\$@
@@ -432,25 +419,25 @@
if not exist .libs $(MKDIR) .libs
$(INSTALL) $@ .libs\$@
-{$(SRCDIR)}.mx.sql:
+{$(srcdir)}.mx.sql:
$(MX) $(MXFLAGS) -l -x sql $<
.mx.sql:
$(MX) $(MXFLAGS) -l -x sql $<
-{$(SRCDIR)}.mx.y:
+{$(srcdir)}.mx.y:
$(MX) $(MXFLAGS) -x y $<
.mx.y:
$(MX) $(MXFLAGS) -x y $<
-{$(SRCDIR)}.c.obj:
+{$(srcdir)}.c.obj:
$(CC) $(CFLAGS) -c $<
.c.obj:
$(CC) $(CFLAGS) -c $<
-{$(SRCDIR)}.syms.def:
+{$(srcdir)}.syms.def:
echo EXPORTS > $@
type $< >> $@
diff --git a/bootstrap b/bootstrap
--- a/bootstrap
+++ b/bootstrap
@@ -52,7 +52,7 @@
sed '1,/^AC_CONFIG_FILES/d' configure.ag
) > configure.ac &&
$libtoolize -c -f &&
-aclocal -I . -I buildtools/conf ${_m4_extra_dirs} &&
+aclocal ${_m4_extra_dirs} &&
autoheader &&
automake --add-missing --copy --foreign &&
autoconf
diff --git a/buildtools/autogen/autogen/msc.py
b/buildtools/autogen/autogen/msc.py
--- a/buildtools/autogen/autogen/msc.py
+++ b/buildtools/autogen/autogen/msc.py
@@ -69,8 +69,8 @@
fd.write('%s-%d-all: "%s-%d-dir" "%s-%d-Makefile"\n' % (n, i, n, i, n, i))
fd.write('\t$(CD) "%s" && $(MAKE) /nologo $(MAKEDEBUG) "prefix=$(prefix)"
"bits=$(bits)" all \n' % vv)
fd.write('%s-%d-dir: \n\tif not exist "%s" $(MKDIR) "%s"\n' % (n, i, vv,
vv))
- fd.write('%s-%d-Makefile: "$(SRCDIR)\\%s\\Makefile.msc"\n' % (n, i, v))
- fd.write('\t$(INSTALL) "$(SRCDIR)\\%s\\Makefile.msc" "%s\\Makefile"\n' %
(v, v))
+ fd.write('%s-%d-Makefile: "$(srcdir)\\%s\\Makefile.msc"\n' % (n, i, v))
+ fd.write('\t$(INSTALL) "$(srcdir)\\%s\\Makefile.msc" "%s\\Makefile"\n' %
(v, v))
fd.write('%s-%d-check:\n' % (n, i))
fd.write('\t$(CD) "%s" && $(MAKE) /nologo $(MAKEDEBUG) "prefix=$(prefix)"
"bits=$(bits)" check\n' % vv)
@@ -153,7 +153,7 @@
if dir[0] == '$':
return ""
elif not os.path.isabs(dir):
- dir = "$(SRCDIR)/" + dir
+ dir = "$(srcdir)/" + dir
else:
return ""
return prefix+string.replace(dir, '/', '\\')
@@ -170,7 +170,7 @@
elif dir == "builddir":
dir = "."
elif dir == "srcdir":
- dir = "$(SRCDIR)"
+ dir = "$(srcdir)"
elif dir in ('bindir', 'builddir', 'datadir', 'includedir', 'infodir',
'libdir', 'libexecdir', 'localstatedir', 'mandir',
'oldincludedir', 'pkgbindir', 'pkgdatadir', 'pkgincludedir',
@@ -184,7 +184,7 @@
def msc_translate_file(path, msc):
if os.path.isfile(os.path.join(msc['cwd'], path)):
- return "$(SRCDIR)\\" + path
+ return "$(srcdir)\\" + path
return path
def msc_space_sep_list(l):
@@ -410,7 +410,7 @@
if msc['INSTALL'].has_key(script):
continue
if os.path.isfile(os.path.join(msc['cwd'], script+'.in')):
- inf = '$(SRCDIR)\\%s.in' % script
+ inf = '$(srcdir)\\%s.in' % script
if inf not in msc['_IN']:
# TODO
# replace this hack by something like configure ...
@@ -418,8 +418,8 @@
fd.write('\t$(CONFIGURE) "%s" > "%s"\n' % (inf, script))
msc['_IN'].append(inf)
elif os.path.isfile(os.path.join(msc['cwd'], script)):
- fd.write('%s: "$(SRCDIR)\\%s"\n' % (script, script))
- fd.write('\t$(INSTALL) "$(SRCDIR)\\%s" "%s"\n' % (script, script))
+ fd.write('%s: "$(srcdir)\\%s"\n' % (script, script))
+ fd.write('\t$(INSTALL) "$(srcdir)\\%s" "%s"\n' % (script, script))
if scripts.has_key('COND'):
condname = 'defined(' + ') && defined('.join(scripts['COND']) + ')'
mkname = script.replace('.', '_').replace('-', '_')
@@ -467,7 +467,7 @@
h, ext = split_filename(header)
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
