This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository eliom.

commit 652565dd9ce830790ced0bcede620d161a9fe6c8
Merge: 1ad42fc 3a57d0d
Author: Stephane Glondu <st...@glondu.net>
Date:   Mon Jun 23 16:47:49 2014 +0200

    Merge tag 'upstream/4.0.0'
    
    Upstream version 4.0.0

 .gitignore                                         |  91 +++
 CHANGES                                            |  33 +
 Makefile                                           |  36 +-
 Makefile.options                                   |  17 +-
 README                                             |  77 +--
 VERSION                                            |   2 +-
 boring                                             |  34 -
 configure                                          |  27 +-
 doc/Makefile                                       |   8 +-
 doc/client/Makefile                                |   8 +-
 doc/index.wiki                                     |   2 +
 doc/manual-wiki/clientserver-applications.wiki     |  64 +-
 doc/manual-wiki/clientserver-communication.wiki    | 123 ++--
 doc/manual-wiki/clientserver-html.wiki             | 264 ++++++-
 doc/manual-wiki/clientserver-language.wiki         | 104 ++-
 doc/manual-wiki/clientserver-mobile.wiki           |  21 +
 doc/manual-wiki/clientserver-wrapping.wiki         |  11 +-
 doc/manual-wiki/config.wiki                        |   7 +-
 doc/manual-wiki/examples.wiki                      |   9 +-
 doc/manual-wiki/menu.wiki                          |   9 +-
 doc/manual-wiki/misc.wiki                          |  66 +-
 doc/manual-wiki/server-links.wiki                  |  10 +-
 doc/manual-wiki/server-outputs.wiki                |   4 +-
 doc/manual-wiki/server-params.wiki                 |   4 +-
 doc/manual-wiki/server-security.wiki               |  16 +-
 doc/manual-wiki/server-services.wiki               | 179 ++++-
 doc/manual-wiki/server-state.wiki                  |  16 +-
 doc/manual-wiki/workflow-compilation.wiki          | 155 ++++-
 doc/manual-wiki/workflow-configuration.wiki        |   6 +-
 ...ow-destillery.wiki => workflow-distillery.wiki} |  27 +-
 doc/ocamlbuild/Makefile                            |  31 +
 doc/ocamlbuild/indexdoc                            |   9 +
 doc/server/Makefile                                |  13 +-
 eliom.install                                      |   8 +
 local/lib/client/eliom_client.js                   |   1 +
 local/lib/syntax                                   |   1 +
 opam/descr                                         |   5 +
 opam/opam                                          |  25 +
 opam/url                                           |   1 +
 predist                                            |   0
 src/Makefile                                       |  67 +-
 src/client/Makefile                                |  79 +--
 src/client/Makefile.filelist                       |  54 +-
 src/client/eliom_client.ml                         | 446 ++++++++++--
 src/client/eliom_client.mli                        |  58 +-
 src/client/eliom_client_stubs.c                    |   4 -
 src/client/eliom_common.ml                         |  14 +
 src/client/eliom_config.ml                         |   1 +
 src/client/eliom_config.mli                        |   1 +
 src/client/{eliom_content.ml => eliom_content_.ml} | 648 ++++++++++++++----
 src/client/eliom_content_core.ml                   | 198 +++++-
 src/client/eliom_content_core.mli                  | 151 +++-
 src/client/eliom_lib.ml                            |   8 +-
 src/client/eliom_lib.mli                           |   4 +-
 src/client/eliom_parameter.mli                     |  37 +-
 src/client/eliom_pervasives.ml                     |   6 +-
 src/client/eliom_pervasives.mli                    |   2 +-
 src/client/eliom_process.ml                        |  47 +-
 src/client/eliom_registration.ml                   |   4 +-
 src/client/eliom_registration.mli                  |   7 +-
 src/client/eliom_request.ml                        | 213 +++---
 src/client/eliom_request.mli                       |  28 +-
 src/client/eliom_request_info.ml                   | 150 +++-
 src/client/eliom_service.ml                        |  42 +-
 src/client/eliom_service.mli                       | 175 ++++-
 src/client/eliom_types.ml                          |   1 -
 src/client/eliom_unwrap.ml                         |  10 +-
 src/client/eliom_unwrap.mli                        |   2 +-
 src/client/private/eliommod_cookies.ml             |   6 +-
 src/client/private/eliommod_dom.ml                 |  28 +-
 src/client/private/eliommod_dom.mli                |   5 +-
 src/client/private/eliommod_jstable.ml             |   7 +-
 .../eliommod_parameters.ml}                        |  45 +-
 src/client/sigs/eliom_html5_event_handler.mli      |   6 +-
 src/client/sigs/eliom_svg_event_handler.mli        |   4 +
 src/client/test/unwrap.ml                          |   2 +-
 src/{client => client2}/Makefile                   |  56 +-
 src/client2/Makefile.filelist                      |  19 +
 src/{client => client2}/eliom_bus.ml               |  24 +-
 src/{client => client2}/eliom_bus.mli              |  18 +-
 src/{client => client2}/eliom_client.js            |  38 +-
 src/{client => client2}/eliom_client_main.ml       |  14 +-
 src/{client => client2}/eliom_comet.ml             | 383 ++++++-----
 src/{client => client2}/eliom_comet.mli            |  29 +-
 src/{client => client2}/eliom_react.ml             |   0
 src/{client => client2}/eliom_react.mli            |   0
 src/{client => client2}/eliom_tools.ml             |   0
 src/{client => client2}/eliom_tools.mli            |   0
 src/client2/eliom_types_base.mli                   |   1 +
 src/client2/sigs                                   |   1 +
 src/clientserver/Makefile                          | 198 ++++++
 src/clientserver/Makefile.filelist                 |   5 +
 .../eliom_content.client.mli}                      | 628 +++++++++++++++--
 src/clientserver/eliom_content.eliom               |  94 +++
 src/clientserver/eliom_content.server.mli          | 548 +++++++++++++++
 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/.depend                                 |  39 --
 src/common/eliom_common_base.ml                    |  22 +-
 src/common/eliom_cookies_base.ml                   |  11 +-
 src/common/eliom_lib_base.ml                       | 115 +++-
 src/common/eliom_lib_base.mli                      |  34 +-
 src/common/eliom_mkforms.ml                        | 127 ++--
 src/common/eliom_parameter_base.ml                 |  56 +-
 src/common/eliom_pervasives_base.ml                |   4 +-
 src/common/eliom_registration_base.ml              |  91 ++-
 src/common/eliom_registration_base.mli             |  61 --
 src/common/eliom_service_base.ml                   | 762 ++++++++++++++++++++-
 src/common/eliom_types_base.ml                     |  10 -
 src/common/eliom_types_base.mli                    |  11 -
 src/common/eliom_uri.ml                            | 593 ++++++++--------
 src/common/eliom_uri.mli                           |  32 +-
 src/common/sigs/eliom_forms.mli                    |  54 +-
 src/common/sigs/eliom_forms_param.mli              |   6 +
 src/common/sigs/eliom_html5_forms.mli              |  55 +-
 src/common/sigs/eliom_html5_forms2.mli             |  70 ++
 ...liom_html5_forms.mli => eliom_html5_forms_.mli} |   1 -
 src/common/sigs/eliom_svg_event_handler_base.mli   |  14 +
 src/{common => common2}/eliom_comet_base.ml        |  18 +-
 src/{common => common2}/eliom_comet_base.mli       |  12 +-
 src/files/META.eliom_tests                         |   2 +-
 src/files/META.in                                  |  73 +-
 .../{destillery => distillery}/basic/Makefile      |   0
 .../basic/Makefile.options                         |   8 +-
 .../basic/PROJECT_NAME.conf.in                     |   0
 .../basic/PROJECT_NAME.eliom                       |   5 +-
 src/files/{destillery => distillery}/basic/README  |  11 +-
 .../basic/static!css!PROJECT_NAME.css              |   0
 .../basic => distillery/mobile}/Makefile           |  92 +++
 .../basic => distillery/mobile}/Makefile.options   |  30 +-
 .../mobile}/PROJECT_NAME.conf.in                   |   0
 .../basic => distillery/mobile}/PROJECT_NAME.eliom |   5 +-
 .../{destillery/basic => distillery/mobile}/README |  60 +-
 .../mobile/mobile!PROJECT_NAME.config.xml.in       |  47 ++
 .../mobile}/static!css!PROJECT_NAME.css            |   0
 src/files/distillery/mobile/static!index.html      |  16 +
 .../distillery/mobile/static!js!PROJECT_NAME.js    |   0
 .../{eliom-destillery.1 => eliom-distillery.1}     |  34 +-
 src/files/eliom.conf.in                            |   8 +-
 src/files/eliomc.1                                 |  54 +-
 src/ocamlbuild/.merlin                             |   4 +
 src/ocamlbuild/Makefile                            |  34 +
 src/ocamlbuild/Makefile.filelist                   |  14 +
 src/ocamlbuild/_tags                               |   3 +
 src/ocamlbuild/ocamlbuild_eliom.ml                 | 147 ++++
 src/ocamlbuild/ocamlbuild_eliom.mli                |  37 +
 src/server/.depend                                 | 328 ---------
 src/server/Makefile                                | 117 +---
 src/server/Makefile.filelist                       |  77 ++-
 src/server/eliom_common.ml                         | 228 +++---
 src/server/eliom_common.mli                        | 102 +--
 src/server/eliom_config.ml                         |   7 +-
 src/server/eliom_config.mli                        |  44 +-
 src/server/eliom_content.mli                       | 219 ------
 src/server/{eliom_content.ml => eliom_content_.ml} |  19 +-
 src/server/eliom_content_core.ml                   | 179 ++++-
 src/server/eliom_content_core.mli                  | 198 +++---
 src/server/eliom_error_pages.ml                    |   5 +-
 src/server/eliom_lib.mli                           |   5 +-
 src/server/eliom_mkreg.ml                          | 244 ++++++-
 src/server/eliom_mkreg.mli                         |  17 +-
 src/server/eliom_parameter.ml                      |  14 +-
 src/server/eliom_parameter.mli                     |  37 +-
 src/server/eliom_pervasives.ml                     |  45 +-
 src/server/eliom_pervasives.mli                    |  33 +-
 src/server/eliom_reference.ml                      | 106 ++-
 src/server/eliom_reference.mli                     |  40 +-
 src/server/eliom_request_info.ml                   |  14 +-
 src/server/eliom_request_info.mli                  |  32 +-
 src/server/eliom_service.ml                        | 376 ++--------
 src/server/eliom_service.mli                       | 431 ++++--------
 src/server/eliom_state.ml                          | 129 ++--
 src/server/eliom_state.mli                         |  50 +-
 src/server/eliom_types.mli                         |  11 -
 src/server/private/eliommod.ml                     | 160 ++---
 src/server/private/eliommod_cookies.ml             |  23 +-
 src/server/private/eliommod_datasess.ml            |   7 +-
 src/server/private/eliommod_gc.ml                  |  86 ++-
 src/server/private/eliommod_naservices.ml          |  56 +-
 src/server/private/eliommod_pagegen.ml             |  36 +-
 .../private/eliommod_parameters.ml}                |  23 +-
 src/server/private/eliommod_persess.ml             |   8 +-
 src/server/private/eliommod_sersess.ml             |  11 +-
 src/server/private/eliommod_services.ml            |  96 +--
 src/server/private/eliommod_sessiongroups.ml       |   7 +-
 src/server/private/eliommod_sessiongroups.mli      |   7 +-
 src/server/private/eliommod_timeouts.ml            |  24 +-
 src/server/sigs/eliom_html5_forms_.mli             |   1 +
 src/server/sigs/eliom_html5_reg.mli                |   6 +-
 src/server/sigs/eliom_reg.mli                      |   1 -
 src/server/sigs/eliom_reg_alpha_return.mli         |   3 +-
 src/server/sigs/eliom_reg_alpha_return_unsafe.mli  |   3 +
 src/server/sigs/eliom_reg_simpl.mli                | 193 +++++-
 src/server/sigs/eliom_reg_unsafe.mli               |   3 +
 src/server/sigs/eliom_service.mli                  | 419 +++++++++++
 src/server/sigs/eliom_service_with_external.mli    |  68 ++
 src/server/sigs/eliom_svg_event_handler.mli        |   4 +
 src/{server => server2}/Makefile                   |  84 +--
 src/server2/Makefile.filelist                      |  27 +
 src/{server => server2}/eliom_bus.ml               |  34 +-
 src/{server => server2}/eliom_bus.mli              |  45 +-
 src/{server => server2}/eliom_comet.ml             |  33 +-
 src/{server => server2}/eliom_comet.mli            |  17 +-
 src/{server => server2}/eliom_react.ml             |   4 +-
 src/{server => server2}/eliom_react.mli            |  23 +-
 src/{server => server2}/eliom_registration.ml      | 612 +++++++++++++++--
 src/{server => server2}/eliom_registration.mli     | 156 +++--
 src/{server => server2}/eliom_tools.ml             |   6 +-
 src/{server => server2}/eliom_tools.mli            |  14 +-
 src/{server => server2}/eliom_tools_common.ml      |   9 +-
 src/{server => server2}/eliom_tools_common.mli     |  10 +-
 src/{server => server2}/extensions/atom_feed.ml    |   0
 src/{server => server2}/extensions/atom_feed.mli   |   0
 src/{server => server2}/extensions/eliom_atom.ml   |   4 +-
 src/{server => server2}/extensions/eliom_atom.mli  |   4 +-
 src/{server => server2}/extensions/eliom_openid.ml |   6 +-
 .../extensions/eliom_openid.mli                    |   8 +-
 src/{server => server2}/extensions/eliom_s2s.ml    |   0
 src/{server => server2}/extensions/eliom_s2s.mli   |   0
 src/server2/sigs                                   |   1 +
 src/syntax/.depend                                 |  10 -
 src/syntax/Makefile                                |  31 +-
 src/syntax/pa_eliom_client_client.ml               |  11 +
 src/syntax/pa_eliom_client_server.ml               |  12 +-
 src/syntax/pa_include.ml                           |   5 +-
 src/tools/.depend                                  |  12 -
 src/tools/Makefile                                 |  59 +-
 src/tools/{destillery.ml => distillery.ml}         | 111 ++-
 src/tools/eliomc.ml                                |  83 ++-
 src/tools/eliomdep.ml                              |  90 ++-
 src/tools/eliomdoc.ml                              | 187 +++++
 src/tools/eliompp.ml                               |  86 +++
 src/tools/eliompp_lexer.mll                        | 158 +++++
 src/tools/utils.ml                                 | 158 ++++-
 tests/.depend                                      |  46 --
 tests/Makefile                                     |  59 +-
 tests/eliom_testsuite.ml                           |   9 +-
 tests/eliom_testsuite1.ml                          |  90 +--
 tests/eliom_testsuite2.ml                          | 113 ++-
 tests/eliom_testsuite3.eliom                       | 361 ++++------
 tests/eliom_testsuite4.eliom                       |  14 +-
 tests/eliom_testsuite5.eliom                       |  55 ++
 tests/eliom_testsuite_base.eliom                   |   4 +-
 tests/miniwiki/.depend                             |   2 -
 tests/miniwiki/Makefile                            |   4 +-
 tests/miniwiki/miniwiki.ml                         |   4 +-
 tests/tutomake.sh                                  |   0
 252 files changed, 11380 insertions(+), 4878 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/eliom.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

Reply via email to