[Pkg-ocaml-maint-commits] [jbuilder] 02/03: Merge tag 'upstream/1.0_beta18'
Andy Li
andyli-guest at moszumanska.debian.org
Wed Feb 28 08:57:10 UTC 2018
This is an automated email from the git hooks/post-receive script.
andyli-guest pushed a commit to branch master
in repository jbuilder.
commit 501c354175bd51940e6cde6509e3271b330106e7
Merge: 0115bba 7470794
Author: Andy Li <andy at onthewings.net>
Date: Wed Feb 28 16:35:53 2018 +0800
Merge tag 'upstream/1.0_beta18'
Upstream version 1.0~beta18
CHANGES.md | 171 +++
README.md | 39 +-
ROADMAP.md | 2 +-
bin/main.ml | 880 +++++++++---
bootstrap.ml | 258 +++-
doc/advanced-topics.rst | 138 +-
doc/jbuild | 103 +-
doc/jbuild.inc | 118 ++
doc/jbuild.rst | 244 +++-
doc/project-layout-specification.rst | 83 +-
doc/quick-start.rst | 10 +-
doc/terminology.rst | 11 +-
doc/update-jbuild.sh | 26 +
doc/usage.rst | 91 +-
install_ocaml.cmd | 2 +-
jbuild-workspace.dev | 11 +-
jbuilder.opam | 8 +-
src/action.ml | 818 +++++++----
src/action.mli | 80 +-
src/action_intf.ml | 41 +
src/alias.ml | 142 --
src/alias.mli | 57 -
src/ansi_color.ml | 193 ---
src/arg_spec.ml | 13 +-
src/arg_spec.mli | 1 +
src/artifacts.ml | 171 +--
src/artifacts.mli | 20 +-
src/build.ml | 45 +-
src/build.mli | 27 +-
src/build_interpret.ml | 123 +-
src/build_interpret.mli | 11 +-
src/build_system.ml | 1465 ++++++++++++++------
src/build_system.mli | 200 ++-
src/clflags.ml | 5 +-
src/clflags.mli | 15 +-
src/colors.ml | 127 ++
src/{ansi_color.mli => colors.mli} | 19 +-
src/config.ml | 81 ++
src/config.mli | 42 +
src/context.ml | 482 ++++---
src/context.mli | 35 +-
src/errors.ml | 20 +
src/errors.mli | 40 +
src/exe.ml | 202 +++
src/exe.mli | 95 ++
src/fiber/fiber.ml | 488 +++++++
src/fiber/fiber.mli | 245 ++++
src/fiber/jbuild | 6 +
src/file_tree.ml | 124 +-
src/file_tree.mli | 30 +-
src/findlib.ml | 662 +++------
src/findlib.mli | 107 +-
src/future.ml | 717 ----------
src/gen_meta.ml | 124 +-
src/gen_meta.mli | 13 +-
src/gen_rules.ml | 1435 ++++++++++---------
src/gen_rules.mli | 6 +-
src/import.ml | 446 +-----
src/install.ml | 79 +-
src/install.mli | 1 +
src/interned.ml | 77 +
src/interned.mli | 37 +
src/io.ml | 3 +
src/io.mli | 4 +
src/jbuild | 10 +-
src/jbuild.ml | 387 ++++--
src/jbuild.mli | 87 +-
src/jbuild_load.ml | 260 ++--
src/jbuild_load.mli | 13 +-
src/js_of_ocaml_rules.ml | 99 +-
src/js_of_ocaml_rules.mli | 4 +-
src/lib.ml | 981 +++++++++++--
src/lib.mli | 262 +++-
src/lib_db.ml | 184 ---
src/lib_db.mli | 41 -
src/loc.ml | 22 +-
src/loc.mli | 5 +-
src/log.ml | 26 +-
src/log.mli | 2 +-
src/main.ml | 255 ++--
src/main.mli | 17 +-
src/merlin.ml | 79 +-
src/merlin.mli | 9 +-
src/meta.ml | 43 +-
src/meta.mli | 2 +-
src/mode.ml | 8 +-
src/mode.mli | 5 +-
src/module.ml | 61 +-
src/module.mli | 29 +-
src/module_compilation.ml | 122 +-
src/module_compilation.mli | 11 +-
src/modules_partitioner.ml | 43 +
src/modules_partitioner.mli | 26 +
src/ocaml_flags.ml | 6 +
src/ocaml_flags.mli | 9 +-
src/ocamlc_config.ml | 102 ++
src/ocamlc_config.mli | 19 +
src/ocamldep.ml | 196 ++-
src/ocamldep.mli | 52 +-
src/odoc.ml | 380 +++--
src/odoc.mli | 8 +-
src/ordered_set_lang.ml | 211 ++-
src/ordered_set_lang.mli | 39 +-
src/path.ml | 108 +-
src/path.mli | 47 +-
src/per_item.ml | 63 +
src/per_item.mli | 36 +
src/print_diff.ml | 61 +
src/print_diff.mli | 2 +
src/process.ml | 354 +++++
src/{future.mli => process.mli} | 42 +-
src/report_error.ml | 86 ++
src/report_error.mli | 18 +
src/scheduler.ml | 172 +++
src/scheduler.mli | 36 +
src/scope.ml | 109 ++
src/scope.mli | 31 +
src/sexp.ml | 412 +++---
src/sexp.mli | 75 +-
src/sexp_lexer.mli | 14 -
src/sexp_lexer.mll | 216 ---
src/stdune/ansi_color.ml | 177 +++
src/stdune/ansi_color.mli | 39 +
src/stdune/array.ml | 1 +
src/stdune/caml/caml.ml | 6 +
src/stdune/caml/jbuild | 4 +
src/stdune/caml/result/jbuild | 5 +
src/stdune/caml/result/result.ml | 11 +
src/stdune/caml/result/result.mli | 17 +
src/stdune/caml/result/result_compat.ml | 5 +
src/stdune/common.ml | 0
src/stdune/comparable.ml | 4 +
src/stdune/comparable.mli | 4 +
src/stdune/either.ml | 3 +
src/stdune/either.mli | 5 +
src/stdune/exn.ml | 12 +
src/stdune/exn.mli | 10 +
src/stdune/filename.ml | 67 +
src/stdune/filename.mli | 13 +
src/stdune/hashtbl.ml | 25 +
src/stdune/hashtbl.mli | 9 +
src/stdune/import.ml | 0
src/stdune/int.ml | 8 +
src/stdune/int.mli | 2 +
src/stdune/jbuild | 4 +
src/stdune/list.ml | 89 ++
src/stdune/list.mli | 36 +
src/stdune/map.ml | 119 ++
src/stdune/map.mli | 3 +
src/stdune/map_intf.ml | 73 +
src/stdune/option.ml | 52 +
src/stdune/option.mli | 27 +
src/stdune/ordering.ml | 17 +
src/stdune/ordering.mli | 9 +
src/stdune/pp.ml | 159 +++
src/stdune/pp.mli | 64 +
src/stdune/result.ml | 53 +
src/stdune/result.mli | 28 +
src/stdune/set.ml | 47 +
src/stdune/set.mli | 3 +
src/stdune/set_intf.ml | 31 +
src/stdune/staged.ml | 3 +
src/stdune/staged.mli | 3 +
src/stdune/stdune.ml | 37 +
src/stdune/string.ml | 155 +++
src/stdune/string.mli | 37 +
src/string_with_vars.ml | 156 ++-
src/string_with_vars.mli | 76 +-
src/super_context.ml | 1109 +++++++++------
src/super_context.mli | 162 ++-
src/top_closure.ml | 10 +-
src/top_closure.mli | 4 +-
src/usexp/jbuild | 3 +
src/usexp/parser_automaton_internal.ml | 380 +++++
src/usexp/parser_automaton_internal.mli | 132 ++
src/usexp/sexp_ast.ml | 13 +
src/usexp/table.ml | 1319 ++++++++++++++++++
src/usexp/table.mli | 2 +
src/usexp/usexp.ml | 355 +++++
src/usexp/usexp.mli | 132 ++
src/utils.ml | 135 +-
src/utils.mli | 46 +-
src/utop.ml | 98 +-
src/utop.mli | 26 +-
src/variant.ml | 8 +
src/variant.mli | 17 +
src/vfile_kind.ml | 2 +-
src/watermarks.ml | 26 +-
src/watermarks.mli | 2 +-
src/with_required_by.ml | 62 +
src/with_required_by.mli | 40 +
src/workspace.ml | 100 +-
src/workspace.mli | 12 +-
src/xdg/jbuild | 3 +
src/xdg/xdg.ml | 37 +
src/xdg/xdg.mli | 13 +
test/blackbox-tests/cram.mll | 27 +-
test/blackbox-tests/jbuild | 325 ++++-
test/blackbox-tests/test-cases/aliases/jbuild | 9 +
test/blackbox-tests/test-cases/aliases/run.t | 22 +
.../test-cases/aliases/src/foo/bar/jbuild | 5 +
.../test-cases/aliases/src/foo/baz/jbuild | 5 +
test/blackbox-tests/test-cases/aliases/src/jbuild | 5 +
.../test-cases/byte-code-only/bin/jbuild | 3 +
.../test-cases/byte-code-only/bin/toto.ml | 1 +
.../test-cases/byte-code-only/foo.opam | 0
.../test-cases/byte-code-only/ocaml-bin/ocamlc | 3 +
.../test-cases/byte-code-only/ocaml-bin/ocamldep | 3 +
.../test-cases/byte-code-only/ocaml-bin/ocamlmklib | 3 +
.../blackbox-tests/test-cases/byte-code-only/run.t | 7 +
.../test-cases/byte-code-only/src/foo.ml | 1 +
.../test-cases/byte-code-only/src/jbuild | 3 +
test/blackbox-tests/test-cases/c-stubs/jbuild | 1 +
test/blackbox-tests/test-cases/c-stubs/q/jbuild | 5 +
test/blackbox-tests/test-cases/c-stubs/q/q.h | 1 +
test/blackbox-tests/test-cases/c-stubs/q/q.ml | 2 +
test/blackbox-tests/test-cases/c-stubs/q/q.mli | 2 +
test/blackbox-tests/test-cases/c-stubs/q/q_stub.c | 9 +
.../test-cases/c-stubs/qnativerun/jbuild | 5 +
.../test-cases/c-stubs/qnativerun/run.ml | 1 +
test/blackbox-tests/test-cases/c-stubs/run.t | 14 +
test/blackbox-tests/test-cases/copy_files/bar.c | 1 +
.../test-cases/copy_files/include/bar.h | 1 +
test/blackbox-tests/test-cases/copy_files/jbuild | 23 +-
test/blackbox-tests/test-cases/copy_files/run.t | 22 +-
.../test-cases/cross-compilation/bin/blah.ml | 1 +
.../test-cases/cross-compilation/bin/jbuild | 6 +
.../test-cases/cross-compilation/etc/findlib.conf | 0
.../cross-compilation/etc/findlib.conf.d/foo.conf | 0
.../test-cases/cross-compilation/jbuild | 3 +
.../test-cases/cross-compilation/lib/jbuild | 5 +
.../test-cases/cross-compilation/lib/p.ml | 1 +
.../test-cases/cross-compilation/p.opam | 0
.../test-cases/cross-compilation/run.t | 41 +
.../test-cases/exclude-missing-module/jbuild | 3 +
.../test-cases/exclude-missing-module/run.t | 3 +
test/blackbox-tests/test-cases/exec-cmd/bar.ml | 1 +
test/blackbox-tests/test-cases/exec-cmd/foo.ml | 1 +
test/blackbox-tests/test-cases/exec-cmd/foo.opam | 0
test/blackbox-tests/test-cases/exec-cmd/jbuild | 10 +
test/blackbox-tests/test-cases/exec-cmd/run.t | 24 +
test/blackbox-tests/test-cases/findlib/foo.opam | 0
test/blackbox-tests/test-cases/findlib/run.t | 18 +
test/blackbox-tests/test-cases/findlib/src/foo.ml | 1 +
test/blackbox-tests/test-cases/findlib/src/jbuild | 4 +
test/blackbox-tests/test-cases/findlib/test/jbuild | 3 +
test/blackbox-tests/test-cases/force-test/f.ml | 2 +
test/blackbox-tests/test-cases/force-test/jbuild | 9 +
test/blackbox-tests/test-cases/force-test/run.t | 12 +
.../test-cases/gen-opam-install-file/bar.ml | 0
.../test-cases/gen-opam-install-file/cfoo.h | 0
.../test-cases/gen-opam-install-file/foo.js | 0
.../test-cases/gen-opam-install-file/foo.ml | 0
.../test-cases/gen-opam-install-file/foo.mli | 0
.../test-cases/gen-opam-install-file/foo.opam | 0
.../test-cases/gen-opam-install-file/foo_byte.ml | 0
.../test-cases/gen-opam-install-file/jbuild | 30 +
.../test-cases/gen-opam-install-file/run.t | 43 +
test/blackbox-tests/test-cases/github20/run.t | 2 +-
test/blackbox-tests/test-cases/github24/run.t | 2 +-
test/blackbox-tests/test-cases/github25/root/a.ml | 0
test/blackbox-tests/test-cases/github25/root/b.ml | 0
.../blackbox-tests/test-cases/github25/root/jbuild | 2 +
test/blackbox-tests/test-cases/github25/root/run.t | 22 +-
test/blackbox-tests/test-cases/github534/jbuild | 10 +
test/blackbox-tests/test-cases/github534/run.t | 7 +
test/blackbox-tests/test-cases/include-loop/a.inc | 2 +
test/blackbox-tests/test-cases/include-loop/b.inc | 2 +
test/blackbox-tests/test-cases/include-loop/c.inc | 2 +
test/blackbox-tests/test-cases/include-loop/jbuild | 2 +
test/blackbox-tests/test-cases/include-loop/run.t | 8 +
.../installable-dup-private-libs/a1/a.ml | 0
.../installable-dup-private-libs/a1/a1.opam | 0
.../installable-dup-private-libs/a1/jbuild | 3 +
.../installable-dup-private-libs/a2/a.ml | 0
.../installable-dup-private-libs/a2/a2.opam | 0
.../installable-dup-private-libs/a2/jbuild | 3 +
.../test-cases/installable-dup-private-libs/run.t | 13 +
test/blackbox-tests/test-cases/intf-only/a/jbuild | 2 +
test/blackbox-tests/test-cases/intf-only/a/x.mli | 1 +
test/blackbox-tests/test-cases/intf-only/a/y.mli | 1 +
test/blackbox-tests/test-cases/intf-only/b/jbuild | 3 +
test/blackbox-tests/test-cases/intf-only/b/x.mli | 2 +
test/blackbox-tests/test-cases/intf-only/b/y.mli | 1 +
test/blackbox-tests/test-cases/intf-only/c/jbuild | 3 +
test/blackbox-tests/test-cases/intf-only/d/jbuild | 3 +
test/blackbox-tests/test-cases/intf-only/d/x.ml | 1 +
test/blackbox-tests/test-cases/intf-only/d/x.mli | 1 +
.../blackbox-tests/test-cases/intf-only/foo/foo.ml | 1 +
.../test-cases/intf-only/foo/foo.opam | 0
.../test-cases/intf-only/foo/intf.mli | 1 +
.../blackbox-tests/test-cases/intf-only/foo/jbuild | 4 +
.../test-cases/intf-only/foo/test/bar.ml | 5 +
.../test-cases/intf-only/foo/test/jbuild | 4 +
test/blackbox-tests/test-cases/intf-only/run.t | 44 +
test/blackbox-tests/test-cases/js_of_ocaml/run.t | 56 +-
test/blackbox-tests/test-cases/lib-available/run.t | 2 +-
test/blackbox-tests/test-cases/loop/jbuild | 13 +
test/blackbox-tests/test-cases/loop/run.t | 29 +
test/blackbox-tests/test-cases/menhir/run.t | 31 +-
.../test-cases/merlin-tests/exe/jbuild | 5 +
.../test-cases/merlin-tests/exe/x.ml | 0
test/blackbox-tests/test-cases/merlin-tests/jbuild | 6 +
.../test-cases/merlin-tests/lib/jbuild | 4 +
.../test-cases/merlin-tests/ppx/jbuild | 5 +
test/blackbox-tests/test-cases/merlin-tests/run.t | 29 +
.../merlin-tests/sanitize-dot-merlin/jbuild | 5 +
.../sanitize-dot-merlin/sanitize_dot_merlin.ml | 25 +
.../blackbox-tests/test-cases/meta-gen/foobar.opam | 0
test/blackbox-tests/test-cases/meta-gen/jbuild | 48 +
test/blackbox-tests/test-cases/meta-gen/run.t | 74 +
test/blackbox-tests/test-cases/meta-gen/src/jbuild | 8 +
test/blackbox-tests/test-cases/misc/jbuild | 10 +-
test/blackbox-tests/test-cases/misc/run.t | 4 +-
.../test-cases/multiple-private-libs/a/a.opam | 0
.../test-cases/multiple-private-libs/a/jbuild | 3 +
.../test-cases/multiple-private-libs/a/test.ml | 1 +
.../test-cases/multiple-private-libs/b/b.opam | 0
.../test-cases/multiple-private-libs/b/jbuild | 3 +
.../test-cases/multiple-private-libs/b/test.ml | 1 +
.../test-cases/multiple-private-libs/run.t | 16 +
test/blackbox-tests/test-cases/ocaml-syntax/jbuild | 9 +
test/blackbox-tests/test-cases/ocaml-syntax/run.t | 2 +
.../test-cases/ocamldep-multi-stanzas/jbuild | 9 +
.../test-cases/ocamldep-multi-stanzas/lib.ml | 1 +
.../test-cases/ocamldep-multi-stanzas/run.t | 21 +
.../test-cases/ocamldep-multi-stanzas/src/jbuild | 4 +
.../test-cases/ocamldep-multi-stanzas/src/x.ml | 1 +
.../test-cases/ocamldep-multi-stanzas/test.ml | 1 +
.../odoc-unique-mlds/diff-scope/scope1/foo.mld | 0
.../odoc-unique-mlds/diff-scope/scope1/jbuild | 5 +
.../odoc-unique-mlds/diff-scope/scope1/scope1.opam | 0
.../odoc-unique-mlds/diff-scope/scope2/foo.mld | 0
.../odoc-unique-mlds/diff-scope/scope2/jbuild | 5 +
.../odoc-unique-mlds/diff-scope/scope2/scope2.opam | 0
.../test-cases/odoc-unique-mlds/run.t | 36 +
.../odoc-unique-mlds/same-scope/lib1/jbuild | 5 +
.../odoc-unique-mlds/same-scope/lib1/test.mld | 0
.../odoc-unique-mlds/same-scope/lib2/jbuild | 5 +
.../odoc-unique-mlds/same-scope/lib2/test.mld | 0
.../odoc-unique-mlds/same-scope/root.opam | 0
test/blackbox-tests/test-cases/odoc/bar.ml | 0
test/blackbox-tests/test-cases/odoc/foo.ml | 0
test/blackbox-tests/test-cases/odoc/foo.opam | 0
test/blackbox-tests/test-cases/odoc/foo_byte.ml | 0
test/blackbox-tests/test-cases/odoc/jbuild | 24 +
test/blackbox-tests/test-cases/odoc/run.t | 36 +
test/blackbox-tests/test-cases/odoc/test.mld | 1 +
test/blackbox-tests/test-cases/ppx-rewriter/jbuild | 16 +
.../test-cases/ppx-rewriter/ppx/fooppx.ml | 21 +
.../test-cases/ppx-rewriter/ppx/jbuild | 4 +
test/blackbox-tests/test-cases/ppx-rewriter/run.t | 20 +
.../test-cases/ppx-rewriter/w_omp_driver.ml | 0
.../test-cases/ppx-rewriter/w_ppx_driver.ml | 0
.../test-cases/ppx-rewriter/w_ppx_driver_flags.ml | 0
test/blackbox-tests/test-cases/promote/jbuild | 7 +
test/blackbox-tests/test-cases/promote/run.t | 30 +
test/blackbox-tests/test-cases/reason/bar.mli | 1 +
test/blackbox-tests/test-cases/reason/bar.re | 1 +
.../test-cases/reason/copy-sources/pped.pp.re | 1 +
.../test-cases/reason/copy-sources/pped.rei.pp | 1 +
test/blackbox-tests/test-cases/reason/cppome.re | 1 +
test/blackbox-tests/test-cases/reason/cppome.rei | 1 +
test/blackbox-tests/test-cases/reason/foo.ml | 1 +
test/blackbox-tests/test-cases/reason/foo.rei | 1 +
test/blackbox-tests/test-cases/reason/hello.re | 1 +
test/blackbox-tests/test-cases/reason/hello.rei | 1 +
test/blackbox-tests/test-cases/reason/jbuild | 36 +
test/blackbox-tests/test-cases/reason/pp/jbuild | 4 +
.../test-cases/reason/pp/reasononlypp.ml | 53 +
test/blackbox-tests/test-cases/reason/ppx/jbuild | 7 +
.../test-cases/reason/ppx/reasonppx.ml | 14 +
test/blackbox-tests/test-cases/reason/rbin.re | 6 +
test/blackbox-tests/test-cases/reason/rlib.opam | 0
test/blackbox-tests/test-cases/reason/run.t | 94 ++
test/blackbox-tests/test-cases/redirections/run.t | 2 +-
.../test-cases/scope-bug/alib/alib.ml | 0
.../test-cases/scope-bug/alib/alib.opam | 0
.../test-cases/scope-bug/alib/jbuild | 6 +
.../test-cases/scope-bug/alib/main.ml | 0
.../test-cases/scope-bug/blib/blib.ml | 0
.../test-cases/scope-bug/blib/blib.opam | 0
.../test-cases/scope-bug/blib/jbuild | 6 +
.../test-cases/scope-bug/blib/sub/jbuild | 5 +
.../test-cases/scope-bug/blib/sub/sub.ml | 0
test/blackbox-tests/test-cases/scope-bug/run.t | 23 +
.../test-cases/scope-ppx-bug/a/a.opam | 0
.../test-cases/scope-ppx-bug/a/kernel/jbuild | 6 +
.../test-cases/scope-ppx-bug/a/ppx/jbuild | 7 +
.../blackbox-tests/test-cases/scope-ppx-bug/b/b.ml | 0
.../test-cases/scope-ppx-bug/b/b.opam | 0
.../test-cases/scope-ppx-bug/b/jbuild | 6 +
test/blackbox-tests/test-cases/scope-ppx-bug/run.t | 20 +
.../test-cases/select/bar_no_unix.ml | 1 +
test/blackbox-tests/test-cases/select/bar_unix.ml | 1 +
test/blackbox-tests/test-cases/select/foo_fake.ml | 1 +
.../test-cases/select/foo_no_fake.ml | 1 +
test/blackbox-tests/test-cases/select/jbuild | 16 +
test/blackbox-tests/test-cases/select/main.ml | 2 +
test/blackbox-tests/test-cases/select/run.t | 18 +
.../test-cases/utop/forutop/forutop.ml | 1 +
test/blackbox-tests/test-cases/utop/forutop/jbuild | 4 +
.../blackbox-tests/test-cases/utop/init_forutop.ml | 1 +
test/blackbox-tests/test-cases/utop/run.t | 8 +
test/common/test_common.ml | 63 +-
test/unit-tests/action.mlt | 4 +-
test/unit-tests/expect_test.mll | 4 +-
test/unit-tests/import_dot_map.mlt | 4 +-
test/unit-tests/jbuild | 46 +-
test/unit-tests/path.mlt | 69 +
test/unit-tests/tests.mlt | 16 +-
vendor/cmdliner/src/jbuild | 1 +
vendor/cmdliner/src/result.ml | 3 -
vendor/update-cmdliner.sh | 2 +-
vendor/update-usexp.sh | 20 +
415 files changed, 18090 insertions(+), 7351 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/jbuilder.git
More information about the Pkg-ocaml-maint-commits
mailing list