[Pkg-ocaml-maint-commits] [eliom] 03/09: Merge tag 'upstream/4.2'
Stéphane Glondu
glondu at moszumanska.debian.org
Thu Jan 7 11:10:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository eliom.
commit a2f93a8d61d2e19bfad01840e8049153c77ffd83
Merge: 185ae6f 276b215
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Oct 27 10:51:14 2015 +0100
Merge tag 'upstream/4.2'
Upstream version 4.2
.gitignore | 110 +-
.jenkins.sh | 19 +
.ocp-indent | 4 +
CHANGES | 29 +-
Makefile | 149 +-
Makefile.options | 54 -
README | 47 +-
README.build | 25 +
VERSION | 2 +-
_tags | 2 +
build/_tags | 1 +
build/build.ml | 77 +
build/doc.ml | 56 +
configure | 494 ------
doc/Makefile | 19 -
doc/{client/indexdoc => client.indexdoc} | 0
doc/client/Makefile | 46 -
doc/manual-wiki/clientserver-communication.wiki | 10 +-
doc/manual-wiki/clientserver-html.wiki | 16 +-
doc/manual-wiki/clientserver-language.wiki | 19 -
doc/manual-wiki/config.wiki | 10 +-
doc/manual-wiki/intro.wiki | 2 +-
doc/manual-wiki/legacy/sp.wiki | 22 -
doc/manual-wiki/server-links.wiki | 2 +-
doc/manual-wiki/server-params.wiki | 5 +
doc/manual-wiki/workflow-compilation.wiki | 45 +-
doc/{ocamlbuild/indexdoc => ocamlbuild.indexdoc} | 0
doc/ocamlbuild/Makefile | 31 -
doc/{server/indexdoc => server.indexdoc} | 0
doc/server/Makefile | 48 -
eliom.install | 8 -
local/lib/client/eliom_client.js | 1 -
local/lib/syntax | 1 -
opam | 21 +
opam/descr | 5 -
opam/opam | 25 -
opam/url | 1 -
pkg/META | 130 ++
pkg/build.ml | 107 ++
{src/files => pkg}/distillery/basic/Makefile | 0
.../distillery/basic/Makefile.options | 2 +-
.../distillery/basic/PROJECT_NAME.conf.in | 0
.../distillery/basic/PROJECT_NAME.eliom | 0
{src/files => pkg}/distillery/basic/README | 0
.../distillery/basic/static!css!PROJECT_NAME.css | 0
{src/files => pkg}/distillery/mobile/Makefile | 0
.../distillery/mobile/Makefile.options | 2 +-
.../distillery/mobile/PROJECT_NAME.conf.in | 0
.../distillery/mobile/PROJECT_NAME.eliom | 0
{src/files => pkg}/distillery/mobile/README | 0
.../mobile/mobile!PROJECT_NAME.config.xml.in | 0
.../distillery/mobile/static!css!PROJECT_NAME.css | 0
.../distillery/mobile/static!index.html | 0
.../distillery/mobile/static!js!PROJECT_NAME.js | 0
{src/files => pkg/etc}/mime.types | 0
pkg/filelist.ml | 176 ++
{src/files => pkg/man}/eliom-distillery.1 | 0
{src/files => pkg/man}/eliomc.1 | 10 +-
pkg/topkg.ml | 358 ++++
predist | 6 -
src/Makefile | 191 --
src/_tags | 63 +
src/client/Makefile | 148 --
src/client/Makefile.filelist | 49 -
src/client/eliom_content_core.ml | 625 -------
src/client/sigs/eliom_html5_event_handler.mli | 4 -
src/client/sigs/eliom_svg_event_handler.mli | 4 -
src/client/test/test.html | 6 -
src/client/test/unwrap.ml | 34 -
src/client2/Makefile | 141 --
src/client2/Makefile.filelist | 19 -
src/client2/eliom_client_main.ml | 91 -
src/client2/eliom_types_base.mli | 1 -
src/client2/sigs | 1 -
src/clientserver/Makefile | 198 ---
src/clientserver/Makefile.filelist | 5 -
src/clientserver/sigs/eliom_forms.mli | 1 -
.../sigs/eliom_html5_event_handler.mli | 4 -
.../sigs/eliom_html5_event_handler_base.mli | 1 -
src/clientserver/sigs/eliom_html5_forms.mli | 1 -
src/clientserver/sigs/eliom_html5_forms2.mli | 1 -
src/clientserver/sigs/eliom_svg_event_handler.mli | 4 -
.../sigs/eliom_svg_event_handler_base.mli | 1 -
src/common/eliom_parameter_base.ml | 690 --------
src/common/sigs/eliom_html5_event_handler_base.mli | 73 -
src/common/sigs/eliom_html5_event_handler_raw.mli | 71 -
src/common/sigs/eliom_svg_event_handler_base.mli | 14 -
src/files/META.eliom_tests | 46 -
src/files/META.in | 82 -
src/files/Makefile.sample | 120 --
src/legacy/eliomduce.server/eliom_duce.ml | 435 -----
src/legacy/eliomduce.server/eliom_duce.mli | 56 -
src/legacy/eliomduce.server/eliom_duce_sigs.mlp | 81 -
src/legacy/eliomduce.server/eliom_duce_tools.ml | 325 ----
src/legacy/eliomduce.server/eliom_duce_tools.mli | 119 --
src/legacy/eliomduce.server/eliom_duce_types.mli | 64 -
src/legacy/oldocsigenmod/ocsigen.ml | 1839 --------------------
src/legacy/oldocsigenmod/ocsigen.mli | 909 ----------
src/legacy/oldocsigenmod/ocsigenboxes.ml | 48 -
src/legacy/oldocsigenmod/ocsigenboxes.mli | 28 -
src/legacy/oldocsigenmod/ocsigenduce.ml | 236 ---
src/legacy/oldocsigenmod/ocsigenmod.ml | 802 ---------
src/legacy/oldocsigenmod/ocsigenmod.mli | 90 -
src/legacy/oldocsigenmod/tutoocsigenmod.ml | 1642 -----------------
src/{client2 => lib/client}/eliom_client.js | 42 +-
.../private => lib/client}/eliommod_cookies.ml | 0
src/{client/private => lib/client}/eliommod_dom.ml | 51 +-
.../private => lib/client}/eliommod_dom.mli | 1 +
.../private => lib/client}/eliommod_jstable.ml | 0
.../private => lib/client}/eliommod_jstable.mli | 0
.../private => lib/client}/eliommod_parameters.ml | 7 +-
.../eliom_bus.ml => lib/eliom_bus.client.ml} | 5 +-
.../eliom_bus.mli => lib/eliom_bus.client.mli} | 0
.../eliom_bus.ml => lib/eliom_bus.server.ml} | 2 +-
.../eliom_bus.mli => lib/eliom_bus.server.mli} | 0
.../eliom_client.ml => lib/eliom_client.client.ml} | 412 +++--
.../eliom_client.client.mli} | 47 +-
.../eliom_client_main.client.ml} | 20 +-
.../eliom_comet.ml => lib/eliom_comet.client.ml} | 24 +-
.../eliom_comet.mli => lib/eliom_comet.client.mli} | 0
.../eliom_comet.ml => lib/eliom_comet.server.ml} | 144 +-
.../eliom_comet.mli => lib/eliom_comet.server.mli} | 0
.../eliom_comet_base.shared.ml} | 7 +-
.../eliom_comet_base.shared.mli} | 6 +-
.../eliom_common.ml => lib/eliom_common.client.ml} | 0
.../eliom_common.ml => lib/eliom_common.server.ml} | 127 +-
.../eliom_common.server.mli} | 8 +-
.../eliom_common_base.shared.ml} | 2 +
.../eliom_config.ml => lib/eliom_config.client.ml} | 0
.../eliom_config.client.mli} | 0
.../eliom_config.ml => lib/eliom_config.server.ml} | 0
.../eliom_config.server.mli} | 0
src/{clientserver => lib}/eliom_content.client.mli | 401 ++---
src/{clientserver => lib}/eliom_content.eliom | 23 +-
src/{clientserver => lib}/eliom_content.server.mli | 129 +-
.../eliom_content_.client.ml} | 239 +--
.../eliom_content_.server.ml} | 6 +-
src/lib/eliom_content_core.client.ml | 426 +++++
.../eliom_content_core.client.mli} | 212 +--
src/lib/eliom_content_core.server.ml | 390 +++++
src/lib/eliom_content_core.server.mli | 203 +++
.../eliom_cookie.ml => lib/eliom_cookie.server.ml} | 0
.../eliom_cookie.server.mli} | 0
.../eliom_cookies_base.shared.ml} | 1 -
.../eliom_error_pages.server.ml} | 0
.../eliom_extension.server.ml} | 0
.../eliom_extension.server.mli} | 0
.../eliom_extension_template.server.ml} | 0
.../eliom_lazy.ml => lib/eliom_lazy.client.ml} | 0
.../eliom_lazy.mli => lib/eliom_lazy.client.mli} | 0
.../eliom_lazy.ml => lib/eliom_lazy.server.ml} | 0
.../eliom_lazy.mli => lib/eliom_lazy.server.mli} | 0
.../eliom_lib.ml => lib/eliom_lib.client.ml} | 71 +-
.../eliom_lib.mli => lib/eliom_lib.client.mli} | 27 +-
.../eliom_lib.ml => lib/eliom_lib.server.ml} | 7 +-
.../eliom_lib.mli => lib/eliom_lib.server.mli} | 15 +-
.../eliom_lib_base.shared.ml} | 115 +-
.../eliom_lib_base.shared.mli} | 44 +-
.../eliom_mkforms.shared.ml} | 18 +-
.../eliom_mkforms.shared.mli} | 5 +-
.../eliom_mkreg.ml => lib/eliom_mkreg.server.ml} | 52 +-
.../eliom_mkreg.mli => lib/eliom_mkreg.server.mli} | 7 -
.../eliom_parameter.client.ml} | 0
.../eliom_parameter.client.mli} | 27 +-
src/lib/eliom_parameter.server.ml | 447 +++++
.../eliom_parameter.server.mli} | 49 +-
src/lib/eliom_parameter_base.shared.ml | 563 ++++++
.../eliom_pervasives.client.ml} | 5 +-
.../eliom_pervasives.client.mli} | 4 +-
.../eliom_pervasives.server.ml} | 3 +-
.../eliom_pervasives.server.mli} | 2 +-
.../eliom_pervasives_base.shared.ml} | 5 +-
.../eliom_process.client.ml} | 0
.../eliom_process.server.ml} | 0
.../eliom_react.ml => lib/eliom_react.client.ml} | 0
.../eliom_react.mli => lib/eliom_react.client.mli} | 0
.../eliom_react.ml => lib/eliom_react.server.ml} | 4 +-
.../eliom_react.mli => lib/eliom_react.server.mli} | 0
.../eliom_reference.server.ml} | 6 +-
.../eliom_reference.server.mli} | 2 +-
.../eliom_registration.client.ml} | 1 -
.../eliom_registration.client.mli} | 0
.../eliom_registration.server.ml} | 591 ++++---
.../eliom_registration.server.mli} | 3 +-
.../eliom_registration_base.shared.ml} | 76 +-
.../eliom_request.client.ml} | 27 +-
.../eliom_request.client.mli} | 0
.../eliom_request_info.client.ml} | 2 +
.../eliom_request_info.server.ml} | 70 +-
.../eliom_request_info.server.mli} | 5 +-
.../eliom_service.client.ml} | 2 +-
.../eliom_service.client.mli} | 282 +--
.../eliom_service.server.ml} | 27 +-
.../eliom_service.server.mli} | 250 ++-
.../eliom_service_base.shared.ml} | 612 ++++---
.../eliom_state.ml => lib/eliom_state.server.ml} | 7 +-
.../eliom_state.mli => lib/eliom_state.server.mli} | 4 -
.../eliom_tools.ml => lib/eliom_tools.client.ml} | 0
.../eliom_tools.mli => lib/eliom_tools.client.mli} | 0
.../eliom_tools.ml => lib/eliom_tools.server.ml} | 0
.../eliom_tools.mli => lib/eliom_tools.server.mli} | 12 +-
.../eliom_tools_common.server.ml} | 13 +-
.../eliom_tools_common.server.mli} | 14 +-
.../eliom_types.ml => lib/eliom_types.client.ml} | 0
.../eliom_types.ml => lib/eliom_types.server.ml} | 0
.../eliom_types.mli => lib/eliom_types.server.mli} | 0
.../eliom_types_base.shared.ml} | 0
.../eliom_types_base.shared.mli} | 0
.../eliom_unwrap.ml => lib/eliom_unwrap.client.ml} | 30 +-
.../eliom_unwrap.client.mli} | 0
.../eliom_uri.ml => lib/eliom_uri.shared.ml} | 21 +-
.../eliom_uri.mli => lib/eliom_uri.shared.mli} | 38 +-
.../eliom_wrap.mli => lib/eliom_wrap.client.mli} | 0
.../eliom_wrap.ml => lib/eliom_wrap.server.ml} | 5 +-
.../eliom_wrap.mli => lib/eliom_wrap.server.mli} | 0
src/{server/private => lib/server}/eliommod.ml | 6 +-
src/{server/private => lib/server}/eliommod_cli.ml | 10 +-
.../private => lib/server}/eliommod_cli.mli | 2 -
.../private => lib/server}/eliommod_cookies.ml | 10 +-
.../private => lib/server}/eliommod_cookies.mli | 5 +-
.../private => lib/server}/eliommod_datasess.ml | 7 +-
.../private => lib/server}/eliommod_datasess.mli | 0
src/{server/private => lib/server}/eliommod_gc.ml | 14 +-
src/{server/private => lib/server}/eliommod_gc.mli | 0
.../private => lib/server}/eliommod_naservices.ml | 75 +-
.../private => lib/server}/eliommod_naservices.mli | 0
.../private => lib/server}/eliommod_pagegen.ml | 67 +-
.../private => lib/server}/eliommod_pagegen.mli | 0
.../private => lib/server}/eliommod_parameters.ml | 8 +-
.../private => lib/server}/eliommod_persess.ml | 4 +-
.../private => lib/server}/eliommod_persess.mli | 0
.../private => lib/server}/eliommod_sersess.ml | 6 +-
.../private => lib/server}/eliommod_sersess.mli | 0
.../private => lib/server}/eliommod_services.ml | 95 +-
.../private => lib/server}/eliommod_services.mli | 0
.../private => lib/server}/eliommod_sessadmin.ml | 13 +-
.../private => lib/server}/eliommod_sessadmin.mli | 0
.../private => lib/server}/eliommod_sessexpl.ml | 0
.../private => lib/server}/eliommod_sessexpl.mli | 0
.../server}/eliommod_sessiongroups.ml | 78 +-
.../server}/eliommod_sessiongroups.mli | 0
.../private => lib/server}/eliommod_timeouts.ml | 8 +-
.../private => lib/server}/eliommod_timeouts.mli | 0
.../server}/extensions/atom_feed.ml | 12 +-
.../server}/extensions/atom_feed.mli | 12 -
.../server}/extensions/eliom_atom.ml | 43 +-
.../server}/extensions/eliom_atom.mli | 2 +-
.../server}/extensions/eliom_openid.ml | 10 +-
.../server}/extensions/eliom_openid.mli | 0
.../server}/extensions/eliom_s2s.ml | 0
.../server}/extensions/eliom_s2s.mli | 0
src/lib/server/monitor/eliom_monitor.ml | 194 +++
.../server/monitor/eliom_monitor.mli} | 15 +-
.../server/monitor/eliom_monitor_main.ml} | 15 +-
.../server/monitor/eliom_monitor_main.mli} | 12 +-
src/{common => lib}/sigs/eliom_forms.mli | 42 +-
src/{common => lib}/sigs/eliom_forms_param.mli | 0
src/{common => lib}/sigs/eliom_html5_forms.mli | 2 +-
src/{common => lib}/sigs/eliom_html5_forms2.mli | 2 +-
src/{common => lib}/sigs/eliom_html5_forms_.mli | 2 +-
.../sigs/eliom_html5_forms_closed.mli | 2 +-
src/{server => lib}/sigs/eliom_html5_reg.mli | 2 +-
src/{server => lib}/sigs/eliom_reg.mli | 3 +-
.../sigs/eliom_reg_alpha_return.mli | 2 +-
.../sigs/eliom_reg_alpha_return_unsafe.mli | 2 +-
src/{server => lib}/sigs/eliom_reg_param.mli | 0
src/{server => lib}/sigs/eliom_reg_simpl.mli | 62 +-
src/{server => lib}/sigs/eliom_reg_unsafe.mli | 2 +-
src/{server => lib}/sigs/eliom_service.mli | 62 +-
.../sigs/eliom_service_with_external.mli | 10 +-
src/ocamlbuild/Makefile | 34 -
src/ocamlbuild/Makefile.filelist | 14 -
src/ocamlbuild/_tags | 3 -
src/ocamlbuild/eliombuild.ml | 18 +
src/ocamlbuild/ocamlbuild_eliom.ml | 72 +-
src/ocamlbuild/ocamlbuild_eliom.mli | 13 +
src/server/Makefile | 143 --
src/server/Makefile.filelist | 72 -
src/server/eliom_content_core.ml | 627 -------
src/server/eliom_content_core.mli | 250 ---
src/server/eliom_parameter.ml | 444 -----
src/server/eliom_validate_forms.eliom | 295 ----
src/server/sigs/eliom_html5_event_handler.mli | 4 -
src/server/sigs/eliom_html5_forms_.mli | 1 -
src/server/sigs/eliom_svg_event_handler.mli | 4 -
src/server2/Makefile | 166 --
src/server2/Makefile.filelist | 27 -
src/server2/sigs | 1 -
src/syntax/Makefile | 53 -
src/syntax/pa_eliom_client_client.ml | 16 +-
src/syntax/pa_eliom_client_server.ml | 28 +-
src/syntax/pa_eliom_seed.ml | 34 +-
src/syntax/pa_eliom_type_filter.ml | 8 +-
src/syntax/pa_include.ml | 163 +-
src/tools/Makefile | 94 -
src/tools/distillery.ml | 12 +-
src/tools/eliomc.ml | 66 +-
src/tools/eliomdep.ml | 17 +-
src/tools/eliomdoc.ml | 5 +-
src/tools/utils.ml | 12 +-
tests/META.eliom_tests | 46 +
tests/Makefile | 185 +-
tests/distillery/Makefile | 34 +
src/files/eliom.conf.in => tests/eliom.conf | 58 +-
tests/miniforum/Makefile | 75 -
tests/miniforum/ocsigen.conf | 40 -
tests/miniforum/static/style.css | 32 -
tests/miniforum/v0/Makefile | 67 -
tests/miniforum/v0/forum.ml | 21 -
tests/miniforum/v0/forum0.ml | 14 -
tests/miniforum/v0/mylib.ml | 48 -
tests/miniforum/v1/Makefile | 67 -
tests/miniforum/v1/forum.ml | 54 -
tests/miniforum/v1/mylib.ml | 41 -
tests/miniforum/v2/Makefile | 67 -
tests/miniforum/v2/forum.ml | 60 -
tests/miniforum/v2/mylib.ml | 81 -
tests/miniforum/v2/services.ml | 15 -
tests/miniwiki/Makefile | 60 +-
tests/miniwiki/README | 20 +-
tests/miniwiki/wikidata/TestPage.wiki | 2 +-
tests/monitoring.ml | 170 --
tests/testsuite/Makefile | 19 +
tests/testsuite/_tags | 5 +
.../atom_example.eliom} | 6 +-
.../eliom_testsuite.eliom} | 1 +
.../eliom_testsuite1.eliom} | 7 +-
.../eliom_testsuite2.eliom} | 13 +-
tests/{ => testsuite}/eliom_testsuite3.eliom | 96 +-
tests/{ => testsuite}/eliom_testsuite4.eliom | 55 +-
tests/{ => testsuite}/eliom_testsuite5.eliom | 12 +-
tests/{ => testsuite}/eliom_testsuite_base.eliom | 9 +-
tests/{ => testsuite}/eliom_testsuite_global.eliom | 0
tests/{ => testsuite}/eliom_testsuite_site.eliom | 0
tests/testsuite/testsuite.mllib | 8 +
tests/testsuite/testsuite_client.mlpack | 8 +
tests/tutomake.sh | 14 -
337 files changed, 6403 insertions(+), 16786 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.git
More information about the Pkg-ocaml-maint-commits
mailing list