This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository oasis.
commit f022673492248a3b4c4c8084f752e89a6fe683e7
Merge: 7cda038 166a197
Author: Stephane Glondu <st...@glondu.net>
Date: Wed Mar 26 07:20:34 2014 +0100
Merge tag 'upstream/0.4.4'
Upstream version 0.4.4
AUTHORS.txt | 14 +-
CHANGES.txt | 56 +++
HACKING.md | 78 ++++-
INSTALL.txt | 4 +-
Makefile | 13 +-
README.txt | 28 +-
_headache.config | 4 +
_oasis | 13 +-
_tags | 141 ++++----
dist.ml | 4 +-
myocamlbuild.ml | 47 ++-
setup.ml | 350 +++++++++++--------
src/api-oasis.odocl | 5 +-
src/base/BaseData.mli | 4 +
src/base/BaseData.mlify | 1 +
src/base/BaseGenerate.ml | 14 +-
src/base/BaseGenerate.mli | 5 +-
src/base/BaseSetup.ml | 8 +-
src/base/BaseSetup.mli | 1 +
src/{ext/userconf/src/META => base/base.mldylib} | 28 +-
.../FormatExt.ml => base/compiled_setup_ml.ml} | 25 +-
.../plugin1/META => builtin-plugins.mldylib} | 35 +-
src/cli/CLIArgExt.ml | 7 +-
src/cli/Query.ml | 10 +-
src/cli/Setup.ml | 4 +-
src/cli/SetupClean.ml | 14 +-
src/{ext/userconf/src/META => cli/cli.mldylib} | 16 +-
src/dynrun/OASISDynRun.ml | 4 +-
.../userconf/src/META => dynrun/dynrun.mldylib} | 11 +-
src/ext/plugin-loader/src/META | 4 +-
.../src/plugin-loader.mldylib} | 11 +-
.../plugin-loader/test/data/findlib/plugin1/META | 4 +-
.../test/data/findlib/plugin1/plugin1.mldylib} | 11 +-
.../plugin-loader/test/data/findlib/plugin2/META | 4 +-
.../test/data/findlib/plugin2/plugin2.mldylib} | 11 +-
.../plugin-loader/test/data/findlib/plugin3/META | 4 +-
.../test/data/findlib/plugin3/plugin3.mldylib} | 11 +-
.../test/data/findlib/pluginloaderLib/META | 4 +-
.../pluginloaderLib/pluginloaderLib.mldylib} | 11 +-
src/ext/userconf/src/META | 4 +-
src/ext/userconf/src/{META => userconf.mldylib} | 11 +-
src/oasis/FormatExt.ml | 96 ++++++
src/oasis/FormatExt.mli | 35 ++
src/oasis/META | 12 +-
src/oasis/OASISCheck.ml | 2 +-
src/oasis/OASISFeatures.ml | 41 +++
src/oasis/OASISFileTemplate.ml | 380 +++++++++++----------
src/oasis/OASISFileTemplate.mli | 55 +--
src/oasis/OASISFileUtil.ml | 19 +-
src/oasis/OASISGraph.ml | 33 +-
src/oasis/OASISHelp.ml | 2 +-
src/oasis/OASISHostPath.ml | 47 ++-
src/oasis/OASISHostPath.mli | 10 +
src/oasis/OASISLicense.ml | 102 ++++--
src/oasis/OASISLicense.mli | 6 +
src/oasis/OASISPackage_intern.ml | 72 ++--
src/oasis/OASISPlugin.ml | 19 +-
src/oasis/OASISPlugin.mli | 7 +-
src/oasis/OASISQuickstart.ml | 189 ++++++----
src/oasis/OASISRecDescParser.ml | 4 +
src/oasis/{FormatExt.ml => OASISSetupUpdate.ml} | 25 +-
src/oasis/OASISString.ml | 26 ++
src/oasis/OASISSys.mod | 1 +
src/oasis/OASISText.ml | 144 ++++++++
src/oasis/OASISTypes.ml | 71 ++--
src/oasis/OASISTypes.mli | 63 ++--
src/oasis/OASISUnixPath.ml | 10 +-
src/oasis/OASISUnixPath.mli | 6 +
src/oasis/OASISUtils.ml | 89 +++--
src/oasis/OASISUtils.mli | 63 ++--
src/oasis/OASISValues.ml | 26 +-
src/oasis/{oasis.mllib => oasis.mldylib} | 5 +-
src/oasis/oasis.mllib | 5 +-
src/plugins/extra/META/METAPlugin.ml | 2 +-
src/plugins/extra/devfiles/DevFilesPlugin.ml | 66 +++-
src/plugins/extra/devfiles/configure | 3 -
src/plugins/extra/stdfiles/StdFilesPlugin.ml | 334 +++++++++---------
src/plugins/ocamlbuild/MyOCamlbuildBase.ml | 2 +-
src/plugins/ocamlbuild/MyOCamlbuildFindlib.ml | 39 ++-
src/plugins/ocamlbuild/OCamlbuildPlugin.ml | 10 +-
test/TestCommon.ml | 26 +-
test/TestDevFiles.ml | 181 +++++++++-
test/TestFileTemplate.ml | 35 +-
test/TestFull.ml | 25 +-
test/TestFullUtils.ml | 8 +-
test/TestOASIS.ml | 83 +++--
src/oasis/FormatExt.mli => test/TestOASISString.ml | 40 ++-
.../FormatMarkdown.ml => test/TestOASISText.ml | 117 ++++---
test/TestOCamlbuild.ml | 16 +-
test/TestQuery.ml | 3 -
test/TestQuickstart.ml | 2 +-
test/TestStdFiles.ml | 124 +++++++
test/data/TestDevFiles/compiled_setup_ml/_oasis | 14 +
.../data/TestDevFiles/compiled_setup_ml/foo.ml | 25 +-
test/data/TestFull/recurselib/_oasis | 12 +
.../data/TestFull/recurselib/src/binary.ml | 24 --
test/data/TestOASIS/bug1236.oasis | 18 +
test/data/TestOASIS/bug1295.oasis | 27 ++
test/data/TestOCamlbuild/set-ocamlfind/_oasis | 17 +-
test/data/TestStdFiles/oasis/AUTHORS.md.exp | 12 +
test/data/TestStdFiles/oasis/INSTALL.md.exp | 42 +++
.../data/TestStdFiles/oasis/README.md.exp | 32 +-
test/data/TestStdFiles/oasis/_oasis | 44 +++
.../data/TestStdFiles/oasis/foo.ml | 24 --
test/data/TestStdFiles/remove/AUTHORS.txt.fst | 5 +
test/data/TestStdFiles/remove/INSTALL.txt.fst | 35 ++
test/data/TestStdFiles/remove/README.txt.fst | 11 +
test/data/TestStdFiles/remove/README.txt.snd | 4 +
test/data/TestStdFiles/remove/_oasis | 8 +
test/test.ml | 3 +
110 files changed, 2750 insertions(+), 1422 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-ocaml-maint/packages/oasis.git
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits
