diff -Nru xmlm-1.0.2/build xmlm-1.1.0/build --- xmlm-1.0.2/build 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/build 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -#!/bin/sh -set -e - -# Project info -PROJECTNAME="xmlm" -VERSION="1.0.2" -COPYRIGHTYEAR="2007-2009" -SHORTDESCRIPTION="Streaming XML input\/output for OCaml" -EMAIL="daniel.buenzl i\\\@erratique.ch" - -INSTALLDIR=${INSTALLDIR:="`ocamlc -where`/$PROJECTNAME"} -DOCDIR=${DOCDIR:="doc"} -F=${F:="_build/src/$PROJECTNAME"} - -# Caml tools -OCAMLDOC=${OCAMLDOC:="ocamldoc"} -OCAMLBUILD=${OCAMLBUILD:="ocamlbuild"} -BUILDFLAGS=${BUILDFLAGS:="-classic-display"} - -# Misc tools -CP=${CP:="cp"} -RM=${RM:="rm"} -MKDIR=${MKDIR:="mkdir"} - -ocb () { $OCAMLBUILD $BUILDFLAGS $* ; } - -action () -{ - case $1 in - module-byte) - ocb $PROJECTNAME.cmo ;; - module-native) - ocb $PROJECTNAME.cmx ;; - module-plugin) - ocb $PROJECTNAME.cmxs ;; - module) - action module-byte - action module-native ;; - doc) - ocb $PROJECTNAME.cmi - $OCAMLDOC -html -I src -colorize-code -d $DOCDIR src/$PROJECTNAME.mli ;; - distrib) distrib ;; - install-byte) - action module-byte - $MKDIR -p $INSTALLDIR - $CP $F.ml $F.mli $F.cmi $F.cmo src/META $INSTALLDIR ;; - install) - action install-byte - action module-native - $CP $F.cmx $F.o $INSTALLDIR ;; - install-plugin) - action install - action module-plugin - $CP $F.cmxs $INSTALLDIR ;; - clean) - ocb -clean ;; - clean-all) - action clean - $RM -f $DOCDIR/*.html ;; - *) - ocb $1;; - esac; -} - -distrib () -{ - CD=${CD:="cd"} - FIND=${FIND:="find"} - GREP=${GREP:="grep"} - TAR=${TAR:="tar"} - - DIRNAME=$PROJECTNAME-$VERSION - ROOTDIR=/tmp/$DIRNAME - $RM -rf $ROOTDIR - $MKDIR -p $ROOTDIR - $CP -r . $ROOTDIR - $CD $ROOTDIR - action clean-all - - $RM -rf _darcs - $RM -f TODO - $FIND $ROOTDIR \ - \( -name "*~" -o -name ".DS_Store" -o -name ".gdb_history" \) \ - -exec $RM {} ';' - for file in `$FIND $ROOTDIR -type f -print`; do - sed -i "s/1.0.2/$VERSION/; \ - s/2007-2009/$COPYRIGHTYEAR/; \ - s/Streaming XML input/output for OCaml/$SHORTDESCRIPTION/; \ - s/daniel.buenzl i\@erratique.ch/$EMAIL/;" \ - $file - done - - action module - action xmltrip.native - action examples.cmo - action doc - action clean - - $CD .. - $TAR -cvjf $DIRNAME.tbz $DIRNAME - $RM -r $DIRNAME -} - -if [ $# -eq 0 ]; then action module ; else - while [ $# -gt 0 ]; do action $1; shift ; done -fi - - diff -Nru xmlm-1.0.2/CHANGES xmlm-1.1.0/CHANGES --- xmlm-1.0.2/CHANGES 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/CHANGES 2012-03-17 10:50:20.000000000 +0000 @@ -1,34 +1,50 @@ -# Version 1.0.2, 2009-11-11, 大足 +v1.1.0 2012-03-16 La Forclaz (VS) +--------------------------------- -- Replaced a (non tail-recursive) use of List.map. +- OASIS support. +- Fixes a bug in the UTF-16 decoder. +- Fixes a bug in `Xmlm.make_output` with a custom function. Thanks to + Konstantinas Myalo for the report and the patch. +- New optional argument `decl` to `Xmlm.make_output` to control whether the + XML declaration should be output. +- New function `Xmlm.output_depth`, returns the current element nesting level. -# Version 1.0.1, 2008-08-01, Lausanne +v1.0.2 2009-11-11 大足县 +----------------------- + +- Replaced a (non tail-recursive) use of `List.map`. + + +v1.0.1 2008-08-01 Lausanne +---------------------------- - POSIX compliant build shell script (thanks to Michael D Ekstrand). - Support for Debian packaging. -# Version 1.0.0, 2008-03-17, Lausanne +v1.0.0 2008-03-17 Lausanne +---------------------------- -New features: +## New features: - Streaming IO api with support to IO arborescent data structures. - Proper XML namespace support, all names are expanded names. - Whitespace stripping respects the xml:space attributes. - Xmlm.Make functor to use other types for strings and internal buffers. - UTF-8 encoded documents can start with an UTF-8 encoded BOM. -Incompatible changes: -- Xmlm.encoding becomes a polymorphic variant. -- Xmlm.error becomes a polymorphic variant and the "E_" prefix is dropped. +## Incompatible changes: +- `Xmlm.encoding` becomes a polymorphic variant. +- `Xmlm.error` becomes a polymorphic variant and the "E_" prefix is dropped. - Removed the callback api. - Removed the tree and cursor api. -Other: -- test/xhtml.ml has a mapping from XHTML entities to their UTF-8 sequence. +## Other: +- `test/xhtml.ml` has a mapping from XHTML entities to their UTF-8 sequence. - Build system switched from make to ocamlbuild -# Version 0.9.0, 2007-02-26, Lausanne +v0.9.0 2007-02-26 Lausanne +-------------------------- -First release. \ No newline at end of file +- First release. diff -Nru xmlm-1.0.2/debian/changelog xmlm-1.1.0/debian/changelog --- xmlm-1.0.2/debian/changelog 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/changelog 2012-04-08 16:47:11.000000000 +0000 @@ -1,32 +1,13 @@ -xmlm (1.0.2-1build5) precise; urgency=low +xmlm (1.1.0-1) unstable; urgency=low - * Rebuild with ocamlopt on armhf. + * Team upload + * New upstream release + * Switch source package format to 3.0 (quilt) + * Switch debian/copyright to format 1.0 + * Bump debhelper compat level to 8 + * Bump Standards-Version to 3.9.3 - -- Colin Watson Tue, 24 Jan 2012 10:54:04 +0000 - -xmlm (1.0.2-1build4) precise; urgency=low - - * Rebuild for OCaml 3.12.1. - - -- Colin Watson Sat, 19 Nov 2011 01:03:23 +0000 - -xmlm (1.0.2-1build3) oneiric; urgency=low - - * Rebuild to pick up ocaml fixes on armel. - - -- Adam Conrad Wed, 24 Aug 2011 16:28:38 -0600 - -xmlm (1.0.2-1build2) oneiric; urgency=low - - * Rebuild for OCaml 3.12.0. - - -- Colin Watson Mon, 16 May 2011 20:53:03 +0100 - -xmlm (1.0.2-1build1) lucid; urgency=low - - * No-change rebuild for OCaml 3.11.2 transition (LP: #526073). - - -- Ilya Barygin Wed, 24 Feb 2010 23:02:41 +0300 + -- Stéphane Glondu Sun, 08 Apr 2012 18:47:10 +0200 xmlm (1.0.2-1) unstable; urgency=high diff -Nru xmlm-1.0.2/debian/compat xmlm-1.1.0/debian/compat --- xmlm-1.0.2/debian/compat 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/compat 2012-04-08 16:41:57.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru xmlm-1.0.2/debian/control xmlm-1.1.0/debian/control --- xmlm-1.0.2/debian/control 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/control 2012-04-08 16:43:06.000000000 +0000 @@ -7,12 +7,11 @@ Romain Beauxis , Mehdi Dogguy Build-Depends: - cdbs (>= 0.4.53), - debhelper (>= 7.0.1), + debhelper (>= 8), ocaml-nox, ocaml-findlib (>= 1.2.4), dh-ocaml (>= 0.9) -Standards-Version: 3.8.3 +Standards-Version: 3.9.3 Homepage: http://erratique.ch/software/xmlm Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xmlm.git Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xmlm.git diff -Nru xmlm-1.0.2/debian/control.in xmlm-1.1.0/debian/control.in --- xmlm-1.0.2/debian/control.in 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/control.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -Source: xmlm -Section: devel -Priority: optional -Maintainer: Debian OCaml Maintainers -Uploaders: Samuel Mimram , Romain Beauxis -Build-Depends: @cdbs@, ocaml-findlib (>= 1.2.4), dh-ocaml -Standards-Version: 3.8.3 -Homepage: http://erratique.ch/software/xmlm -Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/xmlm.git -Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/xmlm.git - -Package: libxmlm-ocaml-dev -Architecture: any -Section: ocaml -Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib, ${misc:Depends} -Description: OCaml xml manipulation module - Xmlm allows the OCaml programmer to manipulate xml data. - Its complexity is half-way between the easy xml-light module and - a full parsing of xml data. - . - It is also very simple to updgrade existing code using xml-light - in order to use xmlm. - . - This package contains all the development stuff you need to develop - OCaml programs which use xmlm. diff -Nru xmlm-1.0.2/debian/copyright xmlm-1.1.0/debian/copyright --- xmlm-1.0.2/debian/copyright 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/copyright 2012-04-08 16:41:57.000000000 +0000 @@ -1,41 +1,39 @@ -This package was debianized by Romain Beauxis on -Thu, 14 May 2009 16:26:15 +1100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -It was downloaded from - -Upstream Author: Daniel C. Bünzli - -Copyright © 2007-2008, Daniel C. Bünzli. - -License: - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the - distribution. - - 3. Neither the name of the Daniel C. Bünzli nor the names of - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -The Debian packaging is © 2009, Romain Beauxis and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +Files: * +Copyright: 2007-2012, Daniel C. Bünzli +License: BSD-C3 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + . + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the + distribution. + . + 3. Neither the name of the Daniel C. Bünzli nor the names of + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Files: debian/* +Copyright: 2009, Romain Beauxis + 2012, Stéphane Glondu +License: GPL-2 + The Debian packaging is licensed under the GPL, see + `/usr/share/common-licenses/GPL-2'. diff -Nru xmlm-1.0.2/debian/libxmlm-ocaml-dev.install.in xmlm-1.1.0/debian/libxmlm-ocaml-dev.install.in --- xmlm-1.0.2/debian/libxmlm-ocaml-dev.install.in 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/libxmlm-ocaml-dev.install.in 2012-04-08 16:41:56.000000000 +0000 @@ -1,4 +1 @@ -@OCamlStdlibDir@/xmlm/META -@OCamlStdlibDir@/xmlm/*.cm* -@OCamlStdlibDir@/xmlm/*.ml* -OPT: @OCamlStdlibDir@/xmlm/*.o +usr diff -Nru xmlm-1.0.2/debian/patches/0001-Fix-typo.patch xmlm-1.1.0/debian/patches/0001-Fix-typo.patch --- xmlm-1.0.2/debian/patches/0001-Fix-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ xmlm-1.1.0/debian/patches/0001-Fix-typo.patch 2012-04-08 16:41:57.000000000 +0000 @@ -0,0 +1,22 @@ +From: Stephane Glondu +Date: Sun, 8 Apr 2012 18:40:54 +0200 +Subject: Fix typo + +--- + test/xmltrip.ml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/xmltrip.ml b/test/xmltrip.ml +index dbefb3f..c489d75 100644 +--- a/test/xmltrip.ml ++++ b/test/xmltrip.ml +@@ -212,7 +212,7 @@ let main () = + "-strip", Arg.Set strip, + "strip and collapse white space in character data."; + "-ns", Arg.Set ns, +- "replace unbound namespaces prefixes by themselves (on input and ouput)."; ++ "replace unbound namespaces prefixes by themselves (on input and output)."; + "-eref", Arg.Set eref, + "replace unknown entity references by their name."; + "-xhtml", Arg.Set xhtml, +-- diff -Nru xmlm-1.0.2/debian/patches/series xmlm-1.1.0/debian/patches/series --- xmlm-1.0.2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xmlm-1.1.0/debian/patches/series 2012-04-08 16:41:57.000000000 +0000 @@ -0,0 +1 @@ +0001-Fix-typo.patch diff -Nru xmlm-1.0.2/debian/rules xmlm-1.1.0/debian/rules --- xmlm-1.0.2/debian/rules 2012-05-08 14:05:32.000000000 +0000 +++ xmlm-1.1.0/debian/rules 2012-04-08 16:41:56.000000000 +0000 @@ -1,30 +1,35 @@ #!/usr/bin/make -f +# -*- makefile -*- -include /usr/share/cdbs/1/rules/debhelper.mk -#include /usr/share/cdbs/1/rules/patchsys-quilt.mk -include /usr/share/cdbs/1/rules/ocaml.mk - -# In order to regenerate 'debian/control' : -# DEB_AUTO_UPDATE_DEBIAN_CONTROL=yes fakeroot debian/rules clean -# Then check manually if everything's ok - -DESTDIR = $(CURDIR)/debian/tmp$(shell ocamlc -where) -DEB_MAKE_INSTALL_TARGET := install OCAMLFIND_DESTDIR=$(DESTDIR) OCAMLFIND_LDCONF=ignore -DEB_DH_INSTALL_SOURCEDIR := debian/tmp -DEB_DH_INSTALL_ARGS := --list-missing - -build/libxmlm-ocaml-dev:: - mkdir -p $(DESTDIR) - if [ -x /usr/bin/ocamlopt ]; then\ - INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build module; \ - INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build install; \ - else\ - INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build module-byte; \ - INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build install-byte; \ - fi - INSTALLDIR=$(DESTDIR)/xmlm BUILDFLAGS="-no-hygiene" ./build doc - -clean:: - INSTALLDIR=$(DESTDIR)/xmlm ./build clean - rm -rf .pc - +DESTDIR=$(CURDIR)/debian/tmp +include /usr/share/ocaml/ocamlvars.mk +OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR) +export OCAMLFIND_DESTDIR + +%: + dh $@ --with ocaml + +.PHONY: override_dh_auto_configure +override_dh_auto_configure: + ocaml setup.ml -configure --prefix /usr --destdir '$(DESTDIR)' --enable-tests + +.PHONY: override_dh_auto_build +override_dh_auto_build: + ocaml setup.ml -build + +.PHONY: override_dh_auto_test +override_dh_auto_test: + ocaml setup.ml -test + +.PHONY: override_dh_auto_install +override_dh_auto_install: + mkdir -p '$(OCAMLFIND_DESTDIR)' + ocaml setup.ml -install + +.PHONY: override_dh_install +override_dh_install: + dh_install --fail-missing + +.PHONY: override_dh_auto_clean +override_dh_auto_clean: + ocaml setup.ml -distclean diff -Nru xmlm-1.0.2/debian/source/format xmlm-1.1.0/debian/source/format --- xmlm-1.0.2/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ xmlm-1.1.0/debian/source/format 2012-05-08 14:05:33.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru xmlm-1.0.2/doc/api.odocl xmlm-1.1.0/doc/api.odocl --- xmlm-1.0.2/doc/api.odocl 1970-01-01 00:00:00.000000000 +0000 +++ xmlm-1.1.0/doc/api.odocl 2012-03-17 10:50:20.000000000 +0000 @@ -0,0 +1 @@ +Xmlm diff -Nru xmlm-1.0.2/doc/index_attributes.html xmlm-1.1.0/doc/index_attributes.html --- xmlm-1.0.2/doc/index_attributes.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_attributes.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_classes.html xmlm-1.1.0/doc/index_classes.html --- xmlm-1.0.2/doc/index_classes.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_classes.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_class_types.html xmlm-1.1.0/doc/index_class_types.html --- xmlm-1.0.2/doc/index_class_types.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_class_types.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_exceptions.html xmlm-1.1.0/doc/index_exceptions.html --- xmlm-1.0.2/doc/index_exceptions.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_exceptions.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index.html xmlm-1.1.0/doc/index.html --- xmlm-1.0.2/doc/index.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index.html 2012-03-17 10:50:32.000000000 +0000 @@ -2,7 +2,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_methods.html xmlm-1.1.0/doc/index_methods.html --- xmlm-1.0.2/doc/index_methods.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_methods.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_modules.html xmlm-1.1.0/doc/index_modules.html --- xmlm-1.0.2/doc/index_modules.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_modules.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_module_types.html xmlm-1.1.0/doc/index_module_types.html --- xmlm-1.0.2/doc/index_module_types.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_module_types.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_types.html xmlm-1.1.0/doc/index_types.html --- xmlm-1.0.2/doc/index_types.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_types.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + diff -Nru xmlm-1.0.2/doc/index_values.html xmlm-1.1.0/doc/index_values.html --- xmlm-1.0.2/doc/index_values.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/index_values.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,7 +1,7 @@ - + @@ -167,6 +167,14 @@ Outputs a signal. +output_depth [Xmlm.S] + +output_depth [Xmlm] +
+output_depth o is o's current element nesting level (undefined + before the first `El_start and after the last `El_end). +
+ output_doc_tree [Xmlm.S] output_doc_tree [Xmlm] diff -Nru xmlm-1.0.2/doc/style.css xmlm-1.1.0/doc/style.css --- xmlm-1.0.2/doc/style.css 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/style.css 2012-03-17 10:50:20.000000000 +0000 @@ -1,64 +1,99 @@ /* A style for ocamldoc. Daniel C. Buenzli */ -body { padding: 0em; - border: 0em; - margin: 2em 10% 2em 10%; - font-family: verdana,sans-serif; - font-size: 9pt; - font-weight: normal; - line-height: 130%; - text-align: justify; - background: white; - color : black; - max-width: 75ex; - min-width: 40ex; } - - -pre, p, div, span, img, table, td, ol, ul, li - { padding: 0em; border: 0em; margin: 0em } - -h1, h2, h3, h4, h5, h6, h7, h8, h9 { padding: 1ex 0em 0em 0em; - border: 0em; - margin: 1em 0em 0em 0em; - font-weight : bold; - font-family : sans-serif; - text-align: left; - border-top-style : dotted; - border-width : thin; } -h1 { font-size : 140%} -h2 { font-size : 120%; border-top-style : none; margin: 1ex 0em 0em 0em } -h3, h4, h5, h6, h7, h8, h9 { font-size : 100%; border-top-style : none; } - -.navbar { padding-bottom : 1em; margin-bottom: 1em } - -p { padding: 1em 0ex 0em 0em } - -a, a:link, a:visited, a:active, a:hover { color : #009; text-decoration: none } -a:hover { color : #009; text-decoration : underline } - -hr { border-style: none; } -table { font-size : 100% /* Why ? */ } -ul li { padding: 1em 0em 0em 0em; margin:0em 0em 0em 2.5ex} -ol li { padding: 1em 0em 0em 0em; margin:0em 0em 0em 2em} - -pre { margin: 3ex 0em 1ex 0em; } -.keyword { font-weight: bold; color: black } -.keywordsign { color : black } -.code { color : black } -.info { margin: 0em 0em 0em 2em } +/* Reset a few things. */ +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre, +a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp, +small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset, +form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td +{ margin: 0; padding: 0; border: 0 none; outline: 0; font-size: 100%; + font-weight: inherit; font-style:inherit; font-family:inherit; + line-height: inherit; vertical-align: baseline; text-align:inherit; + color:inherit; background: transparent; } + +table { border-collapse: collapse; border-spacing: 0; } + +/* Basic page layout using the user's preferred font sizes */ + +body { font: normal 1em/1.375em helvetica, arial, sans-serif; text-align:left; + margin: 1.375em 10%; min-width: 40ex; max-width: 70ex; + color: black; background: transparent /* url(line-height-22.gif) */; } + +b { font-weight: bold } +em { font-style: italic } + +tt, code, pre { font-family: WorkAroundWebKitAndMozilla, monospace; + font-size: 1em; } +pre code { font-size : inherit; } + +.superscript,.subscript +{ font-size : 0.813em; line-height:0; margin-left:0.4ex;} +.superscript { vertical-align: super; } +.subscript { vertical-align: sub; } + +/* ocamldoc markup workaround hacks */ + +hr, hr + br, div + br, center + br, span + br, ul + br, ol + br, pre + br +{ display: none } /* annoying */ + +code br { display: inline } /* because of the above span + br rule */ +pre + code { white-space:nowrap; /* in code examples we don't wrap. */ + line-height:1.375em; } /* and the line height is too large. */ +code + pre { margin-bottom:1.375em} /* after code example we introduce space. */ +center { text-align: left } +center + br + pre { margin-bottom:1.375em} /* Toplevel module description */ +div.info + br + code { display:block; margin-top: 1.375em} /* Records */ + +/* Sections and document divisions */ + +/* .navbar { margin-bottom: -1.375em } */ +h1 { font-weight: bold; font-size: 1.5em; /* margin-top:1.833em; */ + margin-top:0.917em; padding-top:0.875em; + border-top-style:solid; border-width:1px; border-color:#AAA; } +h2 { font-weight: bold; font-size: 1.313em; margin-top: 1.048em } +h3 { font-weight: bold; font-size: 1.125em; margin-top: 1.222em } +h3 { font-weight: bold; font-size: 1em; margin-top: 1.375em} +h4 { font-style: italic; } + +/* Used by OCaml's own library documentation. */ + h6 { font-weight: bold; font-size: 1.125em; margin-top: 1.222em } + .h7 { font-weight: bold; font-size: 1em; margin-top: 1.375em } + +p { margin-top: 1.375em } +pre { margin-top: 1.375em } +.info { margin: 0.458em 0em -0.458em 2em;}/* Description of types values etc. */ +td .info { margin:0; padding:0; margin-left: 2em;} /* Description in indexes */ + +ul, ol { margin-top:0.688em; padding-bottom:0.687em; + list-style-position:outside} +ul + p, ol + p { margin-top: 0em } +ul { list-style-type: square } + + +/* h2 + ul, h3 + ul, p + ul { } */ +ul > li { margin-left: 1.375em; } +ol > li { margin-left: 1.7em; } +/* Links */ + +a, a:link, a:visited, a:active, a:hover { color : #00B; text-decoration: none } +a:hover { text-decoration : underline } +*:target {background-color: #FFFF99;} /* anchor highlight */ + +/* Code */ + +.keyword { font-weight: bold; } .comment { color : red } -.constructor { color : #072 } -.type { color : black } -.string { color : #bc8f8f } -.warning { color : Red ; font-weight : bold } - -div.sig_block {margin-left: 2em} -.typetable { border-style : hidden } -.indextable { border-style : hidden } -.paramstable { border-style : hidden ; padding: 5pt 5pt} +.constructor { color : green } +.string { color : brown } +.warning { color : red ; font-weight : bold } + +/* Functors */ + +.paramstable { border-style : hidden ; padding-bottom:1.375em} +.paramstable code { margin-left: 1ex; margin-right: 1ex } +.sig_block {margin-left: 1em} + + -.superscript { font-size : 80% } -.subscript { font-size : 80% } diff -Nru xmlm-1.0.2/doc/type_Xmlm.Buffer.html xmlm-1.1.0/doc/type_Xmlm.Buffer.html --- xmlm-1.0.2/doc/type_Xmlm.Buffer.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/type_Xmlm.Buffer.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru xmlm-1.0.2/doc/type_Xmlm.html xmlm-1.1.0/doc/type_Xmlm.html --- xmlm-1.0.2/doc/type_Xmlm.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/type_Xmlm.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -61,10 +61,12 @@       | `Fun of int -> unit ]
  type output
  val make_output :
+    ?decl:bool ->
    ?nl:bool ->
    ?indent:int option ->
    ?ns_prefix:(string -> string option) -> Xmlm.dest -> Xmlm.output
  val output : Xmlm.output -> Xmlm.signal -> unit
+  val output_depth : Xmlm.output -> int
  val output_tree : ('a -> 'a Xmlm.frag) -> Xmlm.output -> 'a -> unit
  val output_doc_tree :
    ('a -> 'a Xmlm.frag) -> Xmlm.output -> Xmlm.dtd * 'a -> unit
@@ -157,10 +159,12 @@           | `Fun of int -> unit ]
      type output
      val make_output :
+        ?decl:bool ->
        ?nl:bool ->
        ?indent:int option ->
        ?ns_prefix:(Xmlm.S.string -> Xmlm.S.string option) ->
        Xmlm.S.dest -> Xmlm.S.output
+      val output_depth : Xmlm.S.output -> int
      val output : Xmlm.S.output -> Xmlm.S.signal -> unit
      val output_tree : ('a -> 'a Xmlm.S.frag) -> Xmlm.S.output -> 'a -> unit
      val output_doc_tree :
@@ -236,9 +240,11 @@               | `Fun of int -> unit ]
          type output
          val make_output :
+            ?decl:bool ->
            ?nl:bool ->
            ?indent:int option ->
            ?ns_prefix:(string -> string option) -> dest -> output
+          val output_depth : output -> int
          val output : output -> signal -> unit
          val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
          val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
diff -Nru xmlm-1.0.2/doc/type_Xmlm.Make.html xmlm-1.1.0/doc/type_Xmlm.Make.html --- xmlm-1.0.2/doc/type_Xmlm.Make.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/type_Xmlm.Make.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -78,9 +78,11 @@           | `Fun of int -> unit ]
      type output
      val make_output :
+        ?decl:bool ->
        ?nl:bool ->
        ?indent:int option ->
        ?ns_prefix:(string -> string option) -> dest -> output
+      val output_depth : output -> int
      val output : output -> signal -> unit
      val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
      val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
diff -Nru xmlm-1.0.2/doc/type_Xmlm.S.html xmlm-1.1.0/doc/type_Xmlm.S.html --- xmlm-1.0.2/doc/type_Xmlm.S.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/type_Xmlm.S.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,6 +1,6 @@ - + @@ -67,10 +67,12 @@       | `Fun of int -> unit ]
  type output
  val make_output :
+    ?decl:bool ->
    ?nl:bool ->
    ?indent:int option ->
    ?ns_prefix:(Xmlm.S.string -> Xmlm.S.string option) ->
    Xmlm.S.dest -> Xmlm.S.output
+  val output_depth : Xmlm.S.output -> int
  val output : Xmlm.S.output -> Xmlm.S.signal -> unit
  val output_tree : ('a -> 'a Xmlm.S.frag) -> Xmlm.S.output -> 'a -> unit
  val output_doc_tree :
diff -Nru xmlm-1.0.2/doc/type_Xmlm.String.html xmlm-1.1.0/doc/type_Xmlm.String.html --- xmlm-1.0.2/doc/type_Xmlm.String.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/type_Xmlm.String.html 2012-03-17 10:50:32.000000000 +0000 @@ -1,6 +1,6 @@ - + diff -Nru xmlm-1.0.2/doc/Xmlm.Buffer.html xmlm-1.1.0/doc/Xmlm.Buffer.html --- xmlm-1.0.2/doc/Xmlm.Buffer.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/Xmlm.Buffer.html 2012-03-17 10:50:32.000000000 +0000 @@ -2,7 +2,7 @@ - + @@ -23,24 +23,24 @@ 
module type Buffer = sig .. end
Input signature for internal buffers.
-
type string
+
type string
The type for strings.
-
type t
+
type t
The type for buffers.
-
exception Full
+
exception Full
Raised if the buffer cannot be grown.
-
val create : int -> t
+
val create : int -> t
Creates a buffer of the given size.
-
val add_uchar : t -> int -> unit
+
val add_uchar : t -> int -> unit
Adds the given (guaranteed valid) unicode code point to a buffer. @@ -48,13 +48,13 @@ Raises Xmlm.Buffer.Full if the buffer cannot be grown.
-
val clear : t -> unit
+
val clear : t -> unit
Clears the buffer.
-
val contents : t -> string
+
val contents : t -> string
Returns the buffer contents.
-
val length : t -> int
+
val length : t -> int
Returns the number of characters contained in the buffer.
\ No newline at end of file diff -Nru xmlm-1.0.2/doc/Xmlm.html xmlm-1.1.0/doc/Xmlm.html --- xmlm-1.0.2/doc/Xmlm.html 2009-11-16 15:14:29.000000000 +0000 +++ xmlm-1.1.0/doc/Xmlm.html 2012-03-17 10:50:32.000000000 +0000 @@ -2,7 +2,7 @@ - + @@ -10,7 +10,8 @@ - + + @@ -44,39 +45,36 @@ of use.

- Version 1.0.2 - daniel.buenzl i@erratique.ch + Release 1.1.0 - Daniel Bünzli <daniel.buenzli at erratique.ch>

- References. -

- - Tim Bray. +

References

+ +
-
type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ]
+
+

Basic types and values


+
type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ]
The type for character encodings. For `UTF_16, endianness is determined from the BOM.
-
type dtd = string option
+
type dtd = string option
The type for the optional DTD.
-
type name = string * string
+
type name = string * string
The type for attribute and element's expanded names @@ -85,17 +83,17 @@ that is not under the scope of a default namespace.
-
type attribute = name * string
+
type attribute = name * string
The type for attributes. Name and attribute data.
-
type tag = name * attribute list
+
type tag = name * attribute list
The type for an element tag. Tag name and attribute list.
-
type signal = [ `Data of string | `Dtd of dtd | `El_end | `El_start of tag ]
+
type signal = [ `Data of string | `Dtd of dtd | `El_end | `El_start of tag ]
The type for signals. A well-formed sequence of signals belongs to the language of the doc grammar : @@ -106,36 +104,35 @@ exceptions are raised.
-
val ns_xml : string
+
val ns_xml : string
Namespace name value bound to the reserved "xml" prefix.
-
val ns_xmlns : string
+
val ns_xmlns : string
Namespace name value bound to the reserved "xmlns" prefix.

- -

Input


-
type pos = int * int
+

Input


+
type pos = int * int
The type for input positions. Line and column number, both start with 1.
-
type error = [ `Expected_char_seqs of string list * string
       | `Expected_root_element
       | `Illegal_char_ref of string
       | `Illegal_char_seq of string
       | `Malformed_char_stream
       | `Max_buffer_size
       | `Unexpected_eoi
       | `Unknown_encoding of string
       | `Unknown_entity_ref of string
       | `Unknown_ns_prefix of string ]
+
type error = [ `Expected_char_seqs of string list * string
       | `Expected_root_element
       | `Illegal_char_ref of string
       | `Illegal_char_seq of string
       | `Malformed_char_stream
       | `Max_buffer_size
       | `Unexpected_eoi
       | `Unknown_encoding of string
       | `Unknown_entity_ref of string
       | `Unknown_ns_prefix of string ]
The type for input errors.
-
val error_message : error -> string
+
val error_message : error -> string
Converts the error to an english error message.
-
exception Error of pos * error
+
exception Error of pos * error
Raised on input errors.
-
type source = [ `Channel of Pervasives.in_channel
       | `Fun of unit -> int
       | `String of int * string ]
+
type source = [ `Channel of Pervasives.in_channel
       | `Fun of unit -> int
       | `String of int * string ]
The type for input sources. For `String starts reading at the given integer position. For `Fun the function must return the @@ -143,12 +140,12 @@ such byte.
-
type input
+
type input
The type for input abstractions.
-
val make_input : ?enc:encoding option ->
       ?strip:bool ->
       ?ns:(string -> string option) ->
       ?entity:(string -> string option) -> source -> input
+
val make_input : ?enc:encoding option ->
       ?strip:bool ->
       ?ns:(string -> string option) ->
       ?entity:(string -> string option) -> source -> input
Returns a new input abstraction reading from the given source.
  • enc, character encoding of the document, details. @@ -162,7 +159,7 @@

-
val input : input -> signal
+
val input : input -> signal
Inputs a signal. Repeated invocation of the function with the same input abstraction will generate a well-formed sequence of signals or an Xmlm.Error is raised. Furthermore there will be no @@ -173,7 +170,7 @@ Raises Xmlm.Error on input errors.
-
val input_tree : el:(tag -> 'a list -> 'a) -> data:(string -> 'a) -> input -> 'a
+
val input_tree : el:(tag -> 'a list -> 'a) -> data:(string -> 'a) -> input -> 'a
If the next signal is a :
  • `Data signal, inputs it and invokes data with the character data.
    • @@ -196,7 +193,7 @@ Raises Xmlm.Error on input errors and Invalid_argument if the next signal is not `El_start or `Data.
-
val input_doc_tree : el:(tag -> 'a list -> 'a) ->
       data:(string -> 'a) -> input -> dtd * 'a
+
val input_doc_tree : el:(tag -> 'a list -> 'a) ->
       data:(string -> 'a) -> input -> dtd * 'a
Same as Xmlm.input_tree but reads a complete well-formed sequence of signals.

@@ -204,43 +201,44 @@ Raises Xmlm.Error on input errors and Invalid_argument if the next signal is not `Dtd.

-
val peek : input -> signal
+
val peek : input -> signal
Same as Xmlm.input but doesn't remove the signal from the sequence.

Raises Xmlm.Error on input errors.

-
val eoi : input -> bool
+
val eoi : input -> bool
Returns true if the end of input is reached. See details.

Raises Xmlm.Error on input errors.

-
val pos : input -> pos
+
val pos : input -> pos
Current position in the input abstraction.

- -

Output


-
type 'a frag = [ `Data of string | `El of tag * 'a list ]
+

Output


+
type 'a frag = [ `Data of string | `El of tag * 'a list ]
The type for deconstructing data structures of type 'a.
-
type dest = [ `Buffer of Buffer.t
       | `Channel of Pervasives.out_channel
       | `Fun of int -> unit ]
+
type dest = [ `Buffer of Buffer.t
       | `Channel of Pervasives.out_channel
       | `Fun of int -> unit ]
The type for output destinations. For `Buffer, the buffer won't be cleared. For `Fun the function is called with the output bytes as ints.
-
type output
+
type output
The type for output abstractions.
-
val make_output : ?nl:bool ->
       ?indent:int option ->
       ?ns_prefix:(string -> string option) -> dest -> output
+
val make_output : ?decl:bool ->
       ?nl:bool ->
       ?indent:int option ->
       ?ns_prefix:(string -> string option) -> dest -> output
Returns a new output abstraction writing to the given destination.
    +
  • decl, if true the XML + declaration is output (defaults to true).
  • nl, if true a newline is output when the root's element `El_end signal is output. Defaults to false.
    • @@ -251,7 +249,7 @@

-
val output : output -> signal -> unit
+
val output : output -> signal -> unit
Outputs a signal. After a well-formed sequence of signals was output a new well-formed sequence can be output.

@@ -260,14 +258,18 @@ the output abstraction is not well-formed or if a namespace name could not be bound to a prefix.

-
val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
+
val output_depth : output -> int
+output_depth o is o's current element nesting level (undefined + before the first `El_start and after the last `El_end).
+
+
val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
Outputs signals corresponding to a value by recursively applying the given value deconstructor.

Raises see Xmlm.output.

-
val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
+
val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
Same as Xmlm.output_tree but outputs a complete well-formed sequence of signals.

@@ -275,17 +277,16 @@ Raises see Xmlm.output.


- -

Functorial interface

+

Functorial interface

Xmlm.Make allows client to specify types for strings and internal buffers. Among other things this can be used to perform hash-consing or to process the character stream, e.g. to normalize unicode characters or to convert to a custom encoding.
-

type std_string = string
+
type std_string = string
-
type std_buffer = Buffer.t
+
type std_buffer = Buffer.t 
module type String = sig .. end
Input signature for strings. @@ -301,17 +302,14 @@ Functor building streaming XML IO with the given strings and buffers.

- -

Features and limitations

+

Features and limitations

The module assumes strings are immutable, thus strings the client gives or receives during the input and output process must not be modified. - -

Input

- -

Encoding

+

Input

 +

Encoding

The parser supports ASCII, US-ASCII, @@ -330,8 +328,7 @@ beginning of the document. If there is no BOM it uses the encoding specified in the XML declaration. Finally, if there is no XML declaration UTF-8 is assumed. - -

White space handling

+

White space handling

The parser performs @@ -350,8 +347,7 @@ false all white space data is preserved as present in the document (however all kinds of line ends are - translated to the newline character (U+000A). -

Namespaces

+ translated to the newline character (U+000A).

Namespaces

Xmlm's names are @@ -374,8 +370,7 @@ prefixes by documents, the parser does not report errors on violations of the must constraints listed in this paragraph. - -

Character and entity references

+

Character and entity references

Character references @@ -387,8 +382,7 @@ analysed for further references, it is added to the data as such modulo white space stripping. If entity returns None the error `Unknown_entity_ref is returned. - -

Sequences of documents

+

Sequences of documents

When a well-formed sequence of signals is input, no data is consumed beyond @@ -414,8 +408,7 @@ encoding as for the previous document is used.

- -

Miscellaneous

+

Miscellaneous
  • Parses the more liberal and simpler XML 1.1 Name definition (minus ':' because @@ -436,18 +429,15 @@

    - -

    Output

    - -

    Encoding

    +

    Output

     +

    Encoding

    Outputs only UTF-8 encoded documents (even if you use the functor). Strings given to output functions must be UTF-8 encoded (unless you use the functor, but you need to provide a translation), no checks are - performed. -

    Namespaces

    + performed.

    Namespaces

    Xmlm's names are @@ -479,8 +469,7 @@ will not add any namespace declaration attribute to the output. If the function returns None, Xmlm.output will raise Invalid_argument. The default function returns always None. - -

    Indentation

    +

    Indentation

    Output can be indented by specifying the indent argument when an @@ -490,8 +479,7 @@ (for empty elements `El_start and `El_end are collapsed on a single line) and nested elements are indented with c space characters. - -

    Sequences of documents

    +

    Sequences of documents

    After a well-formed sequence of signals was output, the output @@ -499,8 +487,7 @@ signals.

    - -

    Miscellaneous

    +

    Miscellaneous
    • Output on a channel does not flush it.
    • In attribute and character data you provide, markup @@ -518,8 +505,7 @@

      - -

      Tips

      +

      Tips
      • The best options to do an input/output round trip and preserve as much information as possible is to @@ -527,14 +513,13 @@
      • Complete whitespace control on output is achieved with indent = None and suitable `Data signals
      -
      -
      - -

      Examples

      +

      - -

      Sequential processing

      +

      Examples

       +

      + +

      Sequential processing

      Sequential processing has the advantage that you don't need to get @@ -557,6 +542,8 @@   Xmlm.output o (Xmlm.input i); (* `Dtd *)
        pull i o 0;
        if not (Xmlm.eoi i) then invalid_arg "document not well-formed"

      
+
      
+
     The following function reads a sequence of documents on an
     input channel and outputs it.
 
      let id_seq ic oc = 
      
@@ -593,8 +580,7 @@
   docs i o
      
 
      
 
-    
-
      Tree processing
       
+    
      Tree processing
       
 
      
 
     A document's sequence of signals can be easily converted
@@ -615,8 +601,7 @@
   Xmlm.output_doc_tree frag o t
       
 
      
 
-    
-
      Tabular data processing
      
+    
      Tabular data processing
      
 
      
 
     We show how to process XML data that represents tabular data (some
diff -Nru xmlm-1.0.2/doc/Xmlm.Make.html xmlm-1.1.0/doc/Xmlm.Make.html
--- xmlm-1.0.2/doc/Xmlm.Make.html	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/doc/Xmlm.Make.html	2012-03-17 10:50:32.000000000 +0000
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -43,41 +43,38 @@
 
 
      
 
      
-
-
      Basic types and values

      
-
      type string 
      
+
      Basic types and values

      
+
      type string 
      
 
-
      type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ] 
      
+
      type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ] 
      
 
-
      type dtd = string option 
      
+
      type dtd = string option 
      
 
-
      type name = string * string 
      
+
      type name = string * string 
      
 
-
      type attribute = name * string 
      
+
      type attribute = name * string 
      
 
-
      type tag = name * attribute list 
      
+
      type tag = name * attribute list 
      
 
-
      type signal = [ `Data of string
             | `Dtd of dtd
             | `El_end
             | `El_start of tag ]       
      
+
      type signal = [ `Data of string
             | `Dtd of dtd
             | `El_end
             | `El_start of tag ]       
      
 
-
      val ns_xml : string
      val ns_xmlns : string

      
-
-
      Input

      
-
      type pos = int * int 
      
+
      val ns_xml : string
      val ns_xmlns : string

      
+
      Input

      
+
      type pos = int * int 
      
 
-
      type error = [ `Expected_char_seqs of string list * string
             | `Expected_root_element
             | `Illegal_char_ref of string
             | `Illegal_char_seq of string
             | `Malformed_char_stream
             | `Max_buffer_size
             | `Unexpected_eoi
             | `Unknown_encoding of string
             | `Unknown_entity_ref of string
             | `Unknown_ns_prefix of string ]       
      
+
      type error = [ `Expected_char_seqs of string list * string
             | `Expected_root_element
             | `Illegal_char_ref of string
             | `Illegal_char_seq of string
             | `Malformed_char_stream
             | `Max_buffer_size
             | `Unexpected_eoi
             | `Unknown_encoding of string
             | `Unknown_entity_ref of string
             | `Unknown_ns_prefix of string ]       
      
 
-
      exception Error of pos * error
      
-
      val error_message : error -> string
      type source = [ `Channel of Pervasives.in_channel
             | `Fun of unit -> int
             | `String of int * Xmlm.std_string ]       
      
+
      exception Error of pos * error
      
+
      val error_message : error -> string
      type source = [ `Channel of Pervasives.in_channel
             | `Fun of unit -> int
             | `String of int * Xmlm.std_string ]       
      
 
-
      type input 
      
+
      type input 
      
 
-
      val make_input : ?enc:encoding option ->
             ?strip:bool ->
             ?ns:(string -> string option) ->
             ?entity:(string -> string option) ->
             source -> input
      val input : input -> signal
      val input_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> 'a
      val input_doc_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> dtd * 'a
      val peek : input -> signal
      val eoi : input -> bool
      val pos : input -> pos

      
-
-
      Output

      
-
      type 'a frag = [ `Data of string | `El of tag * 'a list ] 
      
+
      val make_input : ?enc:encoding option ->
             ?strip:bool ->
             ?ns:(string -> string option) ->
             ?entity:(string -> string option) ->
             source -> input
      val input : input -> signal
      val input_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> 'a
      val input_doc_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> dtd * 'a
      val peek : input -> signal
      val eoi : input -> bool
      val pos : input -> pos

      
+
      Output

      
+
      type 'a frag = [ `Data of string | `El of tag * 'a list ] 
      
 
-
      type dest = [ `Buffer of Xmlm.std_buffer
             | `Channel of Pervasives.out_channel
             | `Fun of int -> unit ]       
      
+
      type dest = [ `Buffer of Xmlm.std_buffer
             | `Channel of Pervasives.out_channel
             | `Fun of int -> unit ]       
      
 
-
      type output 
      
+
      type output 
      
 
-
      val make_output : ?nl:bool ->
             ?indent:int option ->
             ?ns_prefix:(string -> string option) ->
             dest -> output
      val output : output -> signal -> unit
      val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
      val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
      
\ No newline at end of file
+
      val make_output : ?decl:bool ->
             ?nl:bool ->
             ?indent:int option ->
             ?ns_prefix:(string -> string option) ->
             dest -> output
      val output_depth : output -> int
      val output : output -> signal -> unit
      val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
      val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
      
\ No newline at end of file
diff -Nru xmlm-1.0.2/doc/Xmlm.S.html xmlm-1.1.0/doc/Xmlm.S.html
--- xmlm-1.0.2/doc/Xmlm.S.html	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/doc/Xmlm.S.html	2012-03-17 10:50:32.000000000 +0000
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -25,41 +25,38 @@
 
      module type S = sig .. end
      Output signature of Xmlm.Make.
      
 
      
 
      
-
-
      Basic types and values

      
-
      type string 
      
+
      Basic types and values

      
+
      type string 
      
 
-
      type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ] 
      
+
      type encoding = [ `ISO_8859_1 | `US_ASCII | `UTF_16 | `UTF_16BE | `UTF_16LE | `UTF_8 ] 
      
 
-
      type dtd = string option 
      
+
      type dtd = string option 
      
 
-
      type name = string * string 
      
+
      type name = string * string 
      
 
-
      type attribute = name * string 
      
+
      type attribute = name * string 
      
 
-
      type tag = name * attribute list 
      
+
      type tag = name * attribute list 
      
 
-
      type signal = [ `Data of string
             | `Dtd of dtd
             | `El_end
             | `El_start of tag ]       
      
+
      type signal = [ `Data of string
             | `Dtd of dtd
             | `El_end
             | `El_start of tag ]       
      
 
-
      val ns_xml : string
      val ns_xmlns : string

      
-
-
      Input

      
-
      type pos = int * int 
      
+
      val ns_xml : string
      val ns_xmlns : string

      
+
      Input

      
+
      type pos = int * int 
      
 
-
      type error = [ `Expected_char_seqs of string list * string
             | `Expected_root_element
             | `Illegal_char_ref of string
             | `Illegal_char_seq of string
             | `Malformed_char_stream
             | `Max_buffer_size
             | `Unexpected_eoi
             | `Unknown_encoding of string
             | `Unknown_entity_ref of string
             | `Unknown_ns_prefix of string ]       
      
+
      type error = [ `Expected_char_seqs of string list * string
             | `Expected_root_element
             | `Illegal_char_ref of string
             | `Illegal_char_seq of string
             | `Malformed_char_stream
             | `Max_buffer_size
             | `Unexpected_eoi
             | `Unknown_encoding of string
             | `Unknown_entity_ref of string
             | `Unknown_ns_prefix of string ]       
      
 
-
      exception Error of pos * error
      
-
      val error_message : error -> string
      type source = [ `Channel of Pervasives.in_channel
             | `Fun of unit -> int
             | `String of int * Xmlm.std_string ]       
      
+
      exception Error of pos * error
      
+
      val error_message : error -> string
      type source = [ `Channel of Pervasives.in_channel
             | `Fun of unit -> int
             | `String of int * Xmlm.std_string ]       
      
 
-
      type input 
      
+
      type input 
      
 
-
      val make_input : ?enc:encoding option ->
             ?strip:bool ->
             ?ns:(string -> string option) ->
             ?entity:(string -> string option) ->
             source -> input
      val input : input -> signal
      val input_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> 'a
      val input_doc_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> dtd * 'a
      val peek : input -> signal
      val eoi : input -> bool
      val pos : input -> pos

      
-
-
      Output

      
-
      type 'a frag = [ `Data of string | `El of tag * 'a list ] 
      
+
      val make_input : ?enc:encoding option ->
             ?strip:bool ->
             ?ns:(string -> string option) ->
             ?entity:(string -> string option) ->
             source -> input
      val input : input -> signal
      val input_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> 'a
      val input_doc_tree : el:(tag -> 'a list -> 'a) ->
             data:(string -> 'a) -> input -> dtd * 'a
      val peek : input -> signal
      val eoi : input -> bool
      val pos : input -> pos

      
+
      Output

      
+
      type 'a frag = [ `Data of string | `El of tag * 'a list ] 
      
 
-
      type dest = [ `Buffer of Xmlm.std_buffer
             | `Channel of Pervasives.out_channel
             | `Fun of int -> unit ]       
      
+
      type dest = [ `Buffer of Xmlm.std_buffer
             | `Channel of Pervasives.out_channel
             | `Fun of int -> unit ]       
      
 
-
      type output 
      
+
      type output 
      
 
-
      val make_output : ?nl:bool ->
             ?indent:int option ->
             ?ns_prefix:(string -> string option) ->
             dest -> output
      val output : output -> signal -> unit
      val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
      val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
      
\ No newline at end of file
+
      val make_output : ?decl:bool ->
             ?nl:bool ->
             ?indent:int option ->
             ?ns_prefix:(string -> string option) ->
             dest -> output
      val output_depth : output -> int
      val output : output -> signal -> unit
      val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
      val output_doc_tree : ('a -> 'a frag) -> output -> dtd * 'a -> unit
      
\ No newline at end of file
diff -Nru xmlm-1.0.2/doc/Xmlm.String.html xmlm-1.1.0/doc/Xmlm.String.html
--- xmlm-1.0.2/doc/Xmlm.String.html	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/doc/Xmlm.String.html	2012-03-17 10:50:32.000000000 +0000
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -21,38 +21,38 @@
 
      
 
      module type String = sig .. end
      Input signature for strings.
      
 
      
-
      type t 
      
+
      type t 
      
 
      
 The type for strings.
      
 
      
 
-
      val empty : t
      
+
      val empty : t
      
 The empty string.
      
 
      
-
      val length : t -> int
      
+
      val length : t -> int
      
 Returns the length of the string.
      
 
      
-
      val append : t -> t -> t
      
+
      val append : t -> t -> t
      
 Concatenates two strings.
      
 
      
-
      val lowercase : t -> t
      
+
      val lowercase : t -> t
      
 New string with uppercase letter translated
       to lowercase (correctness is only needed for ASCII
       code point).
      
 
      
-
      val iter : (int -> unit) -> t -> unit
      
+
      val iter : (int -> unit) -> t -> unit
      
 Iterates over the unicode 
       code point
       of the given string.
      
 
      
-
      val of_string : Xmlm.std_string -> t
      
+
      val of_string : Xmlm.std_string -> t
      
 String from an OCaml string.
      
 
      
-
      val to_utf_8 : ('a -> Xmlm.std_string -> 'a) -> 'a -> t -> 'a
      
+
      val to_utf_8 : ('a -> Xmlm.std_string -> 'a) -> 'a -> t -> 'a
      
 to_utf_8 f v s, is f (... (f (f v s1) s2) ...) sn. Where the
       concatenation of s1, s2, ... sn is s as an UTF-8 stream.
      
 
      
-
      val compare : t -> t -> int
      
+
      val compare : t -> t -> int
      
 String comparison. Binary comparison is sufficent.
      
 
      
 
\ No newline at end of file
diff -Nru xmlm-1.0.2/myocamlbuild.ml xmlm-1.1.0/myocamlbuild.ml
--- xmlm-1.0.2/myocamlbuild.ml	1970-01-01 00:00:00.000000000 +0000
+++ xmlm-1.1.0/myocamlbuild.ml	2012-03-17 10:50:20.000000000 +0000
@@ -0,0 +1,468 @@
+(* OASIS_START *)
+(* DO NOT EDIT (digest: 3e016bf322e1711ce60195c645e24ce2) *)
+module OASISGettext = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISGettext.ml"
+  
+  let ns_ str =
+    str
+  
+  let s_ str =
+    str
+  
+  let f_ (str : ('a, 'b, 'c, 'd) format4) =
+    str
+  
+  let fn_ fmt1 fmt2 n =
+    if n = 1 then
+      fmt1^^""
+    else
+      fmt2^^""
+  
+  let init =
+    []
+  
+end
+
+module OASISExpr = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISExpr.ml"
+  
+  
+  
+  open OASISGettext
+  
+  type test = string 
+  
+  type flag = string 
+  
+  type t =
+    | EBool of bool
+    | ENot of t
+    | EAnd of t * t
+    | EOr of t * t
+    | EFlag of flag
+    | ETest of test * string
+    
+  
+  type 'a choices = (t * 'a) list 
+  
+  let eval var_get t =
+    let rec eval' =
+      function
+        | EBool b ->
+            b
+  
+        | ENot e ->
+            not (eval' e)
+  
+        | EAnd (e1, e2) ->
+            (eval' e1) && (eval' e2)
+  
+        | EOr (e1, e2) ->
+            (eval' e1) || (eval' e2)
+  
+        | EFlag nm ->
+            let v =
+              var_get nm
+            in
+              assert(v = "true" || v = "false");
+              (v = "true")
+  
+        | ETest (nm, vl) ->
+            let v =
+              var_get nm
+            in
+              (v = vl)
+    in
+      eval' t
+  
+  let choose ?printer ?name var_get lst =
+    let rec choose_aux =
+      function
+        | (cond, vl) :: tl ->
+            if eval var_get cond then
+              vl
+            else
+              choose_aux tl
+        | [] ->
+            let str_lst =
+              if lst = [] then
+                s_ ""
+              else
+                String.concat
+                  (s_ ", ")
+                  (List.map
+                     (fun (cond, vl) ->
+                        match printer with
+                          | Some p -> p vl
+                          | None -> s_ "")
+                     lst)
+            in
+              match name with
+                | Some nm ->
+                    failwith
+                      (Printf.sprintf
+                         (f_ "No result for the choice list '%s': %s")
+                         nm str_lst)
+                | None ->
+                    failwith
+                      (Printf.sprintf
+                         (f_ "No result for a choice list: %s")
+                         str_lst)
+    in
+      choose_aux (List.rev lst)
+  
+end
+
+
+module BaseEnvLight = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseEnvLight.ml"
+  
+  module MapString = Map.Make(String)
+  
+  type t = string MapString.t
+  
+  let default_filename =
+    Filename.concat
+      (Sys.getcwd ())
+      "setup.data"
+  
+  let load ?(allow_empty=false) ?(filename=default_filename) () =
+    if Sys.file_exists filename then
+      begin
+        let chn =
+          open_in_bin filename
+        in
+        let st =
+          Stream.of_channel chn
+        in
+        let line =
+          ref 1
+        in
+        let st_line =
+          Stream.from
+            (fun _ ->
+               try
+                 match Stream.next st with
+                   | '\n' -> incr line; Some '\n'
+                   | c -> Some c
+               with Stream.Failure -> None)
+        in
+        let lexer =
+          Genlex.make_lexer ["="] st_line
+        in
+        let rec read_file mp =
+          match Stream.npeek 3 lexer with
+            | [Genlex.Ident nm; Genlex.Kwd "="; Genlex.String value] ->
+                Stream.junk lexer;
+                Stream.junk lexer;
+                Stream.junk lexer;
+                read_file (MapString.add nm value mp)
+            | [] ->
+                mp
+            | _ ->
+                failwith
+                  (Printf.sprintf
+                     "Malformed data file '%s' line %d"
+                     filename !line)
+        in
+        let mp =
+          read_file MapString.empty
+        in
+          close_in chn;
+          mp
+      end
+    else if allow_empty then
+      begin
+        MapString.empty
+      end
+    else
+      begin
+        failwith
+          (Printf.sprintf
+             "Unable to load environment, the file '%s' doesn't exist."
+             filename)
+      end
+  
+  let var_get name env =
+    let rec var_expand str =
+      let buff =
+        Buffer.create ((String.length str) * 2)
+      in
+        Buffer.add_substitute
+          buff
+          (fun var ->
+             try
+               var_expand (MapString.find var env)
+             with Not_found ->
+               failwith
+                 (Printf.sprintf
+                    "No variable %s defined when trying to expand %S."
+                    var
+                    str))
+          str;
+        Buffer.contents buff
+    in
+      var_expand (MapString.find name env)
+  
+  let var_choose lst env =
+    OASISExpr.choose
+      (fun nm -> var_get nm env)
+      lst
+end
+
+
+module MyOCamlbuildFindlib = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml"
+  
+  (** OCamlbuild extension, copied from 
+    * http://brion.inria.fr/gallium/index.php/Using_ocamlfind_with_ocamlbuild
+    * by N. Pouillard and others
+    *
+    * Updated on 2009/02/28
+    *
+    * Modified by Sylvain Le Gall 
+    *)
+  open Ocamlbuild_plugin
+  
+  (* these functions are not really officially exported *)
+  let run_and_read = 
+    Ocamlbuild_pack.My_unix.run_and_read
+  
+  let blank_sep_strings = 
+    Ocamlbuild_pack.Lexers.blank_sep_strings
+  
+  let split s ch =
+    let x = 
+      ref [] 
+    in
+    let rec go s =
+      let pos = 
+        String.index s ch 
+      in
+        x := (String.before s pos)::!x;
+        go (String.after s (pos + 1))
+    in
+      try
+        go s
+      with Not_found -> !x
+  
+  let split_nl s = split s '\n'
+  
+  let before_space s =
+    try
+      String.before s (String.index s ' ')
+    with Not_found -> s
+  
+  (* this lists all supported packages *)
+  let find_packages () =
+    List.map before_space (split_nl & run_and_read "ocamlfind list")
+  
+  (* this is supposed to list available syntaxes, but I don't know how to do it. *)
+  let find_syntaxes () = ["camlp4o"; "camlp4r"]
+  
+  (* ocamlfind command *)
+  let ocamlfind x = S[A"ocamlfind"; x]
+  
+  let dispatch =
+    function
+      | Before_options ->
+          (* by using Before_options one let command line options have an higher priority *)
+          (* on the contrary using After_options will guarantee to have the higher priority *)
+          (* override default commands by ocamlfind ones *)
+          Options.ocamlc     := ocamlfind & A"ocamlc";
+          Options.ocamlopt   := ocamlfind & A"ocamlopt";
+          Options.ocamldep   := ocamlfind & A"ocamldep";
+          Options.ocamldoc   := ocamlfind & A"ocamldoc";
+          Options.ocamlmktop := ocamlfind & A"ocamlmktop"
+                                  
+      | After_rules ->
+          
+          (* When one link an OCaml library/binary/package, one should use -linkpkg *)
+          flag ["ocaml"; "link"; "program"] & A"-linkpkg";
+          
+          (* For each ocamlfind package one inject the -package option when
+           * compiling, computing dependencies, generating documentation and
+           * linking. *)
+          List.iter 
+            begin fun pkg ->
+              flag ["ocaml"; "compile";  "pkg_"^pkg] & S[A"-package"; A pkg];
+              flag ["ocaml"; "ocamldep"; "pkg_"^pkg] & S[A"-package"; A pkg];
+              flag ["ocaml"; "doc";      "pkg_"^pkg] & S[A"-package"; A pkg];
+              flag ["ocaml"; "link";     "pkg_"^pkg] & S[A"-package"; A pkg];
+              flag ["ocaml"; "infer_interface"; "pkg_"^pkg] & S[A"-package"; A pkg];
+            end 
+            (find_packages ());
+  
+          (* Like -package but for extensions syntax. Morover -syntax is useless
+           * when linking. *)
+          List.iter begin fun syntax ->
+          flag ["ocaml"; "compile";  "syntax_"^syntax] & S[A"-syntax"; A syntax];
+          flag ["ocaml"; "ocamldep"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
+          flag ["ocaml"; "doc";      "syntax_"^syntax] & S[A"-syntax"; A syntax];
+          flag ["ocaml"; "infer_interface"; "syntax_"^syntax] & S[A"-syntax"; A syntax];
+          end (find_syntaxes ());
+  
+          (* The default "thread" tag is not compatible with ocamlfind.
+           * Indeed, the default rules add the "threads.cma" or "threads.cmxa"
+           * options when using this tag. When using the "-linkpkg" option with
+           * ocamlfind, this module will then be added twice on the command line.
+           *                        
+           * To solve this, one approach is to add the "-thread" option when using
+           * the "threads" package using the previous plugin.
+           *)
+          flag ["ocaml"; "pkg_threads"; "compile"] (S[A "-thread"]);
+          flag ["ocaml"; "pkg_threads"; "doc"] (S[A "-I"; A "+threads"]);
+          flag ["ocaml"; "pkg_threads"; "link"] (S[A "-thread"]);
+          flag ["ocaml"; "pkg_threads"; "infer_interface"] (S[A "-thread"])
+  
+      | _ -> 
+          ()
+  
+end
+
+module MyOCamlbuildBase = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+  
+  (** Base functions for writing myocamlbuild.ml
+      @author Sylvain Le Gall
+    *)
+  
+  
+  
+  open Ocamlbuild_plugin
+  
+  type dir = string 
+  type file = string 
+  type name = string 
+  type tag = string 
+  
+# 55 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/MyOCamlbuildBase.ml"
+  
+  type t =
+      {
+        lib_ocaml: (name * dir list) list;
+        lib_c:     (name * dir * file list) list; 
+        flags:     (tag list * (spec OASISExpr.choices)) list;
+      } 
+  
+  let env_filename =
+    Pathname.basename 
+      BaseEnvLight.default_filename
+  
+  let dispatch_combine lst =
+    fun e ->
+      List.iter 
+        (fun dispatch -> dispatch e)
+        lst 
+  
+  let dispatch t e = 
+    let env = 
+      BaseEnvLight.load 
+        ~filename:env_filename 
+        ~allow_empty:true
+        ()
+    in
+      match e with 
+        | Before_options ->
+            let no_trailing_dot s =
+              if String.length s >= 1 && s.[0] = '.' then
+                String.sub s 1 ((String.length s) - 1)
+              else
+                s
+            in
+              List.iter
+                (fun (opt, var) ->
+                   try 
+                     opt := no_trailing_dot (BaseEnvLight.var_get var env)
+                   with Not_found ->
+                     Printf.eprintf "W: Cannot get variable %s" var)
+                [
+                  Options.ext_obj, "ext_obj";
+                  Options.ext_lib, "ext_lib";
+                  Options.ext_dll, "ext_dll";
+                ]
+  
+        | After_rules -> 
+            (* Declare OCaml libraries *)
+            List.iter 
+              (function
+                 | lib, [] ->
+                     ocaml_lib lib;
+                 | lib, dir :: tl ->
+                     ocaml_lib ~dir:dir lib;
+                     List.iter 
+                       (fun dir -> 
+                          flag 
+                            ["ocaml"; "use_"^lib; "compile"] 
+                            (S[A"-I"; P dir]))
+                       tl)
+              t.lib_ocaml;
+  
+            (* Declare C libraries *)
+            List.iter
+              (fun (lib, dir, headers) ->
+                   (* Handle C part of library *)
+                   flag ["link"; "library"; "ocaml"; "byte"; "use_lib"^lib]
+                     (S[A"-dllib"; A("-l"^lib); A"-cclib"; A("-l"^lib)]);
+  
+                   flag ["link"; "library"; "ocaml"; "native"; "use_lib"^lib]
+                     (S[A"-cclib"; A("-l"^lib)]);
+                        
+                   flag ["link"; "program"; "ocaml"; "byte"; "use_lib"^lib]
+                     (S[A"-dllib"; A("dll"^lib)]);
+  
+                   (* When ocaml link something that use the C library, then one
+                      need that file to be up to date.
+                    *)
+                   dep  ["link"; "ocaml"; "program"; "use_lib"^lib]
+                     [dir/"lib"^lib^"."^(!Options.ext_lib)];
+  
+                   dep  ["compile"; "ocaml"; "program"; "use_lib"^lib]
+                     [dir/"lib"^lib^"."^(!Options.ext_lib)];
+  
+                   (* TODO: be more specific about what depends on headers *)
+                   (* Depends on .h files *)
+                   dep ["compile"; "c"] 
+                     headers;
+  
+                   (* Setup search path for lib *)
+                   flag ["link"; "ocaml"; "use_"^lib] 
+                     (S[A"-I"; P(dir)]);
+              )
+              t.lib_c;
+  
+              (* Add flags *)
+              List.iter
+              (fun (tags, cond_specs) ->
+                 let spec = 
+                   BaseEnvLight.var_choose cond_specs env
+                 in
+                   flag tags & spec)
+              t.flags
+        | _ -> 
+            ()
+  
+  let dispatch_default t =
+    dispatch_combine 
+      [
+        dispatch t;
+        MyOCamlbuildFindlib.dispatch;
+      ]
+  
+end
+
+
+open Ocamlbuild_plugin;;
+let package_default =
+  {
+     MyOCamlbuildBase.lib_ocaml = [("src/xmlm", ["src"])];
+     lib_c = [];
+     flags = [];
+     }
+  ;;
+
+let dispatch_default = MyOCamlbuildBase.dispatch_default package_default;;
+
+# 467 "myocamlbuild.ml"
+(* OASIS_STOP *)
+Ocamlbuild_plugin.dispatch dispatch_default;;
diff -Nru xmlm-1.0.2/_oasis xmlm-1.1.0/_oasis
--- xmlm-1.0.2/_oasis	1970-01-01 00:00:00.000000000 +0000
+++ xmlm-1.1.0/_oasis	2012-03-17 10:50:20.000000000 +0000
@@ -0,0 +1,52 @@
+OASISFormat: 0.3
+Name: xmlm
+Version: 1.1.0
+Synopsis: Streaming XML IO for OCaml
+Authors: Daniel Bünzli 
+Copyrights: (c) 2007-2012 Daniel C. Bünzli
+License: BSD3
+Homepage: http://erratique.ch/software/xmlm
+Description:
+ Xmlm is an OCaml module for streaming XML IO. It aims at making XML
+ processing robust and painless. The streaming interface can process
+ documents without building an in-memory representation. It lets the
+ programmer translate its data structures to XML documents and
+ vice-versa. Functions are provided to easily transform arborescent
+ data structures to/from XML documents. 
+ .
+ Xmlm is made of a single independent module and distributed under the
+ BSD3 license.
+
+OCamlVersion: >= 3.10.0
+Plugins: META (0.3)
+BuildTools:ocamlbuild
+
+Library xmlm
+ Path: src
+ Modules: Xmlm
+
+Executable xmltrip
+ Path: test
+ MainIs: xmltrip.ml
+ BuildDepends: xmlm
+ CompiledObject: best
+
+Document api
+ Title: Xmlm's documentation and API reference
+ Type: ocamlbuild (0.3)
+ BuildTools+: ocamldoc
+ XOCamlbuildLibraries: xmlm
+ XOCamlbuildPath: doc
+
+Document distribution
+ Title: "Xmlm's README and CHANGES files"
+ DataFiles: README CHANGES
+
+Document samples
+ Title: "Xmlm's sample code"
+ DataFiles: test/*.ml
+
+SourceRepository head
+ Type: git
+ Location: git://erratique.ch/repos/xmlm.git
+ Browser: http://erratique.ch/repos/xmlm
diff -Nru xmlm-1.0.2/.ocamlinit xmlm-1.1.0/.ocamlinit
--- xmlm-1.0.2/.ocamlinit	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/.ocamlinit	2012-03-17 10:50:20.000000000 +0000
@@ -1,2 +1,2 @@
 #directory "_build/src"
-#load "xmlm.cmo"
\ No newline at end of file
+#load "xmlm.cmo"
diff -Nru xmlm-1.0.2/README xmlm-1.1.0/README
--- xmlm-1.0.2/README	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/README	2012-03-17 10:50:20.000000000 +0000
@@ -1,55 +1,66 @@
-...............................................................................
-Xmlm - Streaming XML input/output for OCaml
-       Release 1.0.2
-...............................................................................
-
-Xmlm is an OCaml module for streaming XML input/output. It aims
-at making XML processing robust and painless. The streaming interface
-can process documents without building an in-memory representation. It
-lets the programmer translate its data structures to XML documents and
+-------------------------------------------------------------------------------
+Xmlm - Streaming XML IO for OCaml
+       Release 1.1.0
+-------------------------------------------------------------------------------
+
+Xmlm is an OCaml module for streaming XML IO. It aims at making XML
+processing robust and painless. The streaming interface can process
+documents without building an in-memory representation. It lets the
+programmer translate its data structures to XML documents and
 vice-versa. Functions are provided to easily transform arborescent
 data structures to/from XML documents.
 
-To facilitate its integration into projects Xmlm is made of a single
-module and distributed under the new BSD license.
+Xmlm is made of a single independent module and distributed under the
+BSD3 license. 
 
-Project home page : http://erratique.ch/software/xmlm
-Contact : daniel.buenzl i@erratique.ch
+Home page: http://erratique.ch/software/xmlm
+Contact: Daniel Bünzli 
 
 
-# Installation
+Installation
+------------
 
-Xmlm was tested with OCaml 3.10. xmlm.mli and xmlm.ml contain everything,
-the code, the documentation and the license. You can just copy them to
-your project directory or better, if you use ocamlbuild, issue the following
-commands from the root directory of your project :
+To install Xmlm you need at least : 
 
- > ln -s /path/to/xmlm-1.0.2/src xmlm
- > echo " : include" >> _tags
+    OCaml >= 3.10.0  
 
-The documentation is generated by ocamldoc from xmlm.mli. You can find
-a generated version in the doc/ directory of the distribution.
+If you have `findlib`, it can be installed by typing :
 
-If you have ocamlbuild, Xmlm can be installed in the xmlm/ directory 
-of `ocamlc -where` by typing :
- 
-  > ./build 
-  > ./build install 
+    ocaml setup.ml -configure
+    ocaml setup.ml -build 
+    ocaml setup.ml -install
 
-to install to a different location :
+If you don't, `xmlm.mli` and `xmlm.ml` contain everything, the
+code, the documentation and the license. Install the dependencies and
+use the sources the way you want. For example if you use `ocamlbuild`
+you can issue the following commands from the root directory of your
+project:
 
-  > INSTALLDIR=/path/to/install/dir ./build install 
+    ln -s /path/to/xmlm-1.1.0/src xmlm
+    echo " : include" >> _tags
 
-A test program, xmltrip, is provided in the test/ directory. It can
+
+Documentation
+-------------
+
+The documentation and API reference is automatically generated by
+`ocamldoc` from `xmlm.mli`. For you convenience you can find a
+generated version in the `doc` directory of the distribution.
+
+
+Sample programs
+---------------
+
+A test program, `xmltrip`, is provided in the `test` directory. It can
 be built with :
 
-  > ./build xmltrip.native
+    ocamlbuild test/xmltrip.native
 
-xmltrip reads XML files with Xmlm and outputs them back in various
-ways. It is useful to understand how Xmlm handles documents. xmltrip
--help has more information.
+`xmltrip` reads XML files with Xmlm and outputs them back in various
+ways. It is useful to understand how Xmlm handles documents. `xmltrip
+-help` has more information.
 
-If you need to parse XHTML, there is a file named xhtml.ml in the
-test/ directory. It contains an OCaml list coupling each XHTML
+If you need to parse XHTML, there is a file named `xhtml.ml` in the
+`test` directory. It contains an OCaml list coupling each XHTML
 character entity with its corresponding UTF-8 encoded character
-string. You can use it to program a suitable entity callback.
\ No newline at end of file
+string. You can use it to program a suitable entity callback.
diff -Nru xmlm-1.0.2/setup.ml xmlm-1.1.0/setup.ml
--- xmlm-1.0.2/setup.ml	1970-01-01 00:00:00.000000000 +0000
+++ xmlm-1.1.0/setup.ml	2012-03-17 10:50:20.000000000 +0000
@@ -0,0 +1,5311 @@
+(* setup.ml generated for the first time by OASIS v0.3.0~rc2 *)
+
+(* OASIS_START *)
+(* DO NOT EDIT (digest: b6dff1c12de9bf95ca2991ef1570aa1a) *)
+(*
+   Regenerated by OASIS v0.3.0~rc2
+   Visit http://oasis.forge.ocamlcore.org for more information and
+   documentation about functions used in this file.
+*)
+module OASISGettext = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISGettext.ml"
+  
+  let ns_ str =
+    str
+  
+  let s_ str =
+    str
+  
+  let f_ (str : ('a, 'b, 'c, 'd) format4) =
+    str
+  
+  let fn_ fmt1 fmt2 n =
+    if n = 1 then
+      fmt1^^""
+    else
+      fmt2^^""
+  
+  let init =
+    []
+  
+end
+
+module OASISContext = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISContext.ml"
+  
+  open OASISGettext
+  
+  type level =
+    [ `Debug
+    | `Info
+    | `Warning
+    | `Error]
+  
+  type t =
+    {
+      verbose:               bool;
+      debug:                 bool;
+      ignore_plugins:        bool;
+      ignore_unknown_fields: bool;
+      printf:                level -> string -> unit;
+    }
+  
+  let printf lvl str =
+    let beg =
+      match lvl with
+        | `Error -> s_ "E: "
+        | `Warning -> s_ "W: "
+        | `Info  -> s_ "I: "
+        | `Debug -> s_ "D: "
+    in
+      prerr_endline (beg^str)
+  
+  let default =
+    ref
+      {
+        verbose               = true;
+        debug                 = false;
+        ignore_plugins        = false;
+        ignore_unknown_fields = false;
+        printf                = printf;
+      }
+  
+  let quiet =
+    {!default with
+         verbose = false;
+         debug   = false;
+    }
+  
+  
+  let args () =
+    ["-quiet",
+     Arg.Unit (fun () -> default := {!default with verbose = false}),
+     (s_ " Run quietly");
+  
+     "-debug",
+     Arg.Unit (fun () -> default := {!default with debug = true}),
+     (s_ " Output debug message")]
+end
+
+module OASISUtils = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISUtils.ml"
+  
+  open OASISGettext
+  
+  module MapString = Map.Make(String)
+  
+  let map_string_of_assoc assoc =
+    List.fold_left
+      (fun acc (k, v) -> MapString.add k v acc)
+      MapString.empty
+      assoc
+  
+  module SetString = Set.Make(String)
+  
+  let set_string_add_list st lst =
+    List.fold_left
+      (fun acc e -> SetString.add e acc)
+      st
+      lst
+  
+  let set_string_of_list =
+    set_string_add_list
+      SetString.empty
+  
+  
+  let compare_csl s1 s2 =
+    String.compare (String.lowercase s1) (String.lowercase s2)
+  
+  module HashStringCsl =
+    Hashtbl.Make
+      (struct
+         type t = string
+  
+         let equal s1 s2 =
+             (String.lowercase s1) = (String.lowercase s2)
+  
+         let hash s =
+           Hashtbl.hash (String.lowercase s)
+       end)
+  
+  let split sep str =
+    let str_len =
+      String.length str
+    in
+    let rec split_aux acc pos =
+      if pos < str_len then
+        (
+          let pos_sep =
+            try
+              String.index_from str pos sep
+            with Not_found ->
+              str_len
+          in
+          let part =
+            String.sub str pos (pos_sep - pos)
+          in
+          let acc =
+            part :: acc
+          in
+            if pos_sep >= str_len then
+              (
+                (* Nothing more in the string *)
+                List.rev acc
+              )
+            else if pos_sep = (str_len - 1) then
+              (
+                (* String end with a separator *)
+                List.rev ("" :: acc)
+              )
+            else
+              (
+                split_aux acc (pos_sep + 1)
+              )
+        )
+      else
+        (
+          List.rev acc
+        )
+    in
+      split_aux [] 0
+  
+  
+  let varname_of_string ?(hyphen='_') s =
+    if String.length s = 0 then
+      begin
+        invalid_arg "varname_of_string"
+      end
+    else
+      begin
+        let buff =
+          Buffer.create (String.length s)
+        in
+          (* Start with a _ if digit *)
+          if '0' <= s.[0] && s.[0] <= '9' then
+            Buffer.add_char buff hyphen;
+  
+          String.iter
+            (fun c ->
+               if ('a' <= c && c <= 'z')
+                 ||
+                  ('A' <= c && c <= 'Z')
+                 ||
+                  ('0' <= c && c <= '9') then
+                 Buffer.add_char buff c
+               else
+                 Buffer.add_char buff hyphen)
+            s;
+  
+          String.lowercase (Buffer.contents buff)
+      end
+  
+  let varname_concat ?(hyphen='_') p s =
+    let p =
+      let p_len =
+        String.length p
+      in
+        if p_len > 0 && p.[p_len - 1] = hyphen then
+          String.sub p 0 (p_len - 1)
+        else
+          p
+    in
+    let s =
+      let s_len =
+        String.length s
+      in
+        if s_len > 0 && s.[0] = hyphen then
+          String.sub s 1 (s_len - 1)
+        else
+          s
+    in
+      Printf.sprintf "%s%c%s" p hyphen s
+  
+  
+  let is_varname str =
+    str = varname_of_string str
+  
+  let failwithf fmt = Printf.ksprintf failwith fmt
+  
+end
+
+module PropList = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/PropList.ml"
+  
+  open OASISGettext
+  
+  type name = string
+  
+  exception Not_set of name * string option
+  exception No_printer of name
+  exception Unknown_field of name * name
+  
+  let () =
+    Printexc.register_printer
+      (function
+         | Not_set (nm, Some rsn) ->
+             Some 
+               (Printf.sprintf (f_ "Field '%s' is not set: %s") nm rsn)
+         | Not_set (nm, None) ->
+             Some 
+               (Printf.sprintf (f_ "Field '%s' is not set") nm)
+         | No_printer nm ->
+             Some
+               (Printf.sprintf (f_ "No default printer for value %s") nm)
+         | Unknown_field (nm, schm) ->
+             Some 
+               (Printf.sprintf (f_ "Field %s is not defined in schema %s") nm schm)
+         | _ ->
+             None)
+  
+  module Data =
+  struct
+  
+    type t =
+        (name, unit -> unit) Hashtbl.t
+  
+    let create () =
+      Hashtbl.create 13
+  
+    let clear t =
+      Hashtbl.clear t
+  
+# 71 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/PropList.ml"
+  end
+  
+  module Schema =
+  struct
+  
+    type ('ctxt, 'extra) value =
+        {
+          get:   Data.t -> string;
+          set:   Data.t -> ?context:'ctxt -> string -> unit;
+          help:  (unit -> string) option;
+          extra: 'extra;
+        }
+  
+    type ('ctxt, 'extra) t =
+        {
+          name:      name;
+          fields:    (name, ('ctxt, 'extra) value) Hashtbl.t;
+          order:     name Queue.t;
+          name_norm: string -> string;
+        }
+  
+    let create ?(case_insensitive=false) nm =
+      {
+        name      = nm;
+        fields    = Hashtbl.create 13;
+        order     = Queue.create ();
+        name_norm =
+          (if case_insensitive then
+             String.lowercase
+           else
+             fun s -> s);
+      }
+  
+    let add t nm set get extra help =
+      let key =
+        t.name_norm nm
+      in
+  
+        if Hashtbl.mem t.fields key then
+          failwith
+            (Printf.sprintf
+               (f_ "Field '%s' is already defined in schema '%s'")
+               nm t.name);
+        Hashtbl.add
+          t.fields
+          key
+          {
+            set   = set;
+            get   = get;
+            help  = help;
+            extra = extra;
+          };
+        Queue.add nm t.order
+  
+    let mem t nm =
+      Hashtbl.mem t.fields nm
+  
+    let find t nm =
+      try
+        Hashtbl.find t.fields (t.name_norm nm)
+      with Not_found ->
+        raise (Unknown_field (nm, t.name))
+  
+    let get t data nm =
+      (find t nm).get data
+  
+    let set t data nm ?context x =
+      (find t nm).set
+        data
+        ?context
+        x
+  
+    let fold f acc t =
+      Queue.fold
+        (fun acc k ->
+           let v =
+             find t k
+           in
+             f acc k v.extra v.help)
+        acc
+        t.order
+  
+    let iter f t =
+      fold
+        (fun () -> f)
+        ()
+        t
+  
+    let name t =
+      t.name
+  end
+  
+  module Field =
+  struct
+  
+    type ('ctxt, 'value, 'extra) t =
+        {
+          set:    Data.t -> ?context:'ctxt -> 'value -> unit;
+          get:    Data.t -> 'value;
+          sets:   Data.t -> ?context:'ctxt -> string -> unit;
+          gets:   Data.t -> string;
+          help:   (unit -> string) option;
+          extra:  'extra;
+        }
+  
+    let new_id =
+      let last_id =
+        ref 0
+      in
+        fun () -> incr last_id; !last_id
+  
+    let create ?schema ?name ?parse ?print ?default ?update ?help extra =
+      (* Default value container *)
+      let v =
+        ref None
+      in
+  
+      (* If name is not given, create unique one *)
+      let nm =
+        match name with
+          | Some s -> s
+          | None -> Printf.sprintf "_anon_%d" (new_id ())
+      in
+  
+      (* Last chance to get a value: the default *)
+      let default () =
+        match default with
+          | Some d -> d
+          | None -> raise (Not_set (nm, Some (s_ "no default value")))
+      in
+  
+      (* Get data *)
+      let get data =
+        (* Get value *)
+        try
+          (Hashtbl.find data nm) ();
+          match !v with
+            | Some x -> x
+            | None -> default ()
+        with Not_found ->
+          default ()
+      in
+  
+      (* Set data *)
+      let set data ?context x =
+        let x =
+          match update with
+            | Some f ->
+                begin
+                  try
+                    f ?context (get data) x
+                  with Not_set _ ->
+                    x
+                end
+            | None ->
+                x
+        in
+          Hashtbl.replace
+            data
+            nm
+            (fun () -> v := Some x)
+      in
+  
+      (* Parse string value, if possible *)
+      let parse =
+        match parse with
+          | Some f ->
+              f
+          | None ->
+              fun ?context s ->
+                failwith
+                  (Printf.sprintf
+                     (f_ "Cannot parse field '%s' when setting value %S")
+                     nm
+                     s)
+      in
+  
+      (* Set data, from string *)
+      let sets data ?context s =
+        set ?context data (parse ?context s)
+      in
+  
+      (* Output value as string, if possible *)
+      let print =
+        match print with
+          | Some f ->
+              f
+          | None ->
+              fun _ -> raise (No_printer nm)
+      in
+  
+      (* Get data, as a string *)
+      let gets data =
+        print (get data)
+      in
+  
+        begin
+          match schema with
+            | Some t ->
+                Schema.add t nm sets gets extra help
+            | None ->
+                ()
+        end;
+  
+        {
+          set   = set;
+          get   = get;
+          sets  = sets;
+          gets  = gets;
+          help  = help;
+          extra = extra;
+        }
+  
+    let fset data t ?context x =
+      t.set data ?context x
+  
+    let fget data t =
+      t.get data
+  
+    let fsets data t ?context s =
+      t.sets data ?context s
+  
+    let fgets data t =
+      t.gets data
+  
+  end
+  
+  module FieldRO =
+  struct
+  
+    let create ?schema ?name ?parse ?print ?default ?update ?help extra =
+      let fld =
+        Field.create ?schema ?name ?parse ?print ?default ?update ?help extra
+      in
+        fun data -> Field.fget data fld
+  
+  end
+end
+
+module OASISMessage = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISMessage.ml"
+  
+  
+  open OASISGettext
+  open OASISContext
+  
+  let generic_message ~ctxt lvl fmt =
+    let cond =
+      match lvl with
+        | `Debug -> ctxt.debug
+        | _ -> ctxt.verbose
+    in
+      Printf.ksprintf
+        (fun str ->
+           if cond then
+             begin
+               ctxt.printf lvl str
+             end)
+        fmt
+  
+  let debug ~ctxt fmt =
+    generic_message ~ctxt `Debug fmt
+  
+  let info ~ctxt fmt =
+    generic_message ~ctxt `Info fmt
+  
+  let warning ~ctxt fmt =
+    generic_message ~ctxt `Warning fmt
+  
+  let error ~ctxt fmt =
+    generic_message ~ctxt `Error fmt
+  
+end
+
+module OASISVersion = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISVersion.ml"
+  
+  open OASISGettext
+  
+  
+  
+  type s = string
+  
+  type t = string 
+  
+  type comparator =
+    | VGreater of t
+    | VGreaterEqual of t
+    | VEqual of t
+    | VLesser of t
+    | VLesserEqual of t
+    | VOr of  comparator * comparator
+    | VAnd of comparator * comparator
+    
+  
+  (* Range of allowed characters *)
+  let is_digit c =
+    '0' <= c && c <= '9'
+  
+  let is_alpha c =
+    ('a' <= c && c <= 'z') || ('A' <= c && c <= 'Z')
+  
+  let is_special =
+    function
+      | '.' | '+' | '-' | '~' -> true
+      | _ -> false
+  
+  let rec version_compare v1 v2 =
+    if v1 <> "" || v2 <> "" then
+      begin
+        (* Compare ascii string, using special meaning for version
+         * related char
+         *)
+        let val_ascii c =
+          if c = '~' then -1
+          else if is_digit c then 0
+          else if c = '\000' then 0
+          else if is_alpha c then Char.code c
+          else (Char.code c) + 256
+        in
+  
+        let len1 = String.length v1 in
+        let len2 = String.length v2 in
+  
+        let p = ref 0 in
+  
+        (** Compare ascii part *)
+        let compare_vascii () =
+          let cmp = ref 0 in
+          while !cmp = 0 &&
+                !p < len1 && !p < len2 &&
+                not (is_digit v1.[!p] && is_digit v2.[!p]) do
+            cmp := (val_ascii v1.[!p]) - (val_ascii v2.[!p]);
+            incr p
+          done;
+          if !cmp = 0 && !p < len1 && !p = len2 then
+            val_ascii v1.[!p]
+          else if !cmp = 0 && !p = len1 && !p < len2 then
+            - (val_ascii v2.[!p])
+          else
+            !cmp
+        in
+  
+        (** Compare digit part *)
+        let compare_digit () =
+          let extract_int v p =
+            let start_p = !p in
+              while !p < String.length v && is_digit v.[!p] do
+                incr p
+              done;
+              let substr = 
+                String.sub v !p ((String.length v) - !p)
+              in 
+              let res = 
+                match String.sub v start_p (!p - start_p) with 
+                  | "" -> 0
+                  | s -> int_of_string s
+              in
+                res, substr
+          in
+          let i1, tl1 = extract_int v1 (ref !p) in
+          let i2, tl2 = extract_int v2 (ref !p) in
+            i1 - i2, tl1, tl2
+        in
+  
+          match compare_vascii () with
+            | 0 ->
+                begin
+                  match compare_digit () with
+                    | 0, tl1, tl2 ->
+                        if tl1 <> "" && is_digit tl1.[0] then
+                          1
+                        else if tl2 <> "" && is_digit tl2.[0] then
+                          -1
+                        else
+                          version_compare tl1 tl2
+                    | n, _, _ ->
+                        n
+                end
+            | n ->
+                n
+      end
+    else
+      begin
+        0
+      end
+  
+  
+  let version_of_string str =
+    String.iter
+      (fun c ->
+         if is_alpha c || is_digit c || is_special c then
+           ()
+         else
+           failwith
+             (Printf.sprintf
+                (f_ "Char %C is not allowed in version '%s'")
+                c str))
+      str;
+    str
+  
+  let string_of_version t =
+    t
+  
+  let chop t =
+    try
+      let pos =
+        String.rindex t '.'
+      in
+        String.sub t 0 pos
+    with Not_found ->
+      t
+  
+  let rec comparator_apply v op =
+    match op with
+      | VGreater cv ->
+          (version_compare v cv) > 0
+      | VGreaterEqual cv ->
+          (version_compare v cv) >= 0
+      | VLesser cv ->
+          (version_compare v cv) < 0
+      | VLesserEqual cv ->
+          (version_compare v cv) <= 0
+      | VEqual cv ->
+          (version_compare v cv) = 0
+      | VOr (op1, op2) ->
+          (comparator_apply v op1) || (comparator_apply v op2)
+      | VAnd (op1, op2) ->
+          (comparator_apply v op1) && (comparator_apply v op2)
+  
+  let rec string_of_comparator =
+    function
+      | VGreater v  -> "> "^(string_of_version v)
+      | VEqual v    -> "= "^(string_of_version v)
+      | VLesser v   -> "< "^(string_of_version v)
+      | VGreaterEqual v -> ">= "^(string_of_version v)
+      | VLesserEqual v  -> "<= "^(string_of_version v)
+      | VOr (c1, c2)  ->
+          (string_of_comparator c1)^" || "^(string_of_comparator c2)
+      | VAnd (c1, c2) ->
+          (string_of_comparator c1)^" && "^(string_of_comparator c2)
+  
+  let rec varname_of_comparator =
+    let concat p v =
+      OASISUtils.varname_concat
+        p
+        (OASISUtils.varname_of_string
+           (string_of_version v))
+    in
+      function
+        | VGreater v -> concat "gt" v
+        | VLesser v  -> concat "lt" v
+        | VEqual v   -> concat "eq" v
+        | VGreaterEqual v -> concat "ge" v
+        | VLesserEqual v  -> concat "le" v
+        | VOr (c1, c2) ->
+            (varname_of_comparator c1)^"_or_"^(varname_of_comparator c2)
+        | VAnd (c1, c2) ->
+            (varname_of_comparator c1)^"_and_"^(varname_of_comparator c2)
+  
+end
+
+module OASISLicense = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISLicense.ml"
+  
+  (** License for _oasis fields
+      @author Sylvain Le Gall
+    *)
+  
+  
+  
+  type license = string 
+  
+  type license_exception = string 
+  
+  type license_version =
+    | Version of OASISVersion.t
+    | VersionOrLater of OASISVersion.t
+    | NoVersion
+    
+  
+  type license_dep_5 =
+      {
+        license:    license;
+        exceptions: license_exception list;
+        version:    license_version;
+      } 
+  
+  type t =
+    | DEP5License of license_dep_5
+    | OtherLicense of string (* URL *)
+    
+  
+end
+
+module OASISExpr = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISExpr.ml"
+  
+  
+  
+  open OASISGettext
+  
+  type test = string 
+  
+  type flag = string 
+  
+  type t =
+    | EBool of bool
+    | ENot of t
+    | EAnd of t * t
+    | EOr of t * t
+    | EFlag of flag
+    | ETest of test * string
+    
+  
+  type 'a choices = (t * 'a) list 
+  
+  let eval var_get t =
+    let rec eval' =
+      function
+        | EBool b ->
+            b
+  
+        | ENot e ->
+            not (eval' e)
+  
+        | EAnd (e1, e2) ->
+            (eval' e1) && (eval' e2)
+  
+        | EOr (e1, e2) ->
+            (eval' e1) || (eval' e2)
+  
+        | EFlag nm ->
+            let v =
+              var_get nm
+            in
+              assert(v = "true" || v = "false");
+              (v = "true")
+  
+        | ETest (nm, vl) ->
+            let v =
+              var_get nm
+            in
+              (v = vl)
+    in
+      eval' t
+  
+  let choose ?printer ?name var_get lst =
+    let rec choose_aux =
+      function
+        | (cond, vl) :: tl ->
+            if eval var_get cond then
+              vl
+            else
+              choose_aux tl
+        | [] ->
+            let str_lst =
+              if lst = [] then
+                s_ ""
+              else
+                String.concat
+                  (s_ ", ")
+                  (List.map
+                     (fun (cond, vl) ->
+                        match printer with
+                          | Some p -> p vl
+                          | None -> s_ "")
+                     lst)
+            in
+              match name with
+                | Some nm ->
+                    failwith
+                      (Printf.sprintf
+                         (f_ "No result for the choice list '%s': %s")
+                         nm str_lst)
+                | None ->
+                    failwith
+                      (Printf.sprintf
+                         (f_ "No result for a choice list: %s")
+                         str_lst)
+    in
+      choose_aux (List.rev lst)
+  
+end
+
+module OASISTypes = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISTypes.ml"
+  
+  
+  
+  
+  type name          = string 
+  type package_name  = string 
+  type url           = string 
+  type unix_dirname  = string 
+  type unix_filename = string 
+  type host_dirname  = string 
+  type host_filename = string 
+  type prog          = string 
+  type arg           = string 
+  type args          = string list 
+  type command_line  = (prog * arg list) 
+  
+  type findlib_name = string 
+  type findlib_full = string 
+  
+  type compiled_object =
+    | Byte
+    | Native
+    | Best
+    
+  
+  type dependency =
+    | FindlibPackage of findlib_full * OASISVersion.comparator option
+    | InternalLibrary of name
+    
+  
+  type tool =
+    | ExternalTool of name
+    | InternalExecutable of name
+    
+  
+  type vcs =
+    | Darcs
+    | Git
+    | Svn
+    | Cvs
+    | Hg
+    | Bzr
+    | Arch
+    | Monotone
+    | OtherVCS of url
+    
+  
+  type plugin_kind =
+      [  `Configure
+       | `Build
+       | `Doc
+       | `Test
+       | `Install
+       | `Extra
+      ]
+  
+  type plugin_data_purpose =
+      [  `Configure
+       | `Build
+       | `Install
+       | `Clean
+       | `Distclean
+       | `Install
+       | `Uninstall
+       | `Test
+       | `Doc
+       | `Extra
+       | `Other of string
+      ]
+  
+  type 'a plugin = 'a * name * OASISVersion.t option 
+  
+  type all_plugin = plugin_kind plugin
+  
+  type plugin_data = (all_plugin * plugin_data_purpose * (unit -> unit)) list
+  
+# 102 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISTypes.ml"
+  
+  type 'a conditional = 'a OASISExpr.choices 
+  
+  type custom =
+      {
+        pre_command:  (command_line option) conditional;
+        post_command: (command_line option) conditional;
+      }
+      
+  
+  type common_section =
+      {
+        cs_name: name;
+        cs_data: PropList.Data.t;
+        cs_plugin_data: plugin_data;
+      }
+      
+  
+  type build_section =
+      {
+        bs_build:           bool conditional;
+        bs_install:         bool conditional;
+        bs_path:            unix_dirname;
+        bs_compiled_object: compiled_object;
+        bs_build_depends:   dependency list;
+        bs_build_tools:     tool list;
+        bs_c_sources:       unix_filename list;
+        bs_data_files:      (unix_filename * unix_filename option) list;
+        bs_ccopt:           args conditional;
+        bs_cclib:           args conditional;
+        bs_dlllib:          args conditional;
+        bs_dllpath:         args conditional;
+        bs_byteopt:         args conditional;
+        bs_nativeopt:       args conditional;
+      }
+      
+  
+  type library =
+      {
+        lib_modules:            string list;
+        lib_pack:               bool;
+        lib_internal_modules:   string list;
+        lib_findlib_parent:     findlib_name option;
+        lib_findlib_name:       findlib_name option;
+        lib_findlib_containers: findlib_name list;
+      } 
+  
+  type executable =
+      {
+        exec_custom:          bool;
+        exec_main_is:         unix_filename;
+      } 
+  
+  type flag =
+      {
+        flag_description:  string option;
+        flag_default:      bool conditional;
+      } 
+  
+  type source_repository =
+      {
+        src_repo_type:        vcs;
+        src_repo_location:    url;
+        src_repo_browser:     url option;
+        src_repo_module:      string option;
+        src_repo_branch:      string option;
+        src_repo_tag:         string option;
+        src_repo_subdir:      unix_filename option;
+      } 
+  
+  type test =
+      {
+        test_type:               [`Test] plugin;
+        test_command:            command_line conditional;
+        test_custom:             custom;
+        test_working_directory:  unix_filename option;
+        test_run:                bool conditional;
+        test_tools:              tool list;
+      } 
+  
+  type doc_format =
+    | HTML of unix_filename
+    | DocText
+    | PDF
+    | PostScript
+    | Info of unix_filename
+    | DVI
+    | OtherDoc
+    
+  
+  type doc =
+      {
+        doc_type:        [`Doc] plugin;
+        doc_custom:      custom;
+        doc_build:       bool conditional;
+        doc_install:     bool conditional;
+        doc_install_dir: unix_filename;
+        doc_title:       string;
+        doc_authors:     string list;
+        doc_abstract:    string option;
+        doc_format:      doc_format;
+        doc_data_files:  (unix_filename * unix_filename option) list;
+        doc_build_tools: tool list;
+      } 
+  
+  type section =
+    | Library    of common_section * build_section * library
+    | Executable of common_section * build_section * executable
+    | Flag       of common_section * flag
+    | SrcRepo    of common_section * source_repository
+    | Test       of common_section * test
+    | Doc        of common_section * doc
+    
+  
+  type section_kind =
+      [ `Library | `Executable | `Flag | `SrcRepo | `Test | `Doc ]
+  
+  type package = 
+      {
+        oasis_version:    OASISVersion.t;
+        ocaml_version:    OASISVersion.comparator option;
+        findlib_version:  OASISVersion.comparator option;
+        name:             package_name;
+        version:          OASISVersion.t;
+        license:          OASISLicense.t;
+        license_file:     unix_filename option;
+        copyrights:       string list;
+        maintainers:      string list;
+        authors:          string list;
+        homepage:         url option;
+        synopsis:         string;
+        description:      string option;
+        categories:       url list;
+  
+        conf_type:        [`Configure] plugin;
+        conf_custom:      custom;
+  
+        build_type:       [`Build] plugin;
+        build_custom:     custom;
+  
+        install_type:     [`Install] plugin;
+        install_custom:   custom;
+        uninstall_custom: custom;
+  
+        clean_custom:     custom;
+        distclean_custom: custom;
+  
+        files_ab:         unix_filename list;
+        sections:         section list;
+        plugins:          [`Extra] plugin list;
+        schema_data:      PropList.Data.t;
+        plugin_data:      plugin_data;
+      } 
+  
+end
+
+module OASISUnixPath = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISUnixPath.ml"
+  
+  type unix_filename = string
+  type unix_dirname = string
+  
+  type host_filename = string
+  type host_dirname = string
+  
+  let current_dir_name = "."
+  
+  let parent_dir_name = ".."
+  
+  let concat f1 f2 =
+    if f1 = current_dir_name then
+      f2
+    else if f2 = current_dir_name then
+      f1
+    else
+      f1^"/"^f2
+  
+  let make =
+    function
+      | hd :: tl ->
+          List.fold_left
+            (fun f p -> concat f p)
+            hd
+            tl
+      | [] ->
+          invalid_arg "OASISUnixPath.make"
+  
+  let dirname f =
+    try
+      String.sub f 0 (String.rindex f '/')
+    with Not_found ->
+      current_dir_name
+  
+  let basename f =
+    try
+      let pos_start =
+        (String.rindex f '/') + 1
+      in
+        String.sub f pos_start ((String.length f) - pos_start)
+    with Not_found ->
+      f
+  
+  let chop_extension f =
+    try
+      let last_dot =
+        String.rindex f '.'
+      in
+      let sub =
+        String.sub f 0 last_dot
+      in
+        try
+          let last_slash =
+            String.rindex f '/'
+          in
+            if last_slash < last_dot then
+              sub
+            else
+              f
+        with Not_found ->
+          sub
+  
+    with Not_found ->
+      f
+  
+  let capitalize_file f =
+    let dir = dirname f in
+    let base = basename f in
+    concat dir (String.capitalize base)
+  
+  let uncapitalize_file f =
+    let dir = dirname f in
+    let base = basename f in
+    concat dir (String.uncapitalize base)
+end
+
+module OASISSection = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISSection.ml"
+  
+  open OASISTypes
+  
+  let section_kind_common = 
+    function
+      | Library (cs, _, _) -> 
+          `Library, cs
+      | Executable (cs, _, _) ->
+          `Executable, cs
+      | Flag (cs, _) ->
+          `Flag, cs
+      | SrcRepo (cs, _) ->
+          `SrcRepo, cs
+      | Test (cs, _) ->
+          `Test, cs
+      | Doc (cs, _) ->
+          `Doc, cs
+  
+  let section_common sct =
+    snd (section_kind_common sct)
+  
+  let section_common_set cs =
+    function
+      | Library (_, bs, lib)     -> Library (cs, bs, lib)
+      | Executable (_, bs, exec) -> Executable (cs, bs, exec)
+      | Flag (_, flg)            -> Flag (cs, flg)
+      | SrcRepo (_, src_repo)    -> SrcRepo (cs, src_repo)
+      | Test (_, tst)            -> Test (cs, tst)
+      | Doc (_, doc)             -> Doc (cs, doc)
+  
+  (** Key used to identify section
+    *)
+  let section_id sct = 
+    let k, cs = 
+      section_kind_common sct
+    in
+      k, cs.cs_name
+  
+  let string_of_section sct =
+    let k, nm =
+      section_id sct
+    in
+      (match k with
+         | `Library    -> "library" 
+         | `Executable -> "executable"
+         | `Flag       -> "flag"
+         | `SrcRepo    -> "src repository"
+         | `Test       -> "test"
+         | `Doc        -> "doc")
+      ^" "^nm
+  
+end
+
+module OASISBuildSection = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISBuildSection.ml"
+  
+end
+
+module OASISExecutable = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISExecutable.ml"
+  
+  open OASISTypes
+  
+  let unix_exec_is (cs, bs, exec) is_native ext_dll suffix_program = 
+    let dir = 
+      OASISUnixPath.concat
+        bs.bs_path
+        (OASISUnixPath.dirname exec.exec_main_is)
+    in
+    let is_native_exec = 
+      match bs.bs_compiled_object with
+        | Native -> true
+        | Best -> is_native ()
+        | Byte -> false
+    in
+  
+      OASISUnixPath.concat
+        dir
+        (cs.cs_name^(suffix_program ())),
+  
+      if not is_native_exec && 
+         not exec.exec_custom && 
+         bs.bs_c_sources <> [] then
+        Some (dir^"/dll"^cs.cs_name^(ext_dll ()))
+      else
+        None
+  
+end
+
+module OASISLibrary = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISLibrary.ml"
+  
+  open OASISTypes
+  open OASISUtils
+  open OASISGettext
+  
+  type library_name = name
+  
+  (* Look for a module file, considering capitalization or not. *)
+  let find_module source_file_exists (cs, bs, lib) modul =
+    let possible_base_fn =
+      List.map
+        (OASISUnixPath.concat bs.bs_path)
+        [modul;
+         OASISUnixPath.uncapitalize_file modul;
+         OASISUnixPath.capitalize_file modul]
+    in
+      (* TODO: we should be able to be able to determine the source for every
+       * files. Hence we should introduce a Module(source: fn) for the fields
+       * Modules and InternalModules
+       *)
+      List.fold_left
+        (fun acc base_fn ->
+           match acc with
+             | `No_sources _ ->
+                 begin
+                   let file_found =
+                     List.fold_left
+                       (fun acc ext ->
+                          if source_file_exists (base_fn^ext) then
+                            (base_fn^ext) :: acc
+                          else
+                            acc)
+                       []
+                       [".ml"; ".mli"; ".mll"; ".mly"]
+                   in
+                     match file_found with
+                       | [] ->
+                           acc
+                       | lst ->
+                           `Sources (base_fn, lst)
+                 end
+             | `Sources _ ->
+                 acc)
+        (`No_sources possible_base_fn)
+        possible_base_fn
+  
+  let source_unix_files ~ctxt (cs, bs, lib) source_file_exists =
+    List.fold_left
+      (fun acc modul ->
+         match find_module source_file_exists (cs, bs, lib) modul with
+           | `Sources (base_fn, lst) ->
+               (base_fn, lst) :: acc
+           | `No_sources _ ->
+               OASISMessage.warning
+                 ~ctxt
+                 (f_ "Cannot find source file matching \
+                      module '%s' in library %s")
+                 modul cs.cs_name;
+               acc)
+      []
+      (lib.lib_modules @ lib.lib_internal_modules)
+  
+  let generated_unix_files ~ctxt (cs, bs, lib)
+        source_file_exists is_native ext_lib ext_dll =
+  
+    let find_modules lst ext = 
+      let find_module modul =
+        match find_module source_file_exists (cs, bs, lib) modul with
+          | `Sources (base_fn, _) ->
+              [base_fn]
+          | `No_sources lst ->
+              OASISMessage.warning
+                ~ctxt
+                (f_ "Cannot find source file matching \
+                     module '%s' in library %s")
+                modul cs.cs_name;
+              lst
+      in
+      List.map 
+        (fun nm -> 
+           List.map 
+             (fun base_fn -> base_fn ^"."^ext)
+             (find_module nm))
+        lst
+    in
+  
+    (* The headers that should be compiled along *)
+    let headers =
+      if lib.lib_pack then
+        []
+      else
+        find_modules
+          lib.lib_modules
+          "cmi"
+    in
+  
+    (* The .cmx that be compiled along *)
+    let cmxs =
+      let should_be_built =
+        (not lib.lib_pack) && (* Do not install .cmx packed submodules *)
+        match bs.bs_compiled_object with
+          | Native -> true
+          | Best -> is_native ()
+          | Byte -> false
+      in
+        if should_be_built then
+          find_modules
+            (lib.lib_modules @ lib.lib_internal_modules)
+            "cmx"
+        else
+          []
+    in
+  
+    let acc_nopath =
+      []
+    in
+  
+    (* Compute what libraries should be built *)
+    let acc_nopath =
+      (* Add the packed header file if required *)
+      let add_pack_header acc =
+        if lib.lib_pack then
+          [cs.cs_name^".cmi"] :: acc
+        else
+          acc
+      in
+      let byte acc =
+        add_pack_header ([cs.cs_name^".cma"] :: acc)
+      in
+      let native acc =
+        add_pack_header ([cs.cs_name^".cmxa"] :: [cs.cs_name^(ext_lib ())] :: acc)
+      in
+        match bs.bs_compiled_object with
+          | Native ->
+              byte (native acc_nopath)
+          | Best when is_native () ->
+              byte (native acc_nopath)
+          | Byte | Best ->
+              byte acc_nopath
+    in
+  
+    (* Add C library to be built *)
+    let acc_nopath =
+      if bs.bs_c_sources <> [] then
+        begin
+          ["lib"^cs.cs_name^(ext_lib ())]
+          ::
+          ["dll"^cs.cs_name^(ext_dll ())]
+          ::
+          acc_nopath
+        end
+      else
+        acc_nopath
+    in
+  
+      (* All the files generated *)
+      List.rev_append
+        (List.rev_map
+           (List.rev_map
+              (OASISUnixPath.concat bs.bs_path))
+           acc_nopath)
+        (headers @ cmxs)
+  
+  
+  type group_t =
+    | Container of findlib_name * (group_t list)
+    | Package of (findlib_name *
+                  common_section *
+                  build_section *
+                  library *
+                  (group_t list))
+  
+  let group_libs pkg =
+    (** Associate a name with its children *)
+    let children =
+      List.fold_left
+        (fun mp ->
+           function
+             | Library (cs, bs, lib) ->
+                 begin
+                   match lib.lib_findlib_parent with
+                     | Some p_nm ->
+                         begin
+                           let children =
+                             try
+                               MapString.find p_nm mp
+                             with Not_found ->
+                               []
+                           in
+                             MapString.add p_nm ((cs, bs, lib) :: children) mp
+                         end
+                     | None ->
+                         mp
+                 end
+             | _ ->
+                 mp)
+        MapString.empty
+        pkg.sections
+    in
+  
+    (* Compute findlib name of a single node *)
+    let findlib_name (cs, _, lib) =
+      match lib.lib_findlib_name with
+        | Some nm -> nm
+        | None -> cs.cs_name
+    in
+  
+    (** Build a package tree *)
+    let rec tree_of_library containers ((cs, bs, lib) as acc) =
+      match containers with
+        | hd :: tl ->
+            Container (hd, [tree_of_library tl acc])
+        | [] ->
+            Package 
+              (findlib_name acc, cs, bs, lib,
+               (try
+                  List.rev_map
+                    (fun ((_, _, child_lib) as child_acc) ->
+                       tree_of_library
+                         child_lib.lib_findlib_containers
+                         child_acc)
+                    (MapString.find cs.cs_name children)
+                with Not_found ->
+                  []))
+    in
+  
+    (** Merge containers with the same name *)
+    let rec merge_containers groups =
+      (* Collect packages and create the map "container name -> merged children" *)
+      let packages, containers =
+        List.fold_left
+          (fun (packages, containers) group ->
+             match group with
+               | Container(name, children) ->
+                   let children' =
+                     try
+                       MapString.find name containers
+                     with Not_found ->
+                       []
+                   in
+                   (packages,
+                    MapString.add name (children' @ children) containers)
+               | Package(name, cs, bs, lib, children) ->
+                   (Package(name, cs, bs, lib, merge_containers children) :: packages,
+                    containers))
+          ([], MapString.empty)
+          groups
+      in
+      (* Recreate the list of groups *)
+      packages @
+        (MapString.fold
+           (fun name children acc ->
+              Container(name, merge_containers children) :: acc)
+           containers [])
+    in
+  
+      (* TODO: check that libraries are unique *)
+      merge_containers
+        (List.fold_left
+           (fun acc ->
+              function
+                | Library (cs, bs, lib) when lib.lib_findlib_parent = None -> 
+                    (tree_of_library lib.lib_findlib_containers (cs, bs, lib)) :: acc
+                | _ ->
+                    acc)
+           []
+           pkg.sections)
+  
+  (** Compute internal to findlib library matchings, including subpackage
+      and return a map of it.
+    *)
+  let findlib_name_map pkg =
+  
+    (* Compute names in a tree *)
+    let rec findlib_names_aux path mp grp =
+      let fndlb_nm, children, mp =
+        match grp with
+          | Container (fndlb_nm, children) ->
+              fndlb_nm, children, mp
+  
+          | Package (fndlb_nm, {cs_name = nm}, _, _, children) ->
+              fndlb_nm, children, (MapString.add nm (path, fndlb_nm) mp)
+      in
+      let fndlb_nm_full =
+        (match path with
+           | Some pth -> pth^"."
+           | None -> "")^
+        fndlb_nm
+      in
+        List.fold_left
+          (findlib_names_aux (Some fndlb_nm_full))
+          mp
+          children
+    in
+  
+      List.fold_left
+        (findlib_names_aux None)
+        MapString.empty
+        (group_libs pkg)
+  
+  
+  let findlib_of_name ?(recurse=false) map nm =
+    try
+      let (path, fndlb_nm) =
+        MapString.find nm map
+      in
+        match path with
+          | Some pth when recurse -> pth^"."^fndlb_nm
+          | _ -> fndlb_nm
+  
+    with Not_found ->
+      failwithf
+        (f_ "Unable to translate internal library '%s' to findlib name")
+        nm
+  
+  let name_findlib_map pkg =
+    let mp =
+      findlib_name_map pkg
+    in
+      MapString.fold
+        (fun nm _ acc ->
+           let fndlb_nm_full =
+             findlib_of_name
+               ~recurse:true
+               mp
+               nm
+           in
+             MapString.add fndlb_nm_full nm acc)
+        mp
+        MapString.empty
+  
+  let findlib_of_group =
+    function
+      | Container (fndlb_nm, _)
+      | Package (fndlb_nm, _, _, _, _) -> fndlb_nm
+  
+  let root_of_group grp =
+    let rec root_lib_aux =
+      function
+        | Container (_, children) ->
+            root_lib_lst children
+        | Package (_, cs, bs, lib, children) ->
+            if lib.lib_findlib_parent = None then
+              cs, bs, lib
+            else
+              root_lib_lst children
+    and root_lib_lst =
+      function
+        | [] ->
+            raise Not_found
+        | hd :: tl ->
+            try
+              root_lib_aux hd
+            with Not_found ->
+              root_lib_lst tl
+    in
+      try
+        root_lib_aux grp
+      with Not_found ->
+        failwithf
+          (f_ "Unable to determine root library of findlib library '%s'")
+          (findlib_of_group grp)
+  
+  
+end
+
+module OASISFlag = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISFlag.ml"
+  
+end
+
+module OASISPackage = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISPackage.ml"
+  
+end
+
+module OASISSourceRepository = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISSourceRepository.ml"
+  
+end
+
+module OASISTest = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISTest.ml"
+  
+end
+
+module OASISDocument = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/oasis/OASISDocument.ml"
+  
+end
+
+
+module BaseEnvLight = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseEnvLight.ml"
+  
+  module MapString = Map.Make(String)
+  
+  type t = string MapString.t
+  
+  let default_filename =
+    Filename.concat
+      (Sys.getcwd ())
+      "setup.data"
+  
+  let load ?(allow_empty=false) ?(filename=default_filename) () =
+    if Sys.file_exists filename then
+      begin
+        let chn =
+          open_in_bin filename
+        in
+        let st =
+          Stream.of_channel chn
+        in
+        let line =
+          ref 1
+        in
+        let st_line =
+          Stream.from
+            (fun _ ->
+               try
+                 match Stream.next st with
+                   | '\n' -> incr line; Some '\n'
+                   | c -> Some c
+               with Stream.Failure -> None)
+        in
+        let lexer =
+          Genlex.make_lexer ["="] st_line
+        in
+        let rec read_file mp =
+          match Stream.npeek 3 lexer with
+            | [Genlex.Ident nm; Genlex.Kwd "="; Genlex.String value] ->
+                Stream.junk lexer;
+                Stream.junk lexer;
+                Stream.junk lexer;
+                read_file (MapString.add nm value mp)
+            | [] ->
+                mp
+            | _ ->
+                failwith
+                  (Printf.sprintf
+                     "Malformed data file '%s' line %d"
+                     filename !line)
+        in
+        let mp =
+          read_file MapString.empty
+        in
+          close_in chn;
+          mp
+      end
+    else if allow_empty then
+      begin
+        MapString.empty
+      end
+    else
+      begin
+        failwith
+          (Printf.sprintf
+             "Unable to load environment, the file '%s' doesn't exist."
+             filename)
+      end
+  
+  let var_get name env =
+    let rec var_expand str =
+      let buff =
+        Buffer.create ((String.length str) * 2)
+      in
+        Buffer.add_substitute
+          buff
+          (fun var ->
+             try
+               var_expand (MapString.find var env)
+             with Not_found ->
+               failwith
+                 (Printf.sprintf
+                    "No variable %s defined when trying to expand %S."
+                    var
+                    str))
+          str;
+        Buffer.contents buff
+    in
+      var_expand (MapString.find name env)
+  
+  let var_choose lst env =
+    OASISExpr.choose
+      (fun nm -> var_get nm env)
+      lst
+end
+
+
+module BaseContext = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseContext.ml"
+  
+  open OASISContext
+  
+  let args = args
+  
+  let default = default
+  
+end
+
+module BaseMessage = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseMessage.ml"
+  
+  (** Message to user, overrid for Base
+      @author Sylvain Le Gall
+    *)
+  open OASISMessage
+  open BaseContext
+  
+  let debug fmt   = debug ~ctxt:!default fmt
+  
+  let info fmt    = info ~ctxt:!default fmt
+  
+  let warning fmt = warning ~ctxt:!default fmt
+  
+  let error fmt = error ~ctxt:!default fmt
+  
+end
+
+module BaseFilePath = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseFilePath.ml"
+  
+  
+  open Filename
+  
+  module Unix = OASISUnixPath
+  
+  let make =
+    function
+      | [] ->
+          invalid_arg "BaseFilename.make"
+      | hd :: tl ->
+          List.fold_left Filename.concat hd tl
+  
+  let of_unix ufn =
+    if Sys.os_type = "Unix" then
+      ufn
+    else
+      make
+        (List.map
+           (fun p ->
+              if p = Unix.current_dir_name then
+                current_dir_name
+              else if p = Unix.parent_dir_name then
+                parent_dir_name
+              else
+                p)
+           (OASISUtils.split '/' ufn))
+  
+end
+
+module BaseEnv = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseEnv.ml"
+  
+  open OASISGettext
+  open OASISUtils
+  open PropList
+  
+  module MapString = BaseEnvLight.MapString
+  
+  type origin_t =
+    | ODefault
+    | OGetEnv
+    | OFileLoad
+    | OCommandLine
+  
+  type cli_handle_t =
+    | CLINone
+    | CLIAuto
+    | CLIWith
+    | CLIEnable
+    | CLIUser of (Arg.key * Arg.spec * Arg.doc) list
+  
+  type definition_t =
+      {
+        hide:       bool;
+        dump:       bool;
+        cli:        cli_handle_t;
+        arg_help:   string option;
+        group:      string option;
+      }
+  
+  let schema =
+    Schema.create "environment"
+  
+  (* Environment data *)
+  let env =
+    Data.create ()
+  
+  (* Environment data from file *)
+  let env_from_file =
+    ref MapString.empty
+  
+  (* Lexer for var *)
+  let var_lxr =
+    Genlex.make_lexer []
+  
+  let rec var_expand str =
+    let buff =
+      Buffer.create ((String.length str) * 2)
+    in
+      Buffer.add_substitute
+        buff
+        (fun var ->
+           try
+             (* TODO: this is a quick hack to allow calling Test.Command
+              * without defining executable name really. I.e. if there is
+              * an exec Executable toto, then $(toto) should be replace
+              * by its real name. It is however useful to have this function
+              * for other variable that depend on the host and should be
+              * written better than that.
+              *)
+             let st =
+               var_lxr (Stream.of_string var)
+             in
+               match Stream.npeek 3 st with
+                 | [Genlex.Ident "utoh"; Genlex.Ident nm] ->
+                     BaseFilePath.of_unix (var_get nm)
+                 | [Genlex.Ident "utoh"; Genlex.String s] ->
+                     BaseFilePath.of_unix s
+                 | [Genlex.Ident "ocaml_escaped"; Genlex.Ident nm] ->
+                     String.escaped (var_get nm)
+                 | [Genlex.Ident "ocaml_escaped"; Genlex.String s] ->
+                     String.escaped s
+                 | [Genlex.Ident nm] ->
+                     var_get nm
+                 | _ ->
+                     failwithf
+                       (f_ "Unknown expression '%s' in variable expansion of %s.")
+                       var
+                       str
+           with
+             | Unknown_field (_, _) ->
+                 failwithf
+                   (f_ "No variable %s defined when trying to expand %S.")
+                   var
+                   str
+             | Stream.Error e ->
+                 failwithf
+                   (f_ "Syntax error when parsing '%s' when trying to \
+                        expand %S: %s")
+                   var
+                   str
+                   e)
+        str;
+      Buffer.contents buff
+  
+  and var_get name =
+    let vl =
+      try
+        Schema.get schema env name
+      with Unknown_field _ as e ->
+        begin
+          try
+            MapString.find name !env_from_file
+          with Not_found ->
+            raise e
+        end
+    in
+      var_expand vl
+  
+  let var_choose ?printer ?name lst =
+    OASISExpr.choose
+      ?printer
+      ?name
+      var_get
+      lst
+  
+  let var_protect vl =
+    let buff =
+      Buffer.create (String.length vl)
+    in
+      String.iter
+        (function
+           | '$' -> Buffer.add_string buff "\\$"
+           | c   -> Buffer.add_char   buff c)
+        vl;
+      Buffer.contents buff
+  
+  let var_define
+        ?(hide=false)
+        ?(dump=true)
+        ?short_desc
+        ?(cli=CLINone)
+        ?arg_help
+        ?group
+        name (* TODO: type constraint on the fact that name must be a valid OCaml
+                  id *)
+        dflt =
+  
+    let default =
+      [
+        OFileLoad, (fun () -> MapString.find name !env_from_file);
+        ODefault,  dflt;
+        OGetEnv,   (fun () -> Sys.getenv name);
+      ]
+    in
+  
+    let extra =
+      {
+        hide     = hide;
+        dump     = dump;
+        cli      = cli;
+        arg_help = arg_help;
+        group    = group;
+      }
+    in
+  
+    (* Try to find a value that can be defined
+     *)
+    let var_get_low lst =
+      let errors, res =
+        List.fold_left
+          (fun (errors, res) (o, v) ->
+             if res = None then
+               begin
+                 try
+                   errors, Some (v ())
+                 with
+                   | Not_found ->
+                        errors, res
+                   | Failure rsn ->
+                       (rsn :: errors), res
+                   | e ->
+                       (Printexc.to_string e) :: errors, res
+               end
+             else
+               errors, res)
+          ([], None)
+          (List.sort
+             (fun (o1, _) (o2, _) ->
+                Pervasives.compare o2 o1)
+             lst)
+      in
+        match res, errors with
+          | Some v, _ ->
+              v
+          | None, [] ->
+              raise (Not_set (name, None))
+          | None, lst ->
+              raise (Not_set (name, Some (String.concat (s_ ", ") lst)))
+    in
+  
+    let help =
+      match short_desc with
+        | Some fs -> Some fs
+        | None -> None
+    in
+  
+    let var_get_lst =
+      FieldRO.create
+        ~schema
+        ~name
+        ~parse:(fun ?(context=ODefault) s -> [context, fun () -> s])
+        ~print:var_get_low
+        ~default
+        ~update:(fun ?context x old_x -> x @ old_x)
+        ?help
+        extra
+    in
+  
+      fun () ->
+        var_expand (var_get_low (var_get_lst env))
+  
+  let var_redefine
+        ?hide
+        ?dump
+        ?short_desc
+        ?cli
+        ?arg_help
+        ?group
+        name
+        dflt =
+    if Schema.mem schema name then
+      begin
+        (* TODO: look suspsicious, we want to memorize dflt not dflt () *)
+        Schema.set schema env ~context:ODefault name (dflt ());
+        fun () -> var_get name
+      end
+    else
+      begin
+        var_define
+          ?hide
+          ?dump
+          ?short_desc
+          ?cli
+          ?arg_help
+          ?group
+          name
+          dflt
+      end
+  
+  let var_ignore (e : unit -> string) =
+    ()
+  
+  let print_hidden =
+    var_define
+      ~hide:true
+      ~dump:false
+      ~cli:CLIAuto
+      ~arg_help:"Print even non-printable variable. (debug)"
+      "print_hidden"
+      (fun () -> "false")
+  
+  let var_all () =
+    List.rev
+      (Schema.fold
+         (fun acc nm def _ ->
+            if not def.hide || bool_of_string (print_hidden ()) then
+              nm :: acc
+            else
+              acc)
+         []
+         schema)
+  
+  let default_filename =
+    BaseEnvLight.default_filename
+  
+  let load ?allow_empty ?filename () =
+    env_from_file := BaseEnvLight.load ?allow_empty ?filename ()
+  
+  let unload () =
+    env_from_file := MapString.empty;
+    Data.clear env
+  
+  let dump ?(filename=default_filename) () =
+    let chn =
+      open_out_bin filename
+    in
+    let output nm value = 
+      Printf.fprintf chn "%s=%S\n" nm value
+    in
+    let mp_todo = 
+      (* Dump data from schema *)
+      Schema.fold
+        (fun mp_todo nm def _ ->
+           if def.dump then
+             begin
+               try
+                 let value =
+                   Schema.get
+                     schema
+                     env
+                     nm
+                 in
+                   output nm value
+               with Not_set _ ->
+                 ()
+             end;
+           MapString.remove nm mp_todo)
+        !env_from_file
+        schema
+    in
+      (* Dump data defined outside of schema *)
+      MapString.iter output mp_todo;
+  
+      (* End of the dump *)
+      close_out chn
+  
+  let print () =
+    let printable_vars =
+      Schema.fold
+        (fun acc nm def short_descr_opt ->
+           if not def.hide || bool_of_string (print_hidden ()) then
+             begin
+               try
+                 let value =
+                   Schema.get
+                     schema
+                     env
+                     nm
+                 in
+                 let txt =
+                   match short_descr_opt with
+                     | Some s -> s ()
+                     | None -> nm
+                 in
+                   (txt, value) :: acc
+               with Not_set _ ->
+                   acc
+             end
+           else
+             acc)
+        []
+        schema
+    in
+    let max_length =
+      List.fold_left max 0
+        (List.rev_map String.length
+           (List.rev_map fst printable_vars))
+    in
+    let dot_pad str =
+      String.make ((max_length - (String.length str)) + 3) '.'
+    in
+  
+    Printf.printf "\nConfiguration: \n";
+    List.iter
+      (fun (name,value) ->
+        Printf.printf "%s: %s %s\n" name (dot_pad name) value)
+      (List.rev printable_vars);
+    Printf.printf "\n%!"
+  
+  let args () =
+    let arg_concat =
+      OASISUtils.varname_concat ~hyphen:'-'
+    in
+      [
+        "--override",
+         Arg.Tuple
+           (
+             let rvr = ref ""
+             in
+             let rvl = ref ""
+             in
+               [
+                 Arg.Set_string rvr;
+                 Arg.Set_string rvl;
+                 Arg.Unit
+                   (fun () ->
+                      Schema.set
+                        schema
+                        env
+                        ~context:OCommandLine
+                        !rvr
+                        !rvl)
+               ]
+           ),
+        "var+val  Override any configuration variable.";
+  
+      ]
+      @
+      List.flatten
+        (Schema.fold
+          (fun acc name def short_descr_opt ->
+             let var_set s =
+               Schema.set
+                 schema
+                 env
+                 ~context:OCommandLine
+                 name
+                 s
+             in
+  
+             let arg_name =
+               OASISUtils.varname_of_string ~hyphen:'-' name
+             in
+  
+             let hlp =
+               match short_descr_opt with
+                 | Some txt -> txt ()
+                 | None -> ""
+             in
+  
+             let arg_hlp =
+               match def.arg_help with
+                 | Some s -> s
+                 | None   -> "str"
+             in
+  
+             let default_value =
+               try
+                 Printf.sprintf
+                   (f_ " [%s]")
+                   (Schema.get
+                      schema
+                      env
+                      name)
+               with Not_set _ ->
+                 ""
+             in
+  
+             let args =
+               match def.cli with
+                 | CLINone ->
+                     []
+                 | CLIAuto ->
+                     [
+                       arg_concat "--" arg_name,
+                       Arg.String var_set,
+                       Printf.sprintf (f_ "%s %s%s") arg_hlp hlp default_value
+                     ]
+                 | CLIWith ->
+                     [
+                       arg_concat "--with-" arg_name,
+                       Arg.String var_set,
+                       Printf.sprintf (f_ "%s %s%s") arg_hlp hlp default_value
+                     ]
+                 | CLIEnable ->
+                     let dflt =
+                       if default_value = " [true]" then
+                         s_ " [default: enabled]"
+                       else
+                         s_ " [default: disabled]"
+                     in
+                       [
+                         arg_concat "--enable-" arg_name,
+                         Arg.Unit (fun () -> var_set "true"),
+                         Printf.sprintf (f_ " %s%s") hlp dflt;
+  
+                         arg_concat "--disable-" arg_name,
+                         Arg.Unit (fun () -> var_set "false"),
+                         Printf.sprintf (f_ " %s%s") hlp dflt
+                       ]
+                 | CLIUser lst ->
+                     lst
+             in
+               args :: acc)
+           []
+           schema)
+end
+
+module BaseExec = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseExec.ml"
+  
+  open OASISGettext
+  open OASISUtils
+  open BaseMessage
+  
+  let run ?f_exit_code cmd args =
+    let cmdline =
+      String.concat " " (cmd :: args)
+    in
+      info (f_ "Running command '%s'") cmdline;
+      match f_exit_code, Sys.command cmdline with
+        | None, 0 -> ()
+        | None, i ->
+            failwithf
+              (f_ "Command '%s' terminated with error code %d")
+              cmdline i
+        | Some f, i ->
+            f i
+  
+  let run_read_output ?f_exit_code cmd args =
+    let fn =
+      Filename.temp_file "oasis-" ".txt"
+    in
+    let () =
+      try
+        run ?f_exit_code cmd (args @ [">"; Filename.quote fn])
+      with e ->
+        Sys.remove fn;
+        raise e
+    in
+    let chn =
+      open_in fn
+    in
+    let routput =
+      ref []
+    in
+      (
+        try
+          while true do
+            routput := (input_line chn) :: !routput
+          done
+        with End_of_file ->
+          ()
+      );
+      close_in chn;
+      Sys.remove fn;
+      List.rev !routput
+  
+  let run_read_one_line ?f_exit_code cmd args =
+    match run_read_output ?f_exit_code cmd args with
+      | [fst] ->
+          fst
+      | lst ->
+          failwithf
+            (f_ "Command return unexpected output %S")
+            (String.concat "\n" lst)
+end
+
+module BaseFileUtil = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseFileUtil.ml"
+  
+  open OASISGettext
+  
+  let find_file paths exts =
+  
+    (* Cardinal product of two list *)
+    let ( * ) lst1 lst2 =
+      List.flatten
+        (List.map
+           (fun a ->
+              List.map
+                (fun b -> a,b)
+                lst2)
+           lst1)
+    in
+  
+    let rec combined_paths lst =
+      match lst with
+        | p1 :: p2 :: tl ->
+            let acc =
+              (List.map
+                 (fun (a,b) -> Filename.concat a b)
+                 (p1 * p2))
+            in
+              combined_paths (acc :: tl)
+        | [e] ->
+            e
+        | [] ->
+            []
+    in
+  
+    let alternatives =
+      List.map
+        (fun (p,e) ->
+           if String.length e > 0 && e.[0] <> '.' then
+             p ^ "." ^ e
+           else
+             p ^ e)
+        ((combined_paths paths) * exts)
+    in
+      List.find
+        Sys.file_exists
+        alternatives
+  
+  let which prg =
+    let path_sep =
+      match Sys.os_type with
+        | "Win32" ->
+            ';'
+        | _ ->
+            ':'
+    in
+    let path_lst =
+      OASISUtils.split
+        path_sep
+        (Sys.getenv "PATH")
+    in
+    let exec_ext =
+      match Sys.os_type with
+        | "Win32" ->
+            ""
+            ::
+            (OASISUtils.split
+               path_sep
+               (Sys.getenv "PATHEXT"))
+        | _ ->
+            [""]
+    in
+      find_file [path_lst; [prg]] exec_ext
+  
+  (**/**)
+  let rec fix_dir dn =
+    (* Windows hack because Sys.file_exists "src\\" = false when
+     * Sys.file_exists "src" = true
+     *)
+    let ln =
+      String.length dn
+    in
+      if Sys.os_type = "Win32" && ln > 0 && dn.[ln - 1] = '\\' then
+        fix_dir (String.sub dn 0 (ln - 1))
+      else
+        dn
+  
+  let q = Filename.quote
+  (**/**)
+  
+  let cp src tgt =
+    BaseExec.run
+      (match Sys.os_type with
+       | "Win32" -> "copy"
+       | _ -> "cp")
+      [q src; q tgt]
+  
+  let mkdir tgt =
+    BaseExec.run
+      (match Sys.os_type with
+         | "Win32" -> "md"
+         | _ -> "mkdir")
+      [q tgt]
+  
+  let rec mkdir_parent f tgt =
+    let tgt =
+      fix_dir tgt
+    in
+      if Sys.file_exists tgt then
+        begin
+          if not (Sys.is_directory tgt) then
+            OASISUtils.failwithf
+              (f_ "Cannot create directory '%s', a file of the same name already \
+                   exists")
+              tgt
+        end
+      else
+        begin
+          mkdir_parent f (Filename.dirname tgt);
+          if not (Sys.file_exists tgt) then
+            begin
+              f tgt;
+              mkdir tgt
+            end
+        end
+  
+  let rmdir tgt =
+    if Sys.readdir tgt = [||] then
+      begin
+        match Sys.os_type with
+          | "Win32" ->
+              BaseExec.run "rd" [q tgt]
+          | _ ->
+              BaseExec.run "rm" ["-r"; q tgt]
+      end
+  
+  let glob fn =
+   let basename =
+     Filename.basename fn
+   in
+     if String.length basename >= 2 &&
+        basename.[0] = '*' &&
+        basename.[1] = '.' then
+       begin
+         let ext_len =
+           (String.length basename) - 2
+         in
+         let ext =
+           String.sub basename 2 ext_len
+         in
+         let dirname =
+           Filename.dirname fn
+         in
+           Array.fold_left
+             (fun acc fn ->
+                try
+                  let fn_ext =
+                    String.sub
+                      fn
+                      ((String.length fn) - ext_len)
+                      ext_len
+                  in
+                    if fn_ext = ext then
+                      (Filename.concat dirname fn) :: acc
+                    else
+                      acc
+                with Invalid_argument _ ->
+                  acc)
+             []
+             (Sys.readdir dirname)
+       end
+     else
+       begin
+         if Sys.file_exists fn then
+           [fn]
+         else
+           []
+       end
+end
+
+module BaseArgExt = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseArgExt.ml"
+  
+  open OASISUtils
+  open OASISGettext
+  
+  let parse argv args =
+      (* Simulate command line for Arg *)
+      let current =
+        ref 0
+      in
+  
+        try
+          Arg.parse_argv
+            ~current:current
+            (Array.concat [[|"none"|]; argv])
+            (Arg.align args)
+            (failwithf (f_ "Don't know what to do with arguments: '%s'"))
+            (s_ "configure options:")
+        with
+          | Arg.Help txt ->
+              print_endline txt;
+              exit 0
+          | Arg.Bad txt ->
+              prerr_endline txt;
+              exit 1
+end
+
+module BaseCheck = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseCheck.ml"
+  
+  open BaseEnv
+  open BaseMessage
+  open OASISUtils
+  open OASISGettext
+  
+  let prog_best prg prg_lst =
+    var_redefine
+      prg
+      (fun () ->
+         let alternate =
+           List.fold_left
+             (fun res e ->
+                match res with
+                  | Some _ ->
+                      res
+                  | None ->
+                      try
+                        Some (BaseFileUtil.which e)
+                      with Not_found ->
+                        None)
+             None
+             prg_lst
+         in
+           match alternate with
+             | Some prg -> prg
+             | None -> raise Not_found)
+  
+  let prog prg =
+    prog_best prg [prg]
+  
+  let prog_opt prg =
+    prog_best prg [prg^".opt"; prg]
+  
+  let ocamlfind =
+    prog "ocamlfind"
+  
+  let version
+        var_prefix
+        cmp
+        fversion
+        () =
+    (* Really compare version provided *)
+    let var =
+      var_prefix^"_version_"^(OASISVersion.varname_of_comparator cmp)
+    in
+      var_redefine
+        ~hide:true
+        var
+        (fun () ->
+           let version_str =
+             match fversion () with
+               | "[Distributed with OCaml]" ->
+                   begin
+                     try
+                       (var_get "ocaml_version")
+                     with Not_found ->
+                       warning
+                         (f_ "Variable ocaml_version not defined, fallback \
+                              to default");
+                       Sys.ocaml_version
+                   end
+               | res ->
+                   res
+           in
+           let version =
+             OASISVersion.version_of_string version_str
+           in
+             if OASISVersion.comparator_apply version cmp then
+               version_str
+             else
+               failwithf
+                 (f_ "Cannot satisfy version constraint on %s: %s (version: %s)")
+                 var_prefix
+                 (OASISVersion.string_of_comparator cmp)
+                 version_str)
+        ()
+  
+  let package_version pkg =
+    BaseExec.run_read_one_line
+      (ocamlfind ())
+      ["query"; "-format"; "%v"; pkg]
+  
+  let package ?version_comparator pkg () =
+    let var =
+      OASISUtils.varname_concat
+        "pkg_"
+        (OASISUtils.varname_of_string pkg)
+    in
+    let findlib_dir pkg =
+      let dir =
+        BaseExec.run_read_one_line
+          (ocamlfind ())
+          ["query"; "-format"; "%d"; pkg]
+      in
+        if Sys.file_exists dir && Sys.is_directory dir then
+          dir
+        else
+          failwithf
+            (f_ "When looking for findlib package %s, \
+                 directory %s return doesn't exist")
+            pkg dir
+    in
+    let vl =
+      var_redefine
+        var
+        (fun () -> findlib_dir pkg)
+        ()
+    in
+      (
+        match version_comparator with
+          | Some ver_cmp ->
+              ignore
+                (version
+                   var
+                   ver_cmp
+                   (fun _ -> package_version pkg)
+                   ())
+          | None ->
+              ()
+      );
+      vl
+end
+
+module BaseOCamlcConfig = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseOCamlcConfig.ml"
+  
+  
+  open BaseEnv
+  open OASISUtils
+  open OASISGettext
+  
+  module SMap = Map.Make(String)
+  
+  let ocamlc =
+    BaseCheck.prog_opt "ocamlc"
+  
+  let ocamlc_config_map =
+    (* Map name to value for ocamlc -config output
+       (name ^": "^value)
+     *)
+    let rec split_field mp lst =
+      match lst with
+        | line :: tl ->
+            let mp =
+              try
+                let pos_semicolon =
+                  String.index line ':'
+                in
+                  if pos_semicolon > 1 then
+                    (
+                      let name =
+                        String.sub line 0 pos_semicolon
+                      in
+                      let linelen =
+                        String.length line
+                      in
+                      let value =
+                        if linelen > pos_semicolon + 2 then
+                          String.sub
+                            line
+                            (pos_semicolon + 2)
+                            (linelen - pos_semicolon - 2)
+                        else
+                          ""
+                      in
+                        SMap.add name value mp
+                    )
+                  else
+                    (
+                      mp
+                    )
+              with Not_found ->
+                (
+                  mp
+                )
+            in
+              split_field mp tl
+        | [] ->
+            mp
+    in
+  
+    let cache = 
+      lazy
+        (var_protect
+           (Marshal.to_string
+              (split_field
+                 SMap.empty
+                 (BaseExec.run_read_output
+                    (ocamlc ()) ["-config"]))
+              []))
+    in
+      var_redefine
+        "ocamlc_config_map"
+        ~hide:true
+        ~dump:false
+        (fun () ->
+           (* TODO: update if ocamlc change !!! *)
+           Lazy.force cache)
+  
+  let var_define nm =
+    (* Extract data from ocamlc -config *)
+    let avlbl_config_get () =
+      Marshal.from_string
+        (ocamlc_config_map ())
+        0
+    in
+    let chop_version_suffix s =
+      try 
+        String.sub s 0 (String.index s '+')
+      with _ -> 
+        s
+     in
+  
+    let nm_config, value_config =
+      match nm with
+        | "ocaml_version" -> 
+            "version", chop_version_suffix
+        | _ -> nm, (fun x -> x)
+    in
+      var_redefine
+        nm
+        (fun () ->
+          try
+             let map =
+               avlbl_config_get ()
+             in
+             let value =
+               SMap.find nm_config map
+             in
+               value_config value
+           with Not_found ->
+             failwithf
+               (f_ "Cannot find field '%s' in '%s -config' output")
+               nm
+               (ocamlc ()))
+  
+end
+
+module BaseStandardVar = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseStandardVar.ml"
+  
+  
+  open OASISGettext
+  open OASISTypes
+  open OASISExpr
+  open BaseCheck
+  open BaseEnv
+  
+  let ocamlfind  = BaseCheck.ocamlfind
+  let ocamlc     = BaseOCamlcConfig.ocamlc
+  let ocamlopt   = prog_opt "ocamlopt"
+  let ocamlbuild = prog "ocamlbuild"
+  
+  
+  (**/**)
+  let rpkg =
+    ref None
+  
+  let pkg_get () =
+    match !rpkg with
+      | Some pkg -> pkg
+      | None -> failwith (s_ "OASIS Package is not set")
+  (**/**)
+  
+  let pkg_name =
+    var_define
+      ~short_desc:(fun () -> s_ "Package name")
+      "pkg_name"
+      (fun () -> (pkg_get ()).name)
+  
+  let pkg_version =
+    var_define
+      ~short_desc:(fun () -> s_ "Package version")
+      "pkg_version"
+      (fun () ->
+         (OASISVersion.string_of_version (pkg_get ()).version))
+  
+  let c = BaseOCamlcConfig.var_define
+  
+  let os_type        = c "os_type"
+  let system         = c "system"
+  let architecture   = c "architecture"
+  let ccomp_type     = c "ccomp_type"
+  let ocaml_version  = c "ocaml_version"
+  
+  (* TODO: Check standard variable presence at runtime *)
+  
+  let standard_library_default = c "standard_library_default"
+  let standard_library         = c "standard_library"
+  let standard_runtime         = c "standard_runtime"
+  let bytecomp_c_compiler      = c "bytecomp_c_compiler"
+  let native_c_compiler        = c "native_c_compiler"
+  let model                    = c "model"
+  let ext_obj                  = c "ext_obj"
+  let ext_asm                  = c "ext_asm"
+  let ext_lib                  = c "ext_lib"
+  let ext_dll                  = c "ext_dll"
+  let default_executable_name  = c "default_executable_name"
+  let systhread_supported      = c "systhread_supported"
+  
+  
+  (**/**)
+  let p name hlp dflt =
+    var_define
+      ~short_desc:hlp
+      ~cli:CLIAuto
+      ~arg_help:"dir"
+      name
+      dflt
+  
+  let (/) a b =
+    if os_type () = Sys.os_type then
+      Filename.concat a b
+    else if os_type () = "Unix" then
+      BaseFilePath.Unix.concat a b
+    else
+      OASISUtils.failwithf (f_ "Cannot handle os_type %s filename concat")
+        (os_type ())
+  (**/**)
+  
+  let prefix =
+    p "prefix"
+      (fun () -> s_ "Install architecture-independent files dir")
+      (fun () ->
+         match os_type () with
+           | "Win32" ->
+               let program_files =
+                 Sys.getenv "PROGRAMFILES"
+               in
+                 program_files/(pkg_name ())
+           | _ ->
+               "/usr/local")
+  
+  let exec_prefix =
+    p "exec_prefix"
+      (fun () -> s_ "Install architecture-dependent files in dir")
+      (fun () -> "$prefix")
+  
+  let bindir =
+    p "bindir"
+      (fun () -> s_ "User executables")
+      (fun () -> "$exec_prefix"/"bin")
+  
+  let sbindir =
+    p "sbindir"
+      (fun () -> s_ "System admin executables")
+      (fun () -> "$exec_prefix"/"sbin")
+  
+  let libexecdir =
+    p "libexecdir"
+      (fun () -> s_ "Program executables")
+      (fun () -> "$exec_prefix"/"libexec")
+  
+  let sysconfdir =
+    p "sysconfdir"
+      (fun () -> s_ "Read-only single-machine data")
+      (fun () -> "$prefix"/"etc")
+  
+  let sharedstatedir =
+    p "sharedstatedir"
+      (fun () -> s_ "Modifiable architecture-independent data")
+      (fun () -> "$prefix"/"com")
+  
+  let localstatedir =
+    p "localstatedir"
+      (fun () -> s_ "Modifiable single-machine data")
+      (fun () -> "$prefix"/"var")
+  
+  let libdir =
+    p "libdir"
+      (fun () -> s_ "Object code libraries")
+      (fun () -> "$exec_prefix"/"lib")
+  
+  let datarootdir =
+    p "datarootdir"
+      (fun () -> s_ "Read-only arch-independent data root")
+      (fun () -> "$prefix"/"share")
+  
+  let datadir =
+    p "datadir"
+      (fun () -> s_ "Read-only architecture-independent data")
+      (fun () -> "$datarootdir")
+  
+  let infodir =
+    p "infodir"
+      (fun () -> s_ "Info documentation")
+      (fun () -> "$datarootdir"/"info")
+  
+  let localedir =
+    p "localedir"
+      (fun () -> s_ "Locale-dependent data")
+      (fun () -> "$datarootdir"/"locale")
+  
+  let mandir =
+    p "mandir"
+      (fun () -> s_ "Man documentation")
+      (fun () -> "$datarootdir"/"man")
+  
+  let docdir =
+    p "docdir"
+      (fun () -> s_ "Documentation root")
+      (fun () -> "$datarootdir"/"doc"/"$pkg_name")
+  
+  let htmldir =
+    p "htmldir"
+      (fun () -> s_ "HTML documentation")
+      (fun () -> "$docdir")
+  
+  let dvidir =
+    p "dvidir"
+      (fun () -> s_ "DVI documentation")
+      (fun () -> "$docdir")
+  
+  let pdfdir =
+    p "pdfdir"
+      (fun () -> s_ "PDF documentation")
+      (fun () -> "$docdir")
+  
+  let psdir =
+    p "psdir"
+      (fun () -> s_ "PS documentation")
+      (fun () -> "$docdir")
+  
+  let destdir =
+    p "destdir"
+      (fun () -> s_ "Prepend a path when installing package")
+      (fun () ->
+         raise
+           (PropList.Not_set
+              ("destdir",
+               Some (s_ "undefined by construct"))))
+  
+  let findlib_version =
+    var_define
+      "findlib_version"
+      (fun () ->
+         BaseCheck.package_version "findlib")
+  
+  let is_native =
+    var_define
+      "is_native"
+      (fun () ->
+         try
+           let _s : string =
+             ocamlopt ()
+           in
+             "true"
+         with PropList.Not_set _ ->
+           let _s : string =
+             ocamlc ()
+           in
+             "false")
+  
+  let ext_program =
+    var_define
+      "suffix_program"
+      (fun () ->
+         match os_type () with
+           | "Win32" -> ".exe"
+           | _ -> "")
+  
+  let rm =
+    var_define
+      ~short_desc:(fun () -> s_ "Remove a file.")
+      "rm"
+      (fun () ->
+         match os_type () with
+           | "Win32" -> "del"
+           | _ -> "rm -f")
+  
+  let rmdir =
+    var_define
+      ~short_desc:(fun () -> s_ "Remove a directory.")
+      "rmdir"
+      (fun () ->
+         match os_type () with
+           | "Win32" -> "rd"
+           | _ -> "rm -rf")
+  
+  let debug =
+    var_define
+      ~short_desc:(fun () -> s_ "Turn ocaml debug flag on")
+      ~cli:CLIEnable
+      "debug"
+      (fun () -> "true")
+  
+  let profile =
+    var_define
+      ~short_desc:(fun () -> s_ "Turn ocaml profile flag on")
+      ~cli:CLIEnable
+      "profile"
+      (fun () -> "false")
+  
+  let tests =
+    var_define
+      ~short_desc:(fun () ->
+                     s_ "Compile tests executable and library and run them")
+      ~cli:CLIEnable
+      "tests"
+      (fun () -> "false")
+  
+  let docs =
+    var_define
+      ~short_desc:(fun () -> s_ "Create documentations")
+      ~cli:CLIEnable
+      "docs"
+      (fun () -> "true")
+  
+  let init pkg =
+    rpkg := Some pkg
+  
+end
+
+module BaseFileAB = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseFileAB.ml"
+  
+  open BaseEnv
+  open OASISGettext
+  open BaseMessage
+  
+  let to_filename fn =
+    let fn =
+      BaseFilePath.of_unix fn
+    in
+      if not (Filename.check_suffix fn ".ab") then
+        warning
+          (f_ "File '%s' doesn't have '.ab' extension")
+          fn;
+      Filename.chop_extension fn
+  
+  let replace fn_lst =
+    let buff =
+      Buffer.create 13
+    in
+      List.iter
+        (fun fn ->
+           let fn =
+             BaseFilePath.of_unix fn
+           in
+           let chn_in =
+             open_in fn
+           in
+           let chn_out =
+             open_out (to_filename fn)
+           in
+             (
+               try
+                 while true do
+                  Buffer.add_string buff (var_expand (input_line chn_in));
+                  Buffer.add_char buff '\n'
+                 done
+               with End_of_file ->
+                 ()
+             );
+             Buffer.output_buffer chn_out buff;
+             Buffer.clear buff;
+             close_in chn_in;
+             close_out chn_out)
+        fn_lst
+end
+
+module BaseLog = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseLog.ml"
+  
+  open OASISUtils
+  
+  let default_filename =
+    Filename.concat
+      (Filename.dirname BaseEnv.default_filename)
+      "setup.log"
+  
+  module SetTupleString =
+    Set.Make
+      (struct
+         type t = string * string
+         let compare (s11, s12) (s21, s22) =
+           match String.compare s11 s21 with
+             | 0 -> String.compare s12 s22
+             | n -> n
+       end)
+  
+  let load () =
+    if Sys.file_exists default_filename then
+      begin
+        let chn =
+          open_in default_filename
+        in
+        let scbuf =
+          Scanf.Scanning.from_file default_filename
+        in
+        let rec read_aux (st, lst) =
+          if not (Scanf.Scanning.end_of_input scbuf) then
+            begin
+              let acc =
+                try
+                  Scanf.bscanf scbuf "%S %S\n"
+                    (fun e d ->
+                       let t =
+                         e, d
+                       in
+                         if SetTupleString.mem t st then
+                           st, lst
+                         else
+                           SetTupleString.add t st,
+                           t :: lst)
+                with Scanf.Scan_failure _ ->
+                  failwith
+                    (Scanf.bscanf scbuf
+                       "%l"
+                       (fun line ->
+                          Printf.sprintf
+                            "Malformed log file '%s' at line %d"
+                            default_filename
+                            line))
+              in
+                read_aux acc
+            end
+          else
+            begin
+              close_in chn;
+              List.rev lst
+            end
+        in
+          read_aux (SetTupleString.empty, [])
+      end
+    else
+      begin
+        []
+      end
+  
+  let register event data =
+    let chn_out =
+      open_out_gen [Open_append; Open_creat; Open_text] 0o644 default_filename
+    in
+      Printf.fprintf chn_out "%S %S\n" event data;
+      close_out chn_out
+  
+  let unregister event data =
+    if Sys.file_exists default_filename then
+      begin
+        let lst =
+          load ()
+        in
+        let chn_out =
+          open_out default_filename
+        in
+        let write_something =
+          ref false
+        in
+          List.iter
+            (fun (e, d) ->
+               if e <> event || d <> data then
+                 begin
+                   write_something := true;
+                   Printf.fprintf chn_out "%S %S\n" e d
+                 end)
+            lst;
+          close_out chn_out;
+          if not !write_something then
+            Sys.remove default_filename
+      end
+  
+  let filter events =
+    let st_events =
+      List.fold_left
+        (fun st e ->
+           SetString.add e st)
+        SetString.empty
+        events
+    in
+      List.filter
+        (fun (e, _) -> SetString.mem e st_events)
+        (load ())
+  
+  let exists event data =
+    List.exists
+      (fun v -> (event, data) = v)
+      (load ())
+end
+
+module BaseBuilt = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseBuilt.ml"
+  
+  open OASISTypes
+  open OASISGettext
+  open BaseStandardVar
+  open BaseMessage
+  
+  type t =
+    | BExec    (* Executable *)
+    | BExecLib (* Library coming with executable *)
+    | BLib     (* Library *)
+    | BDoc     (* Document *)
+  
+  let to_log_event_file t nm =
+    "built_"^
+    (match t with
+       | BExec -> "exec"
+       | BExecLib -> "exec_lib"
+       | BLib -> "lib"
+       | BDoc -> "doc")^
+    "_"^nm
+  
+  let to_log_event_done t nm =
+    "is_"^(to_log_event_file t nm)
+  
+  let register t nm lst =
+    BaseLog.register
+      (to_log_event_done t nm)
+      "true";
+    List.iter
+      (fun alt ->
+         let registered =
+           List.fold_left
+             (fun registered fn ->
+                if Sys.file_exists fn then
+                  begin
+                    BaseLog.register
+                      (to_log_event_file t nm)
+                      (if Filename.is_relative fn then
+                         Filename.concat (Sys.getcwd ()) fn
+                       else
+                         fn);
+                    true
+                  end
+                else
+                  registered)
+             false
+             alt
+         in
+           if not registered then
+             warning
+               (f_ "Cannot find an existing alternative files among: %s")
+               (String.concat (s_ ", ") alt))
+      lst
+  
+  let unregister t nm =
+    List.iter
+      (fun (e, d) ->
+         BaseLog.unregister e d)
+      (BaseLog.filter
+         [to_log_event_file t nm;
+          to_log_event_done t nm])
+  
+  let fold t nm f acc =
+    List.fold_left
+      (fun acc (_, fn) ->
+         if Sys.file_exists fn then
+           begin
+             f acc fn
+           end
+         else
+           begin
+             warning
+               (f_ "File '%s' has been marked as built \
+                  for %s but doesn't exist")
+               fn
+               (Printf.sprintf
+                  (match t with
+                     | BExec | BExecLib ->
+                         (f_ "executable %s")
+                     | BLib ->
+                         (f_ "library %s")
+                     | BDoc ->
+                         (f_ "documentation %s"))
+                  nm);
+             acc
+           end)
+      acc
+      (BaseLog.filter
+         [to_log_event_file t nm])
+  
+  let is_built t nm =
+    List.fold_left
+      (fun is_built (_, d) ->
+         (try
+            bool_of_string d
+          with _ ->
+            false))
+      false
+      (BaseLog.filter
+         [to_log_event_done t nm])
+  
+  let of_executable ffn (cs, bs, exec) =
+    let unix_exec_is, unix_dll_opt =
+      OASISExecutable.unix_exec_is
+        (cs, bs, exec)
+        (fun () ->
+           bool_of_string
+             (is_native ()))
+        ext_dll
+        ext_program
+    in
+    let evs =
+      (BExec, cs.cs_name, [[ffn unix_exec_is]])
+      ::
+      (match unix_dll_opt with
+         | Some fn ->
+             [BExecLib, cs.cs_name, [[ffn fn]]]
+         | None ->
+             [])
+    in
+      evs,
+      unix_exec_is,
+      unix_dll_opt
+  
+  let of_library ffn (cs, bs, lib) =
+    let unix_lst =
+      OASISLibrary.generated_unix_files
+        ~ctxt:!BaseContext.default
+        (cs, bs, lib)
+        (fun fn ->
+           Sys.file_exists (BaseFilePath.of_unix fn))
+        (fun () ->
+           bool_of_string (is_native ()))
+        ext_lib
+        ext_dll
+    in
+    let evs =
+      [BLib,
+       cs.cs_name,
+       List.map (List.map ffn) unix_lst]
+    in
+      evs, unix_lst
+  
+end
+
+module BaseCustom = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseCustom.ml"
+  
+  open BaseEnv
+  open BaseMessage
+  open OASISTypes
+  open OASISGettext
+  
+  let run cmd args extra_args =
+    BaseExec.run
+      (var_expand cmd)
+      (List.map
+         var_expand
+         (args @ (Array.to_list extra_args)))
+  
+  let hook ?(failsafe=false) cstm f e =
+    let optional_command lst =
+      let printer =
+        function
+          | Some (cmd, args) -> String.concat " " (cmd :: args)
+          | None -> s_ "No command"
+      in
+        match
+          var_choose
+            ~name:(s_ "Pre/Post Command")
+            ~printer
+            lst with
+          | Some (cmd, args) ->
+              begin
+                try
+                  run cmd args [||]
+                with e when failsafe ->
+                  warning
+                    (f_ "Command '%s' fail with error: %s")
+                    (String.concat " " (cmd :: args))
+                    (match e with
+                       | Failure msg -> msg
+                       | e -> Printexc.to_string e)
+              end
+          | None ->
+              ()
+    in
+    let res =
+      optional_command cstm.pre_command;
+      f e
+    in
+      optional_command cstm.post_command;
+      res
+end
+
+module BaseDynVar = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseDynVar.ml"
+  
+  
+  open OASISTypes
+  open OASISGettext
+  open BaseEnv
+  open BaseBuilt
+  
+  let init pkg =
+    List.iter
+      (function
+         | Executable (cs, bs, exec) ->
+             if var_choose bs.bs_build then
+               var_ignore
+                 (var_redefine
+                    (* We don't save this variable *)
+                    ~dump:false
+                    ~short_desc:(fun () ->
+                                   Printf.sprintf
+                                     (f_ "Filename of executable '%s'")
+                                     cs.cs_name)
+                    cs.cs_name
+                    (fun () ->
+                       let fn_opt =
+                         fold
+                           BExec cs.cs_name
+                           (fun _ fn -> Some fn)
+                           None
+                       in
+                         match fn_opt with
+                           | Some fn -> fn
+                           | None ->
+                               raise
+                                 (PropList.Not_set
+                                    (cs.cs_name,
+                                     Some (Printf.sprintf
+                                             (f_ "Executable '%s' not yet built.")
+                                             cs.cs_name)))))
+  
+         | Library _ | Flag _ | Test _ | SrcRepo _ | Doc _ ->
+             ())
+      pkg.sections
+end
+
+module BaseTest = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseTest.ml"
+  
+  open BaseEnv
+  open BaseMessage
+  open OASISTypes
+  open OASISExpr
+  open OASISGettext
+  
+  let test lst pkg extra_args =
+  
+    let one_test (failure, n) (test_plugin, cs, test) =
+      if var_choose
+           ~name:(Printf.sprintf
+                    (f_ "test %s run")
+                    cs.cs_name)
+           ~printer:string_of_bool
+           test.test_run then
+        begin
+          let () =
+            info (f_ "Running test '%s'") cs.cs_name
+          in
+          let back_cwd =
+            match test.test_working_directory with
+              | Some dir ->
+                  let cwd =
+                    Sys.getcwd ()
+                  in
+                  let chdir d =
+                    info (f_ "Changing directory to '%s'") d;
+                    Sys.chdir d
+                  in
+                    chdir dir;
+                    fun () -> chdir cwd
+  
+              | None ->
+                  fun () -> ()
+          in
+            try
+              let failure_percent =
+                BaseCustom.hook
+                  test.test_custom
+                  (test_plugin pkg (cs, test))
+                  extra_args
+              in
+                back_cwd ();
+                (failure_percent +. failure, n + 1)
+            with e ->
+              begin
+                back_cwd ();
+                raise e
+              end
+        end
+      else
+        begin
+          info (f_ "Skipping test '%s'") cs.cs_name;
+          (failure, n)
+        end
+    in
+    let (failed, n) =
+      List.fold_left
+        one_test
+        (0.0, 0)
+        lst
+    in
+    let failure_percent =
+      if n = 0 then
+        0.0
+      else
+        failed /. (float_of_int n)
+    in
+    let msg =
+      Printf.sprintf
+        (f_ "Tests had a %.2f%% failure rate")
+        (100. *. failure_percent)
+    in
+      if failure_percent > 0.0 then
+        failwith msg
+      else
+        info "%s" msg
+end
+
+module BaseDoc = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseDoc.ml"
+  
+  open BaseEnv
+  open BaseMessage
+  open OASISTypes
+  open OASISGettext
+  
+  let doc lst pkg extra_args =
+  
+    let one_doc (doc_plugin, cs, doc) =
+      if var_choose
+           ~name:(Printf.sprintf
+                   (f_ "documentation %s build")
+                   cs.cs_name)
+           ~printer:string_of_bool
+           doc.doc_build then
+        begin
+          info (f_ "Building documentation '%s'") cs.cs_name;
+          BaseCustom.hook
+            doc.doc_custom
+            (doc_plugin pkg (cs, doc))
+            extra_args
+        end
+    in
+      List.iter
+        one_doc
+        lst
+end
+
+module BaseSetup = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseSetup.ml"
+  
+  open BaseEnv
+  open BaseMessage
+  open OASISTypes
+  open OASISSection
+  open OASISGettext
+  open OASISUtils
+  
+  type std_args_fun =
+      package -> string array -> unit
+  
+  type ('a, 'b) section_args_fun =
+      name * (package -> (common_section * 'a) -> string array -> 'b)
+  
+  type t =
+      {
+        configure:       std_args_fun;
+        build:           std_args_fun;
+        doc:             ((doc, unit)  section_args_fun) list;
+        test:            ((test, float) section_args_fun) list;
+        install:         std_args_fun;
+        uninstall:       std_args_fun;
+        clean:           std_args_fun list;
+        clean_doc:       (doc, unit) section_args_fun list;
+        clean_test:      (test, unit) section_args_fun list;
+        distclean:       std_args_fun list;
+        distclean_doc:   (doc, unit) section_args_fun list;
+        distclean_test:  (test, unit) section_args_fun list;
+        package:         package;
+        version:         string;
+      }
+  
+  (* Associate a plugin function with data from package *)
+  let join_plugin_sections filter_map lst =
+    List.rev
+      (List.fold_left
+         (fun acc sct ->
+            match filter_map sct with
+              | Some e ->
+                  e :: acc
+              | None ->
+                  acc)
+         []
+         lst)
+  
+  (* Search for plugin data associated with a section name *)
+  let lookup_plugin_section plugin action nm lst =
+    try
+      List.assoc nm lst
+    with Not_found ->
+      failwithf
+        (f_ "Cannot find plugin %s matching section %s for %s action")
+        plugin
+        nm
+        action
+  
+  let configure t args =
+    (* Run configure *)
+    BaseCustom.hook
+      t.package.conf_custom
+      (fun () -> 
+         (* Reload if preconf has changed it *)
+         begin
+           try
+             unload ();
+             load ();
+           with _ ->
+             ()
+         end;
+  
+         (* Run plugin's configure *)
+         t.configure t.package args;
+  
+         (* Dump to allow postconf to change it *)
+         dump ())
+      ();
+  
+    (* Reload environment *)
+    unload ();
+    load ();
+  
+    (* Save environment *)
+    print ();
+  
+    (* Replace data in file *)
+    BaseFileAB.replace t.package.files_ab
+  
+  let build t args =
+    BaseCustom.hook
+      t.package.build_custom
+      (t.build t.package)
+      args
+  
+  let doc t args =
+    if bool_of_string (BaseStandardVar.docs ()) then
+      BaseDoc.doc
+        (join_plugin_sections
+           (function
+              | Doc (cs, e) ->
+                  Some
+                    (lookup_plugin_section
+                       "documentation"
+                       (s_ "build")
+                       cs.cs_name
+                       t.doc,
+                     cs,
+                     e)
+              | _ ->
+                  None)
+           t.package.sections)
+        t.package
+        args
+    else
+      BaseMessage.warning
+        "Docs are turned off, consider enabling with \
+         'ocaml setup.ml -configure --enable-docs'"
+  
+  let test t args =
+    if bool_of_string (BaseStandardVar.tests ()) then
+      BaseTest.test
+        (join_plugin_sections
+           (function
+              | Test (cs, e) ->
+                  Some
+                    (lookup_plugin_section
+                       "test"
+                       (s_ "run")
+                       cs.cs_name
+                       t.test,
+                     cs,
+                     e)
+              | _ ->
+                  None)
+           t.package.sections)
+        t.package
+        args
+    else
+      BaseMessage.warning
+        "Tests are turned off, consider enabling with \
+         'ocaml setup.ml -configure --enable-tests'"
+  
+  let all t args =
+    let rno_doc =
+      ref false
+    in
+    let rno_test =
+      ref false
+    in
+      Arg.parse_argv
+        ~current:(ref 0)
+        (Array.of_list
+           ((Sys.executable_name^" all") ::
+            (Array.to_list args)))
+        [
+          "-no-doc",
+          Arg.Set rno_doc,
+          s_ "Don't run doc target";
+  
+          "-no-test",
+          Arg.Set rno_test,
+          s_ "Don't run test target";
+        ]
+        (failwithf (f_ "Don't know what to do with '%s'"))
+        "";
+  
+      info "Running configure step";
+      configure t [||];
+  
+      info "Running build step";
+      build     t [||];
+  
+      (* Load setup.log dynamic variables *)
+      BaseDynVar.init t.package;
+  
+      if not !rno_doc then
+        begin
+          info "Running doc step";
+          doc t [||];
+        end
+      else
+        begin
+          info "Skipping doc step"
+        end;
+  
+      if not !rno_test then
+        begin
+          info "Running test step";
+          test t [||]
+        end
+      else
+        begin
+          info "Skipping test step"
+        end
+  
+  let install t args =
+    BaseCustom.hook
+      t.package.install_custom
+      (t.install t.package)
+      args
+  
+  let uninstall t args =
+    BaseCustom.hook
+      t.package.uninstall_custom
+      (t.uninstall t.package)
+      args
+  
+  let reinstall t args =
+    uninstall t args;
+    install t args
+  
+  let clean, distclean =
+    let failsafe f a =
+      try
+        f a
+      with e ->
+        warning
+          (f_ "Action fail with error: %s")
+          (match e with
+             | Failure msg -> msg
+             | e -> Printexc.to_string e)
+    in
+  
+    let generic_clean t cstm mains docs tests args =
+      BaseCustom.hook
+        ~failsafe:true
+        cstm
+        (fun () ->
+           (* Clean section *)
+           List.iter
+             (function
+                | Test (cs, test) ->
+                    let f =
+                      try
+                        List.assoc cs.cs_name tests
+                      with Not_found ->
+                        fun _ _ _ -> ()
+                    in
+                      failsafe
+                        (f t.package (cs, test))
+                        args
+                | Doc (cs, doc) ->
+                    let f =
+                      try
+                        List.assoc cs.cs_name docs
+                      with Not_found ->
+                        fun _ _ _ -> ()
+                    in
+                      failsafe
+                        (f t.package (cs, doc))
+                        args
+                | Library _
+                | Executable _
+                | Flag _
+                | SrcRepo _ ->
+                    ())
+             t.package.sections;
+           (* Clean whole package *)
+           List.iter
+             (fun f ->
+                failsafe
+                  (f t.package)
+                  args)
+             mains)
+        ()
+    in
+  
+    let clean t args =
+      generic_clean
+        t
+        t.package.clean_custom
+        t.clean
+        t.clean_doc
+        t.clean_test
+        args
+    in
+  
+    let distclean t args =
+      (* Call clean *)
+      clean t args;
+  
+      (* Remove generated file *)
+      List.iter
+        (fun fn ->
+           if Sys.file_exists fn then
+             begin
+               info (f_ "Remove '%s'") fn;
+               Sys.remove fn
+             end)
+        (BaseEnv.default_filename
+         ::
+         BaseLog.default_filename
+         ::
+         (List.rev_map BaseFileAB.to_filename t.package.files_ab));
+  
+      (* Call distclean code *)
+      generic_clean
+        t
+        t.package.distclean_custom
+        t.distclean
+        t.distclean_doc
+        t.distclean_test
+        args
+    in
+  
+      clean, distclean
+  
+  let version t _ =
+    print_endline t.version
+  
+  let setup t =
+    let catch_exn =
+      ref true
+    in
+      try
+        let act_ref =
+          ref (fun _ ->
+                 failwithf
+                   (f_ "No action defined, run '%s %s -help'")
+                   Sys.executable_name
+                   Sys.argv.(0))
+  
+        in
+        let extra_args_ref =
+          ref []
+        in
+        let allow_empty_env_ref =
+          ref false
+        in
+        let arg_handle ?(allow_empty_env=false) act =
+          Arg.Tuple
+            [
+              Arg.Rest (fun str -> extra_args_ref := str :: !extra_args_ref);
+  
+              Arg.Unit
+                (fun () ->
+                   allow_empty_env_ref := allow_empty_env;
+                   act_ref := act);
+            ]
+        in
+  
+          Arg.parse
+            (Arg.align
+               [
+                 "-configure",
+                 arg_handle ~allow_empty_env:true configure,
+                 s_ "[options*] Configure the whole build process.";
+  
+                 "-build",
+                 arg_handle build,
+                 s_ "[options*] Build executables and libraries.";
+  
+                 "-doc",
+                 arg_handle doc,
+                 s_ "[options*] Build documents.";
+  
+                 "-test",
+                 arg_handle test,
+                 s_ "[options*] Run tests.";
+  
+                 "-all",
+                 arg_handle ~allow_empty_env:true all,
+                 s_ "[options*] Run configure, build, doc and test targets.";
+  
+                 "-install",
+                 arg_handle install,
+                 s_ "[options*] Install libraries, data, executables \
+                                and documents.";
+  
+                 "-uninstall",
+                 arg_handle uninstall,
+                 s_ "[options*] Uninstall libraries, data, executables \
+                                and documents.";
+  
+                 "-reinstall",
+                 arg_handle reinstall,
+                 s_ "[options*] Uninstall and install libraries, data, \
+                                executables and documents.";
+  
+                 "-clean",
+                 arg_handle ~allow_empty_env:true clean,
+                 s_ "[options*] Clean files generated by a build.";
+  
+                 "-distclean",
+                 arg_handle ~allow_empty_env:true distclean,
+                 s_ "[options*] Clean files generated by a build and configure.";
+  
+                 "-version",
+                 arg_handle ~allow_empty_env:true version,
+                 s_ " Display version of OASIS used to generate this setup.ml.";
+  
+                 "-no-catch-exn",
+                 Arg.Clear catch_exn,
+                 s_ " Don't catch exception, useful for debugging.";
+               ]
+             @ (BaseContext.args ()))
+            (failwithf (f_ "Don't know what to do with '%s'"))
+            (s_ "Setup and run build process current package\n");
+  
+          (* Build initial environment *)
+          load ~allow_empty:!allow_empty_env_ref ();
+  
+          (** Initialize flags *)
+          List.iter
+            (function
+               | Flag (cs, {flag_description = hlp;
+                            flag_default = choices}) ->
+                   begin
+                     let apply ?short_desc () =
+                       var_ignore
+                         (var_define
+                            ~cli:CLIEnable
+                            ?short_desc
+                            (OASISUtils.varname_of_string cs.cs_name)
+                            (fun () ->
+                               string_of_bool
+                                 (var_choose
+                                    ~name:(Printf.sprintf
+                                             (f_ "default value of flag %s")
+                                             cs.cs_name)
+                                    ~printer:string_of_bool
+                                             choices)))
+                     in
+                       match hlp with
+                         | Some hlp ->
+                             apply ~short_desc:(fun () -> hlp) ()
+                         | None ->
+                             apply ()
+                   end
+               | _ ->
+                   ())
+            t.package.sections;
+  
+          BaseStandardVar.init t.package;
+  
+          BaseDynVar.init t.package;
+  
+          !act_ref t (Array.of_list (List.rev !extra_args_ref))
+  
+      with e when !catch_exn ->
+        error "%s" (Printexc.to_string e);
+        exit 1
+  
+end
+
+module BaseDev = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/base/BaseDev.ml"
+  
+  
+  
+  open OASISGettext
+  open BaseMessage
+  
+  type t =
+      {
+        oasis_cmd:  string;
+      } 
+  
+  let update_and_run t =
+    (* Command line to run setup-dev *)
+    let oasis_args =
+      "setup-dev" :: "-run" ::
+      Sys.executable_name ::
+      (Array.to_list Sys.argv)
+    in
+  
+    let exit_on_child_error =
+      function
+        | 0 -> ()
+        | 2 ->
+            (* Bad CLI arguments *)
+            error
+              (f_ "The command '%s %s' exit with code 2. It often means that we \
+                   don't use the right command-line arguments, rerun \
+                   'oasis setup-dev'.")
+              t.oasis_cmd
+              (String.concat " " oasis_args)
+  
+        | 127 ->
+            (* Cannot find OASIS *)
+            error
+              (f_ "Cannot find executable '%s', check where 'oasis' is located \
+                   and rerun 'oasis setup-dev'")
+              t.oasis_cmd
+  
+        | i ->
+            exit i
+    in
+  
+    let () =
+      (* Run OASIS to generate a temporary setup.ml
+       *)
+      BaseExec.run
+        ~f_exit_code:exit_on_child_error
+        t.oasis_cmd
+        oasis_args
+    in
+  
+      ()
+  
+end
+
+
+module InternalConfigurePlugin = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/internal/InternalConfigurePlugin.ml"
+  
+  (** Configure using internal scheme
+      @author Sylvain Le Gall
+    *)
+  
+  open BaseEnv
+  open OASISTypes
+  open OASISUtils
+  open OASISGettext
+  open BaseMessage
+  
+  (** Configure build using provided series of check to be done
+    * and then output corresponding file.
+    *)
+  let configure pkg argv =
+    let var_ignore_eval var =
+      let _s : string =
+        var ()
+      in
+        ()
+    in
+  
+    let errors =
+      ref SetString.empty
+    in
+  
+    let buff =
+      Buffer.create 13
+    in
+  
+    let add_errors fmt =
+      Printf.kbprintf
+        (fun b ->
+           errors := SetString.add (Buffer.contents b) !errors;
+           Buffer.clear b)
+        buff
+        fmt
+    in
+  
+    let warn_exception e =
+      warning "%s" (Printexc.to_string e)
+    in
+  
+    (* Check tools *)
+    let check_tools lst =
+      List.iter
+        (function
+           | ExternalTool tool ->
+               begin
+                 try
+                   var_ignore_eval (BaseCheck.prog tool)
+                 with e ->
+                   warn_exception e;
+                   add_errors (f_ "Cannot find external tool '%s'") tool
+               end
+           | InternalExecutable nm1 ->
+               (* Check that matching tool is built *)
+               List.iter
+                 (function
+                    | Executable ({cs_name = nm2},
+                                  {bs_build = build},
+                                  _) when nm1 = nm2 ->
+                         if not (var_choose build) then
+                           add_errors
+                             (f_ "Cannot find buildable internal executable \
+                                  '%s' when checking build depends")
+                             nm1
+                    | _ ->
+                        ())
+                 pkg.sections)
+        lst
+    in
+  
+    let build_checks sct bs =
+      if var_choose bs.bs_build then
+        begin
+          if bs.bs_compiled_object = Native then
+            begin
+              try
+                var_ignore_eval BaseStandardVar.ocamlopt
+              with e ->
+                warn_exception e;
+                add_errors
+                  (f_ "Section %s requires native compilation")
+                  (OASISSection.string_of_section sct)
+            end;
+  
+          (* Check tools *)
+          check_tools bs.bs_build_tools;
+  
+          (* Check depends *)
+          List.iter
+            (function
+               | FindlibPackage (findlib_pkg, version_comparator) ->
+                   begin
+                     try
+                       var_ignore_eval
+                         (BaseCheck.package ?version_comparator findlib_pkg)
+                     with e ->
+                       warn_exception e;
+                       match version_comparator with
+                         | None ->
+                             add_errors
+                               (f_ "Cannot find findlib package %s")
+                               findlib_pkg
+                         | Some ver_cmp ->
+                             add_errors
+                               (f_ "Cannot find findlib package %s (%s)")
+                               findlib_pkg
+                               (OASISVersion.string_of_comparator ver_cmp)
+                   end
+               | InternalLibrary nm1 ->
+                   (* Check that matching library is built *)
+                   List.iter
+                     (function
+                        | Library ({cs_name = nm2},
+                                   {bs_build = build},
+                                   _) when nm1 = nm2 ->
+                             if not (var_choose build) then
+                               add_errors
+                                 (f_ "Cannot find buildable internal library \
+                                      '%s' when checking build depends")
+                                 nm1
+                        | _ ->
+                            ())
+                     pkg.sections)
+            bs.bs_build_depends
+        end
+    in
+  
+    (* Parse command line *)
+    BaseArgExt.parse argv (BaseEnv.args ());
+  
+    (* OCaml version *)
+    begin
+      match pkg.ocaml_version with
+        | Some ver_cmp ->
+            begin
+              try
+                var_ignore_eval
+                  (BaseCheck.version
+                     "ocaml"
+                     ver_cmp
+                     BaseStandardVar.ocaml_version)
+              with e ->
+                warn_exception e;
+                add_errors
+                  (f_ "OCaml version %s doesn't match version constraint %s")
+                  (BaseStandardVar.ocaml_version ())
+                  (OASISVersion.string_of_comparator ver_cmp)
+            end
+        | None ->
+            ()
+    end;
+  
+    (* Findlib version *)
+    begin
+      match pkg.findlib_version with
+        | Some ver_cmp ->
+            begin
+              try
+                var_ignore_eval
+                  (BaseCheck.version
+                     "findlib"
+                     ver_cmp
+                     BaseStandardVar.findlib_version)
+              with e ->
+                warn_exception e;
+                add_errors
+                  (f_ "Findlib version %s doesn't match version constraint %s")
+                  (BaseStandardVar.findlib_version ())
+                  (OASISVersion.string_of_comparator ver_cmp)
+            end
+        | None ->
+            ()
+    end;
+  
+    (* Check build depends *)
+    List.iter
+      (function
+         | Executable (_, bs, _)
+         | Library (_, bs, _) as sct ->
+             build_checks sct bs
+         | Doc (_, doc) ->
+             if var_choose doc.doc_build then
+               check_tools doc.doc_build_tools
+         | Test (_, test) ->
+             if var_choose test.test_run then
+               check_tools test.test_tools
+         | _ ->
+             ())
+      pkg.sections;
+  
+    (* Check errors *)
+    if SetString.empty != !errors then
+      begin
+        List.iter
+          (fun e -> error "%s" e)
+          (SetString.elements !errors);
+        failwithf
+          (fn_
+             "%d configuration error"
+             "%d configuration errors"
+             (SetString.cardinal !errors))
+          (SetString.cardinal !errors)
+      end
+  
+end
+
+module InternalInstallPlugin = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/internal/InternalInstallPlugin.ml"
+  
+  (** Install using internal scheme
+      @author Sylvain Le Gall
+    *)
+  
+  open BaseEnv
+  open BaseStandardVar
+  open BaseMessage
+  open OASISTypes
+  open OASISLibrary
+  open OASISGettext
+  open OASISUtils
+  
+  let exec_hook =
+    ref (fun (cs, bs, exec) -> cs, bs, exec)
+  
+  let lib_hook =
+    ref (fun (cs, bs, lib) -> cs, bs, lib, [])
+  
+  let doc_hook =
+    ref (fun (cs, doc) -> cs, doc)
+  
+  let install_file_ev =
+    "install-file"
+  
+  let install_dir_ev =
+    "install-dir"
+  
+  let install_findlib_ev =
+    "install-findlib"
+  
+  let install pkg argv =
+  
+    let in_destdir =
+      try
+        let destdir =
+          destdir ()
+        in
+          (* Practically speaking destdir is prepended
+           * at the beginning of the target filename
+           *)
+          fun fn -> destdir^fn
+      with PropList.Not_set _ ->
+        fun fn -> fn
+    in
+  
+    let install_file ?tgt_fn src_file envdir =
+      let tgt_dir =
+        in_destdir (envdir ())
+      in
+      let tgt_file =
+        Filename.concat
+          tgt_dir
+          (match tgt_fn with
+             | Some fn ->
+                 fn
+             | None ->
+                 Filename.basename src_file)
+      in
+        (* Create target directory if needed *)
+        BaseFileUtil.mkdir_parent
+          (fun dn ->
+             info (f_ "Creating directory '%s'") dn;
+             BaseLog.register install_dir_ev dn)
+          tgt_dir;
+  
+        (* Really install files *)
+        info (f_ "Copying file '%s' to '%s'") src_file tgt_file;
+        BaseFileUtil.cp src_file tgt_file;
+        BaseLog.register install_file_ev tgt_file
+    in
+  
+    (* Install data into defined directory *)
+    let install_data srcdir lst tgtdir =
+      let tgtdir =
+        BaseFilePath.of_unix (var_expand tgtdir)
+      in
+        List.iter
+          (fun (src, tgt_opt) ->
+             let real_srcs =
+               BaseFileUtil.glob
+                 (Filename.concat srcdir src)
+             in
+               if real_srcs = [] then
+                 failwithf
+                   (f_ "Wildcard '%s' doesn't match any files")
+                   src;
+               List.iter
+                 (fun fn ->
+                    install_file
+                      fn
+                      (fun () ->
+                         match tgt_opt with
+                           | Some s ->
+                               BaseFilePath.of_unix (var_expand s)
+                           | None ->
+                               tgtdir))
+                 real_srcs)
+          lst
+    in
+  
+    (** Install all libraries *)
+    let install_libs pkg =
+  
+      let files_of_library (f_data, acc) data_lib =
+        let cs, bs, lib, lib_extra =
+          !lib_hook data_lib
+        in
+          if var_choose bs.bs_install &&
+             BaseBuilt.is_built BaseBuilt.BLib cs.cs_name then
+            begin
+              let acc =
+                (* Start with acc + lib_extra *)
+                List.rev_append lib_extra acc
+              in
+              let acc =
+                (* Add uncompiled header from the source tree *)
+                let path =
+                  BaseFilePath.of_unix bs.bs_path
+                in
+                  List.fold_left
+                    (fun acc modul ->
+                       try
+                         List.find
+                           Sys.file_exists
+                           (List.map
+                              (Filename.concat path)
+                              [modul^".mli";
+                               modul^".ml";
+                               String.uncapitalize modul^".mli";
+                               String.capitalize   modul^".mli";
+                               String.uncapitalize modul^".ml";
+                               String.capitalize   modul^".ml"])
+                         :: acc
+                       with Not_found ->
+                         begin
+                           warning
+                             (f_ "Cannot find source header for module %s \
+                                  in library %s")
+                             modul cs.cs_name;
+                           acc
+                         end)
+                    acc
+                    lib.lib_modules
+              in
+  
+              let acc =
+               (* Get generated files *)
+               BaseBuilt.fold
+                 BaseBuilt.BLib
+                 cs.cs_name
+                 (fun acc fn -> fn :: acc)
+                 acc
+              in
+  
+              let f_data () =
+                (* Install data associated with the library *)
+                install_data
+                  bs.bs_path
+                  bs.bs_data_files
+                  (Filename.concat
+                     (datarootdir ())
+                     pkg.name);
+                f_data ()
+              in
+  
+                (f_data, acc)
+            end
+           else
+            begin
+              (f_data, acc)
+            end
+      in
+  
+      (* Install one group of library *)
+      let install_group_lib grp =
+        (* Iterate through all group nodes *)
+        let rec install_group_lib_aux data_and_files grp =
+          let data_and_files, children =
+            match grp with
+              | Container (_, children) ->
+                  data_and_files, children
+              | Package (_, cs, bs, lib, children) ->
+                  files_of_library data_and_files (cs, bs, lib), children
+          in
+            List.fold_left
+              install_group_lib_aux
+              data_and_files
+              children
+        in
+  
+        (* Findlib name of the root library *)
+        let findlib_name =
+          findlib_of_group grp
+        in
+  
+        (* Determine root library *)
+        let root_lib =
+          root_of_group grp
+        in
+  
+        (* All files to install for this library *)
+        let f_data, files =
+          install_group_lib_aux (ignore, []) grp
+        in
+  
+          (* Really install, if there is something to install *)
+          if files = [] then
+            begin
+              warning
+                (f_ "Nothing to install for findlib library '%s'")
+                findlib_name
+            end
+          else
+            begin
+              let meta =
+                (* Search META file *)
+                let (_, bs, _) =
+                  root_lib
+                in
+                let res =
+                  Filename.concat bs.bs_path "META"
+                in
+                  if not (Sys.file_exists res) then
+                    failwithf
+                      (f_ "Cannot find file '%s' for findlib library %s")
+                      res
+                      findlib_name;
+                  res
+              in
+              let files = 
+                (* Make filename shorter to avoid hitting command max line length
+                 * too early, esp. on Windows.
+                 *)
+                let remove_prefix p n =
+                  let plen = String.length p in
+                  let nlen = String.length n in
+                    if plen <= nlen && String.sub n 0 plen = p then
+                      begin
+                        let fn_sep = 
+                          if Sys.os_type = "Win32" then
+                            '\\'
+                          else
+                            '/'
+                        in
+                        let cutpoint = plen +
+                          (if plen < nlen && n.[plen] = fn_sep then 
+                             1
+                           else 
+                             0)
+                        in
+                          String.sub n cutpoint (nlen - cutpoint)
+                      end
+                    else 
+                      n
+                in
+                  List.map (remove_prefix (Sys.getcwd ())) files 
+              in
+                info
+                  (f_ "Installing findlib library '%s'")
+                  findlib_name;
+                BaseExec.run
+                  (ocamlfind ())
+                  ("install" :: findlib_name :: meta :: files);
+                BaseLog.register install_findlib_ev findlib_name
+            end;
+  
+          (* Install data files *)
+          f_data ();
+  
+      in
+  
+        (* We install libraries in groups *)
+        List.iter
+          install_group_lib
+          (group_libs pkg)
+    in
+  
+    let install_execs pkg =
+      let install_exec data_exec =
+        let (cs, bs, exec) =
+          !exec_hook data_exec
+        in
+          if var_choose bs.bs_install &&
+             BaseBuilt.is_built BaseBuilt.BExec cs.cs_name then
+            begin
+              let exec_libdir () =
+                Filename.concat
+                  (libdir ())
+                  pkg.name
+              in
+                BaseBuilt.fold
+                  BaseBuilt.BExec
+                  cs.cs_name
+                  (fun () fn ->
+                     install_file
+                       ~tgt_fn:cs.cs_name
+                       fn
+                       bindir)
+                  ();
+                BaseBuilt.fold
+                  BaseBuilt.BExecLib
+                  cs.cs_name
+                  (fun () fn ->
+                     install_file
+                       fn
+                       exec_libdir)
+                  ();
+                install_data
+                  bs.bs_path
+                  bs.bs_data_files
+                  (Filename.concat
+                     (datarootdir ())
+                     pkg.name)
+            end
+      in
+        List.iter
+          (function
+             | Executable (cs, bs, exec)->
+                 install_exec (cs, bs, exec)
+             | _ ->
+                 ())
+          pkg.sections
+    in
+  
+    let install_docs pkg =
+      let install_doc data =
+        let (cs, doc) =
+          !doc_hook data
+        in
+          if var_choose doc.doc_install &&
+             BaseBuilt.is_built BaseBuilt.BDoc cs.cs_name then
+            begin
+              let tgt_dir =
+                BaseFilePath.of_unix (var_expand doc.doc_install_dir)
+              in
+                BaseBuilt.fold
+                  BaseBuilt.BDoc
+                  cs.cs_name
+                  (fun () fn ->
+                     install_file
+                       fn
+                       (fun () -> tgt_dir))
+                ();
+                install_data
+                  Filename.current_dir_name
+                  doc.doc_data_files
+                  doc.doc_install_dir
+            end
+      in
+        List.iter
+          (function
+             | Doc (cs, doc) ->
+                 install_doc (cs, doc)
+             | _ ->
+                 ())
+          pkg.sections
+    in
+  
+      install_libs  pkg;
+      install_execs pkg;
+      install_docs  pkg
+  
+  (* Uninstall already installed data *)
+  let uninstall _ argv =
+    List.iter
+      (fun (ev, data) ->
+         if ev = install_file_ev then
+           begin
+             if Sys.file_exists data then
+               begin
+                 info
+                   (f_ "Removing file '%s'")
+                   data;
+                 Sys.remove data
+               end
+             else
+               begin
+                 warning
+                   (f_ "File '%s' doesn't exist anymore")
+                   data
+               end
+           end
+         else if ev = install_dir_ev then
+           begin
+             if Sys.file_exists data && Sys.is_directory data then
+               begin
+                 if Sys.readdir data = [||] then
+                   begin
+                     info
+                       (f_ "Removing directory '%s'")
+                       data;
+                     BaseFileUtil.rmdir data
+                   end
+                 else
+                   begin
+                     warning
+                       (f_ "Directory '%s' is not empty (%s)")
+                       data
+                       (String.concat
+                          ", "
+                          (Array.to_list
+                             (Sys.readdir data)))
+                   end
+               end
+             else
+               begin
+                 warning
+                   (f_ "Directory '%s' doesn't exist anymore")
+                   data
+               end
+           end
+         else if ev = install_findlib_ev then
+           begin
+             info (f_ "Removing findlib library '%s'") data;
+             BaseExec.run (ocamlfind ()) ["remove"; data]
+           end
+         else
+           failwithf (f_ "Unknown log event '%s'") ev;
+         BaseLog.unregister ev data)
+      (* We process event in reverse order *)
+      (List.rev
+         (BaseLog.filter
+            [install_file_ev;
+             install_dir_ev;
+             install_findlib_ev;]))
+  
+end
+
+
+module OCamlbuildCommon = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/OCamlbuildCommon.ml"
+  
+  (** Functions common to OCamlbuild build and doc plugin
+    *)
+  
+  open OASISGettext
+  open BaseEnv
+  open BaseStandardVar
+  
+  let ocamlbuild_clean_ev =
+    "ocamlbuild-clean"
+  
+  let ocamlbuildflags =
+    var_define
+      ~short_desc:(fun () -> "OCamlbuild additional flags")
+      "ocamlbuildflags"
+      (fun () -> "")
+  
+  (** Fix special arguments depending on environment *)
+  let fix_args args extra_argv =
+    List.flatten
+      [
+        if (os_type ()) = "Win32" then
+          [
+            "-classic-display";
+            "-no-log";
+            "-no-links";
+            "-install-lib-dir";
+            (Filename.concat (standard_library ()) "ocamlbuild")
+          ]
+        else
+          [];
+  
+        if not (bool_of_string (is_native ())) || (os_type ()) = "Win32" then
+          [
+            "-byte-plugin"
+          ]
+        else
+          [];
+        args;
+  
+        if bool_of_string (debug ()) then
+          ["-tag"; "debug"]
+        else
+          [];
+  
+        if bool_of_string (profile ()) then
+          ["-tag"; "profile"]
+        else
+          [];
+  
+        OASISUtils.split ' ' (ocamlbuildflags ());
+  
+        Array.to_list extra_argv;
+      ]
+  
+  (** Run 'ocamlbuild -clean' if not already done *)
+  let run_clean extra_argv =
+    let extra_cli =
+      String.concat " " (Array.to_list extra_argv)
+    in
+      (* Run if never called with these args *)
+      if not (BaseLog.exists ocamlbuild_clean_ev extra_cli) then
+        begin
+          BaseExec.run (ocamlbuild ()) (fix_args ["-clean"] extra_argv);
+          BaseLog.register ocamlbuild_clean_ev extra_cli;
+          at_exit
+            (fun () ->
+               try
+                 BaseLog.unregister ocamlbuild_clean_ev extra_cli
+               with _ ->
+                 ())
+        end
+  
+  (** Run ocamlbuild, unregister all clean events *)
+  let run_ocamlbuild args extra_argv =
+    (* TODO: enforce that target in args must be UNIX encoded i.e. toto/index.html
+     *)
+    BaseExec.run (ocamlbuild ()) (fix_args args extra_argv);
+    (* Remove any clean event, we must run it again *)
+    List.iter
+      (fun (e, d) -> BaseLog.unregister e d)
+      (BaseLog.filter [ocamlbuild_clean_ev])
+  
+  (** Determine real build directory *)
+  let build_dir extra_argv =
+    let rec search_args dir =
+      function
+        | "-build-dir" :: dir :: tl ->
+            search_args dir tl
+        | _ :: tl ->
+            search_args dir tl
+        | [] ->
+            dir
+    in
+      search_args "_build" (fix_args [] extra_argv)
+  
+end
+
+module OCamlbuildPlugin = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/OCamlbuildPlugin.ml"
+  
+  (** Build using ocamlbuild
+      @author Sylvain Le Gall
+    *)
+  
+  open OASISTypes
+  open OASISGettext
+  open OASISUtils
+  open BaseEnv
+  open OCamlbuildCommon
+  open BaseStandardVar
+  open BaseMessage
+  
+  let cond_targets_hook =
+    ref (fun lst -> lst)
+  
+  let build pkg argv =
+  
+    (* Return the filename in build directory *)
+    let in_build_dir fn =
+      Filename.concat
+        (build_dir argv)
+        fn
+    in
+  
+    (* Return the unix filename in host build directory *)
+    let in_build_dir_of_unix fn =
+      in_build_dir (BaseFilePath.of_unix fn)
+    in
+  
+    let cond_targets =
+      List.fold_left
+        (fun acc ->
+           function
+             | Library (cs, bs, lib) when var_choose bs.bs_build ->
+                 begin
+                   let evs, unix_files =
+                     BaseBuilt.of_library
+                       in_build_dir_of_unix
+                       (cs, bs, lib)
+                   in
+  
+                   let ends_with nd fn =
+                     let nd_len =
+                       String.length nd
+                     in
+                       (String.length fn >= nd_len)
+                       &&
+                       (String.sub
+                          fn
+                          (String.length fn - nd_len)
+                          nd_len) = nd
+                   in
+  
+                   let tgts =
+                     List.flatten
+                       (List.filter
+                          (fun l -> l <> [])
+                          (List.map
+                             (List.filter
+                                (fun fn ->
+                                   ends_with ".cma" fn ||
+                                   ends_with ".cmxa" fn ||
+                                   ends_with (ext_lib ()) fn ||
+                                   ends_with (ext_dll ()) fn))
+                             unix_files))
+                   in
+  
+                     match tgts with
+                       | _ :: _ ->
+                           (evs, tgts) :: acc
+                       | [] ->
+                           failwithf
+                             (f_ "No possible ocamlbuild targets for library %s")
+                             cs.cs_name
+                 end
+  
+             | Executable (cs, bs, exec) when var_choose bs.bs_build ->
+                 begin
+                   let evs, unix_exec_is, unix_dll_opt =
+                     BaseBuilt.of_executable
+                       in_build_dir_of_unix
+                       (cs, bs, exec)
+                   in
+  
+                   let target ext =
+                     let unix_tgt =
+                       (BaseFilePath.Unix.concat
+                          bs.bs_path
+                          (BaseFilePath.Unix.chop_extension
+                             exec.exec_main_is))^ext
+                     in
+                     let evs = 
+                       (* Fix evs, we want to use the unix_tgt, without copying *)
+                       List.map
+                         (function
+                            | BaseBuilt.BExec, nm, lst when nm = cs.cs_name ->
+                                BaseBuilt.BExec, nm, [[in_build_dir_of_unix unix_tgt]]
+                            | ev ->
+                                ev)
+                         evs
+                     in
+                       evs, [unix_tgt]
+                   in
+  
+                   (* Add executable *)
+                   let acc =
+                     match bs.bs_compiled_object with
+                       | Native ->
+                           (target ".native") :: acc
+                       | Best when bool_of_string (is_native ()) ->
+                           (target ".native") :: acc
+                       | Byte
+                       | Best ->
+                           (target ".byte") :: acc
+                   in
+                     acc
+                 end
+  
+             | Library _ | Executable _ | Test _
+             | SrcRepo _ | Flag _ | Doc _ ->
+                 acc)
+        []
+        (* Keep the pkg.sections ordered *)
+        (List.rev pkg.sections);
+    in
+  
+    (* Check and register built files *)
+    let check_and_register (bt, bnm, lst) =
+      List.iter
+        (fun fns ->
+           if not (List.exists Sys.file_exists fns) then
+             failwithf
+               (f_ "No one of expected built files %s exists")
+               (String.concat (s_ ", ") (List.map (Printf.sprintf "'%s'") fns)))
+        lst;
+        (BaseBuilt.register bt bnm lst)
+    in
+  
+    let cond_targets =
+      (* Run the hook *)
+      !cond_targets_hook cond_targets
+    in
+  
+      (* Run a list of target... *)
+      run_ocamlbuild 
+        (List.flatten 
+           (List.map snd cond_targets))
+        argv;
+      (* ... and register events *)
+      List.iter
+        check_and_register
+        (List.flatten (List.map fst cond_targets))
+  
+  
+  let clean pkg extra_args  =
+    run_clean extra_args;
+    List.iter
+      (function
+         | Library (cs, _, _) ->
+             BaseBuilt.unregister BaseBuilt.BLib cs.cs_name
+         | Executable (cs, _, _) ->
+             BaseBuilt.unregister BaseBuilt.BExec cs.cs_name;
+             BaseBuilt.unregister BaseBuilt.BExecLib cs.cs_name
+         | _ ->
+             ())
+      pkg.sections
+  
+end
+
+module OCamlbuildDocPlugin = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/ocamlbuild/OCamlbuildDocPlugin.ml"
+  
+  (* Create documentation using ocamlbuild .odocl files
+     @author Sylvain Le Gall
+   *)
+  
+  open OASISTypes
+  open OASISGettext
+  open OASISMessage
+  open OCamlbuildCommon
+  open BaseStandardVar
+  
+  
+  
+  let doc_build path pkg (cs, doc) argv =
+    let index_html =
+      BaseFilePath.Unix.make
+        [
+          path;
+          cs.cs_name^".docdir";
+          "index.html";
+        ]
+    in
+    let tgt_dir =
+      BaseFilePath.make
+        [
+          build_dir argv;
+          BaseFilePath.of_unix path;
+          cs.cs_name^".docdir";
+        ]
+    in
+      run_ocamlbuild [index_html] argv;
+      List.iter
+        (fun glb ->
+           BaseBuilt.register
+             BaseBuilt.BDoc
+             cs.cs_name
+             [BaseFileUtil.glob
+                (Filename.concat tgt_dir glb)])
+        ["*.html"; "*.css"]
+  
+  let doc_clean t pkg (cs, doc) argv =
+    run_clean argv;
+    BaseBuilt.unregister BaseBuilt.BDoc cs.cs_name
+  
+end
+
+
+module NonePlugin = struct
+# 21 "/Users/dbuenzli/tmp/ocaml/oasis-0.3.0~rc2/src/plugins/none/NonePlugin.ml"
+  
+  (** Plugin to handle "none" generation
+      @author Sylvain Le Gall
+    *)
+  
+  open OASISGettext
+  open OASISUtils
+  
+  let not_implemented str _ _ =
+    failwithf (f_ "No implementation for %s") str
+  
+  let section_not_implemented str pkg _ _ extra_args =
+    not_implemented str pkg extra_args
+  
+end
+
+
+open OASISTypes;;
+
+let setup_t =
+  {
+     BaseSetup.configure = InternalConfigurePlugin.configure;
+     build = OCamlbuildPlugin.build;
+     test = [];
+     doc =
+       [
+          ("api", OCamlbuildDocPlugin.doc_build "doc");
+          ("samples", NonePlugin.not_implemented "doc of section samples");
+          ("distribution",
+            NonePlugin.not_implemented "doc of section distribution")
+       ];
+     install = InternalInstallPlugin.install;
+     uninstall = InternalInstallPlugin.uninstall;
+     clean = [OCamlbuildPlugin.clean];
+     clean_test = [];
+     clean_doc = [("api", OCamlbuildDocPlugin.doc_clean "doc")];
+     distclean = [];
+     distclean_test = [];
+     distclean_doc = [];
+     package =
+       {
+          oasis_version = "0.3";
+          ocaml_version = Some (OASISVersion.VGreaterEqual "3.10.0");
+          findlib_version = None;
+          name = "xmlm";
+          version = "1.1.0";
+          license =
+            OASISLicense.DEP5License
+              {
+                 OASISLicense.license = "BSD3";
+                 exceptions = [];
+                 version = OASISLicense.NoVersion;
+                 };
+          license_file = None;
+          copyrights = ["(c) 2007-2012 Daniel C. Bünzli"];
+          maintainers = [];
+          authors = ["Daniel Bünzli "];
+          homepage = Some "http://erratique.ch/software/xmlm";
+          synopsis = "Streaming XML IO for OCaml";
+          description =
+            Some
+              "Xmlm is an OCaml module for streaming XML IO. It aims at making XML\nprocessing robust and painless. The streaming interface can process\ndocuments without building an in-memory representation. It lets the\nprogrammer translate its data structures to XML documents and\nvice-versa. Functions are provided to easily transform arborescent\ndata structures to/from XML documents.\n\nXmlm is made of a single independent module and distributed under the\nBSD3 license.";
+          categories = [];
+          conf_type = (`Configure, "internal", Some "0.3");
+          conf_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          build_type = (`Build, "ocamlbuild", Some "0.3");
+          build_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          install_type = (`Install, "internal", Some "0.3");
+          install_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          uninstall_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          clean_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          distclean_custom =
+            {
+               pre_command = [(OASISExpr.EBool true, None)];
+               post_command = [(OASISExpr.EBool true, None)];
+               };
+          files_ab = [];
+          sections =
+            [
+               Library
+                 ({
+                     cs_name = "xmlm";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      bs_build = [(OASISExpr.EBool true, true)];
+                      bs_install = [(OASISExpr.EBool true, true)];
+                      bs_path = "src";
+                      bs_compiled_object = Best;
+                      bs_build_depends = [];
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
+                      bs_c_sources = [];
+                      bs_data_files = [];
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
+                      bs_cclib = [(OASISExpr.EBool true, [])];
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
+                      },
+                   {
+                      lib_modules = ["Xmlm"];
+                      lib_pack = false;
+                      lib_internal_modules = [];
+                      lib_findlib_parent = None;
+                      lib_findlib_name = None;
+                      lib_findlib_containers = [];
+                      });
+               SrcRepo
+                 ({
+                     cs_name = "head";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      src_repo_type = Git;
+                      src_repo_location = "git://erratique.ch/repos/xmlm.git";
+                      src_repo_browser =
+                        Some "http://erratique.ch/repos/xmlm";
+                      src_repo_module = None;
+                      src_repo_branch = None;
+                      src_repo_tag = None;
+                      src_repo_subdir = None;
+                      });
+               Doc
+                 ({
+                     cs_name = "api";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      doc_type = (`Doc, "ocamlbuild", Some "0.3");
+                      doc_custom =
+                        {
+                           pre_command = [(OASISExpr.EBool true, None)];
+                           post_command = [(OASISExpr.EBool true, None)];
+                           };
+                      doc_build =
+                        [
+                           (OASISExpr.EBool true, false);
+                           (OASISExpr.EFlag "docs", true)
+                        ];
+                      doc_install = [(OASISExpr.EBool true, true)];
+                      doc_install_dir = "$docdir";
+                      doc_title = "Xmlm's documentation and API reference";
+                      doc_authors = [];
+                      doc_abstract = None;
+                      doc_format = OtherDoc;
+                      doc_data_files = [];
+                      doc_build_tools =
+                        [ExternalTool "ocamlbuild"; ExternalTool "ocamldoc"];
+                      });
+               Doc
+                 ({
+                     cs_name = "samples";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      doc_type = (`Doc, "none", Some "0.3");
+                      doc_custom =
+                        {
+                           pre_command = [(OASISExpr.EBool true, None)];
+                           post_command = [(OASISExpr.EBool true, None)];
+                           };
+                      doc_build =
+                        [
+                           (OASISExpr.EBool true, false);
+                           (OASISExpr.EFlag "docs", true)
+                        ];
+                      doc_install = [(OASISExpr.EBool true, true)];
+                      doc_install_dir = "$docdir";
+                      doc_title = "\"Xmlm's sample code\"";
+                      doc_authors = [];
+                      doc_abstract = None;
+                      doc_format = OtherDoc;
+                      doc_data_files = [("test/*.ml", None)];
+                      doc_build_tools = [ExternalTool "ocamlbuild"];
+                      });
+               Executable
+                 ({
+                     cs_name = "xmltrip";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      bs_build = [(OASISExpr.EBool true, true)];
+                      bs_install = [(OASISExpr.EBool true, true)];
+                      bs_path = "test";
+                      bs_compiled_object = Best;
+                      bs_build_depends = [InternalLibrary "xmlm"];
+                      bs_build_tools = [ExternalTool "ocamlbuild"];
+                      bs_c_sources = [];
+                      bs_data_files = [];
+                      bs_ccopt = [(OASISExpr.EBool true, [])];
+                      bs_cclib = [(OASISExpr.EBool true, [])];
+                      bs_dlllib = [(OASISExpr.EBool true, [])];
+                      bs_dllpath = [(OASISExpr.EBool true, [])];
+                      bs_byteopt = [(OASISExpr.EBool true, [])];
+                      bs_nativeopt = [(OASISExpr.EBool true, [])];
+                      },
+                   {exec_custom = false; exec_main_is = "xmltrip.ml"; });
+               Doc
+                 ({
+                     cs_name = "distribution";
+                     cs_data = PropList.Data.create ();
+                     cs_plugin_data = [];
+                     },
+                   {
+                      doc_type = (`Doc, "none", Some "0.3");
+                      doc_custom =
+                        {
+                           pre_command = [(OASISExpr.EBool true, None)];
+                           post_command = [(OASISExpr.EBool true, None)];
+                           };
+                      doc_build =
+                        [
+                           (OASISExpr.EBool true, false);
+                           (OASISExpr.EFlag "docs", true)
+                        ];
+                      doc_install = [(OASISExpr.EBool true, true)];
+                      doc_install_dir = "$docdir";
+                      doc_title = "\"Xmlm's README and CHANGES files\"";
+                      doc_authors = [];
+                      doc_abstract = None;
+                      doc_format = OtherDoc;
+                      doc_data_files = [("README CHANGES", None)];
+                      doc_build_tools = [ExternalTool "ocamlbuild"];
+                      })
+            ];
+          plugins = [(`Extra, "META", Some "0.3")];
+          schema_data = PropList.Data.create ();
+          plugin_data = [];
+          };
+     version = "0.3.0~rc2";
+     };;
+
+let setup () = BaseSetup.setup setup_t;;
+
+# 5310 "setup.ml"
+(* OASIS_STOP *)
+let () = setup ();;
diff -Nru xmlm-1.0.2/src/META xmlm-1.1.0/src/META
--- xmlm-1.0.2/src/META	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/src/META	2012-03-17 10:50:20.000000000 +0000
@@ -1,6 +1,9 @@
-version = "1.0.2"
-description = "Streaming XML input/output for OCaml"
-archive(byte) = "xmlm.cmo"
-archive(native) = "xmlm.cmx"
-archive(plugin,native) = "xmlm.cmxs"
-directory = "+xmlm"
+# OASIS_START
+# DO NOT EDIT (digest: 2feee555300ef254dfdccf30f34fe3bc)
+version = "1.1.0"
+description = "Streaming XML IO for OCaml"
+archive(byte) = "xmlm.cma"
+archive(native) = "xmlm.cmxa"
+exists_if = "xmlm.cma"
+# OASIS_STOP
+
diff -Nru xmlm-1.0.2/src/xmlm.ml xmlm-1.1.0/src/xmlm.ml
--- xmlm-1.0.2/src/xmlm.ml	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/src/xmlm.ml	2012-03-17 10:50:20.000000000 +0000
@@ -1,8 +1,8 @@
-(*----------------------------------------------------------------------------
-   Copyright (c) 2007-2009, Daniel C. Bünzli. All rights reserved.
-   Distributed under a BSD license, see license at the end of the file.
-   Xmlm version 1.0.2
-  ----------------------------------------------------------------------------*)
+(*---------------------------------------------------------------------------
+   Copyright (c) 2007-2012 Daniel C. Bünzli. All rights reserved.
+   Distributed under a BSD3 license, see license at the end of the file.
+   xmlm release 1.1.0
+  ---------------------------------------------------------------------------*)
 
 module Std_string = String
 module Std_buffer = Buffer
@@ -90,9 +90,10 @@
     | `Channel of out_channel | `Buffer of std_buffer | `Fun of (int -> unit) ]
 
   type output
-  val make_output : ?nl:bool -> ?indent:int option -> 
+  val make_output : ?decl:bool -> ?nl:bool -> ?indent:int option -> 
                     ?ns_prefix:(string -> string option) -> dest -> output
 
+  val output_depth : output -> int
   val output : output -> signal -> unit
   val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
   val output_doc_tree : ('a -> 'a frag) -> output -> (dtd * 'a) -> unit   
@@ -163,7 +164,7 @@
 let uchar_utf16 int16 i = 
   let c0 = int16 i in
   if c0 < 0xD800 || c0 > 0xDFFF then c0 else
-  if c0 >= 0xDBFF then raise Malformed else
+  if c0 > 0xDBFF then raise Malformed else
   let c1 = int16 i in
   (((c0 land 0x3FF) lsl 10) lor (c1 land 0x3FF)) + 0x10000
     
@@ -492,7 +493,7 @@
       while is_name_char i.c do addc_ident i i.c; nextc i done;
       Buffer.contents i.ident
     end
-    
+
   let p_qname i =                                 (* {QName} (Namespace 1.1) *)
     let n = p_ncname i in
     if i.c <> u_colon then (String.empty, n) else (nextc i; (n, p_ncname i))
@@ -940,7 +941,8 @@
     | `Channel of out_channel | `Buffer of std_buffer | `Fun of (int -> unit) ]
 
   type output = 
-      { nl : bool;                (* True if a newline is output at the end. *)
+      { decl : bool;        (* True if the XML declaration should be output. *)
+        nl : bool;                (* True if a newline is output at the end. *)
 	indent : int option;                        (* Optional indentation. *)
 	fun_prefix : string -> string option;            (* Prefix callback. *)
         prefixes : string Ht.t;                   (* uri -> prefix bindings. *)
@@ -957,13 +959,14 @@
   let err_el_end = "end signal without matching start signal"
   let err_data = "data signal not allowed here"
 
-  let make_output ?(nl = false) ?(indent = None) ?(ns_prefix = fun _ ->None) d =
+  let make_output ?(decl = true) ?(nl = false) ?(indent = None) 
+      ?(ns_prefix = fun _ ->None) d =
     let outs, outc = match d with 
     | `Channel c -> (output c), (output_char c)
     | `Buffer b -> (Std_buffer.add_substring b), (Std_buffer.add_char b)
     | `Fun f -> 
 	let os s p l = 
-	  for i = p to p + l - 1 do f (Char.code (Std_string.get s p)) done 
+	  for i = p to p + l - 1 do f (Char.code (Std_string.get s i)) done 
 	in
 	let oc c = f (Char.code c) in 
 	os, oc
@@ -975,9 +978,11 @@
       Ht.add h ns_xmlns n_xmlns;
       h
     in
-    { outs = outs; outc = outc; nl = nl; indent = indent; last_el_start = false;
-      prefixes = prefixes; scopes = []; depth = -1; fun_prefix = ns_prefix; }
- 
+    { decl = decl; outs = outs; outc = outc; nl = nl; indent = indent; 
+      last_el_start = false; prefixes = prefixes; scopes = []; depth = -1; 
+      fun_prefix = ns_prefix; }
+
+  let output_depth o = o.depth
   let outs o s = o.outs s 0 (Std_string.length s)
   let str_utf_8 s = String.to_utf_8 (fun _ s -> s) "" s
   let out_utf_8 o s = ignore (String.to_utf_8 (fun o s -> outs o s; o) o s)
@@ -1043,7 +1048,7 @@
     if o.depth = -1 then 
       begin match s with
       | `Dtd d ->
-	  outs o "\n";
+          if o.decl then outs o "\n";
 	  begin match d with 
 	  | Some dtd -> out_utf_8 o dtd; o.outc '\n' 
 	  | None -> ()
@@ -1168,7 +1173,7 @@
 include Make(String) (Buffer)
     
 (*----------------------------------------------------------------------------
-  Copyright (c) 2007-2009, Daniel C. Bünzli
+  Copyright (c) 2007-2012 Daniel C. Bünzli
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -1183,7 +1188,7 @@
      documentation and/or other materials provided with the
      distribution.
 
-  3. Neither the name of the Daniel C. Bünzli nor the names of
+  3. Neither the name of Daniel C. Bünzli nor the names of
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
 
@@ -1198,4 +1203,4 @@
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ----------------------------------------------------------------------------*)
+  ---------------------------------------------------------------------------*)
diff -Nru xmlm-1.0.2/src/xmlm.mli xmlm-1.1.0/src/xmlm.mli
--- xmlm-1.0.2/src/xmlm.mli	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/src/xmlm.mli	2012-03-17 10:50:20.000000000 +0000
@@ -1,8 +1,8 @@
-(*----------------------------------------------------------------------------
-   Copyright (c) 2007-2009, Daniel C. Bünzli. All rights reserved.
-   Distributed under a BSD license, see license at the end of the file.
-   Xmlm version 1.0.2
-  ----------------------------------------------------------------------------*)
+(*---------------------------------------------------------------------------
+   Copyright (c) 2007-2012 Daniel C. Bünzli. All rights reserved.
+   Distributed under a BSD3 license, see license at the end of the file.
+   xmlm release 1.1.0
+  ---------------------------------------------------------------------------*)
 
 (** Streaming XML IO.  
 
@@ -17,19 +17,18 @@
     Consult the {{:#io}features and limitations} and {{:#ex}examples} 
     of use.
 
-    {e Version 1.0.2 - daniel.buenzl i\@erratique.ch }
+    {e Release 1.1.0 - Daniel Bünzli  }
 
-    {b References.}
-
-    Tim Bray. 
+    {3 References}
+    {ul
+    {- Tim Bray. 
     {e {{:http://www.xml.com/axml/axml.html}The annotated XML Specification}}, 
-    1998. 
-
-    Tim Bray et al. 
+    1998.} 
+    {- Tim Bray et al. 
     {e {{:http://www.w3.org/TR/xml-names11}Namespaces in XML 1.1 (2nd ed.)}},
-    2006.
+    2006.}} *)
 
-    {1 Basic types and values} *)
+(**  {1 Basic types and values} *)
 
 (** The type for character encodings. For [`UTF_16], endianness is
     determined from the 
@@ -202,10 +201,12 @@
 type output
 (** The type for output abstractions. *)
 
-val make_output : ?nl:bool -> ?indent:int option -> 
+val make_output : ?decl:bool -> ?nl:bool -> ?indent:int option -> 
                   ?ns_prefix:(string -> string option) -> dest -> output
 (** Returns a new output abstraction writing to the given destination.
     {ul 
+    {- [decl], if [true] the {{:http://www.w3.org/TR/REC-xml/#NT-XMLDecl} XML
+     declaration} is output (defaults to [true]).}
     {- [nl], if [true] a newline is output when the root's element [`El_end] 
      signal is output.
     Defaults to [false].}
@@ -223,6 +224,10 @@
     the output abstraction is not {{:#TYPEsignal}well-formed} or if a
     namespace name could not be bound to a prefix. *)
 
+val output_depth : output -> int
+(** [output_depth o] is [o]'s current element nesting level (undefined
+    before the first [`El_start] and after the last [`El_end]). *)
+
 val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
 (** Outputs signals corresponding to a value by recursively
     applying the given value deconstructor.
@@ -379,9 +384,10 @@
     | `Channel of out_channel | `Buffer of std_buffer | `Fun of (int -> unit) ]
 
   type output
-  val make_output : ?nl:bool -> ?indent:int option -> 
+  val make_output : ?decl:bool -> ?nl:bool -> ?indent:int option -> 
                     ?ns_prefix:(string -> string option) -> dest -> output
-	
+
+  val output_depth : output -> int
   val output : output -> signal -> unit
   val output_tree : ('a -> 'a frag) -> output -> 'a -> unit
   val output_doc_tree : ('a -> 'a frag) -> output -> (dtd * 'a) -> unit   
@@ -579,9 +585,8 @@
        input with [strip = false] and output with [indent = None].}
     {- Complete whitespace control on output is achieved 
        with [indent = None] and suitable [`Data] signals}}
-*)
 
-(** {1:ex Examples} 
+    {1:ex Examples} 
 
     {2:exseq Sequential processing}    
 
@@ -604,6 +609,7 @@
   Xmlm.output o (Xmlm.input i); (* `Dtd *)
   pull i o 0;
   if not (Xmlm.eoi i) then invalid_arg "document not well-formed"]}
+
     The following function reads a {e sequence} of documents on an
     input channel and outputs it.
 {[let id_seq ic oc = 
@@ -758,8 +764,8 @@
   out (`El_end)]}
 *)
 
-(*----------------------------------------------------------------------------
-  Copyright (c) 2007-2009, Daniel C. Bünzli
+(*---------------------------------------------------------------------------
+  Copyright (c) 2007-2012 Daniel C. Bünzli
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -774,7 +780,7 @@
      documentation and/or other materials provided with the
      distribution.
 
-  3. Neither the name of the Daniel C. Bünzli nor the names of
+  3. Neither the name of Daniel C. Bünzli nor the names of
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
 
@@ -789,4 +795,4 @@
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ----------------------------------------------------------------------------*)
+  ---------------------------------------------------------------------------*)
diff -Nru xmlm-1.0.2/src/xmlm.mllib xmlm-1.1.0/src/xmlm.mllib
--- xmlm-1.0.2/src/xmlm.mllib	1970-01-01 00:00:00.000000000 +0000
+++ xmlm-1.1.0/src/xmlm.mllib	2012-03-17 10:50:20.000000000 +0000
@@ -0,0 +1,4 @@
+# OASIS_START
+# DO NOT EDIT (digest: a60542237d0ee4667a85ba60cfed87af)
+Xmlm
+# OASIS_STOP
diff -Nru xmlm-1.0.2/_tags xmlm-1.1.0/_tags
--- xmlm-1.0.2/_tags	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/_tags	2012-03-17 10:50:20.000000000 +0000
@@ -1,4 +1,21 @@
-<**/*.ml> : annot
- : include
- : include
- : debug
\ No newline at end of file
+# OASIS_START
+# DO NOT EDIT (digest: 7307b3d52fb342f38944383458e4a71f)
+# Ignore VCS directories, you can use the same kind of rule outside 
+# OASIS_START/STOP if you want to exclude directories that contains 
+# useless stuff for the build process
+<**/.svn>: -traverse
+<**/.svn>: not_hygienic
+".bzr": -traverse
+".bzr": not_hygienic
+".hg": -traverse
+".hg": not_hygienic
+".git": -traverse
+".git": not_hygienic
+"_darcs": -traverse
+"_darcs": not_hygienic
+# Library xmlm
+"src": include
+# Executable xmltrip
+: use_xmlm
+: use_xmlm
+# OASIS_STOP
diff -Nru xmlm-1.0.2/test/tests.itarget xmlm-1.1.0/test/tests.itarget
--- xmlm-1.0.2/test/tests.itarget	1970-01-01 00:00:00.000000000 +0000
+++ xmlm-1.1.0/test/tests.itarget	2012-03-17 10:50:20.000000000 +0000
@@ -0,0 +1,3 @@
+xmltrip.native
+examples.native
+xhtml.native
diff -Nru xmlm-1.0.2/test/xmltrip.ml xmlm-1.1.0/test/xmltrip.ml
--- xmlm-1.0.2/test/xmltrip.ml	2009-11-16 15:14:29.000000000 +0000
+++ xmlm-1.1.0/test/xmltrip.ml	2012-03-17 10:50:20.000000000 +0000
@@ -1,7 +1,7 @@
-(*----------------------------------------------------------------------------
-   Copyright (c) 2007-2009, Daniel C. Bünzli. All rights reserved.
-   Distributed under a BSD license, see license at the end of the file.
-  ----------------------------------------------------------------------------*)
+(*---------------------------------------------------------------------------
+   Copyright (c) 2007-2012 Daniel C. Bünzli. All rights reserved.
+   Distributed under a BSD3 license, see license at the end of the file.
+  ---------------------------------------------------------------------------*)
 
 let str = Printf.sprintf
 let exec = Filename.basename Sys.executable_name
@@ -239,8 +239,8 @@
 
 let () = main ()
 
-(*----------------------------------------------------------------------------
-  Copyright (c) 2007-2009, Daniel C. Bünzli
+(*---------------------------------------------------------------------------
+  Copyright (c) 2007-2012 Daniel C. Bünzli
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -255,7 +255,7 @@
      documentation and/or other materials provided with the
      distribution.
 
-  3. Neither the name of the Daniel C. Bünzli nor the names of
+  3. Neither the name of Daniel C. Bünzli nor the names of
      contributors may be used to endorse or promote products derived
      from this software without specific prior written permission.
 
@@ -270,5 +270,5 @@
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  ----------------------------------------------------------------------------*)
+  ---------------------------------------------------------------------------*)