similar to: [ for 1.38] ocaml: When creating compat Bytes module, create bytes.mli file.

Place the Bytes fallback module in the right place (mlstdutils), with no need to make it available directly also for generation, since it uses mlstdutils now. Fixes commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- .gitignore | 3 +-- generator/Makefile.am | 2 +- m4/guestfs_ocaml.m4 | 14 +++++--------- mllib/Makefile.am | 1 - 4 files changed, 7 insertions(+), 13

This is like the Perl chomp function, it removes a single \n from the end of a string if present, else leaves the string alone. I believe I found the only (two) places where such a function is used, but there may be a few more lurking. --- common/mlstdutils/std_utils.ml | 7 +++++++ common/mlstdutils/std_utils.mli | 2 ++ common/mlstdutils/std_utils_tests.ml | 10 ++++++++++

On Thursday, 13 July 2017 16:38:14 CEST Richard W.M. Jones wrote: > Even if ocamlopt is available, always build a bytecode version of > ‘common/mlstdutils’. > > Furthermore, because this library is pure OCaml, we should not be > using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This > doesn't make any difference for native code, but for bytecode it was >

--- common/mlstdutils/std_utils_tests.ml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/common/mlstdutils/std_utils_tests.ml b/common/mlstdutils/std_utils_tests.ml index 81f512cbf..f7b0247a4 100644 --- a/common/mlstdutils/std_utils_tests.ml +++ b/common/mlstdutils/std_utils_tests.ml @@ -29,6 +29,11 @@ let assert_equal_int = assert_equal ~printer:(fun x -> string_of_int x)

Do a configure check for the OPEN_UNSAFE flag in the OCaml binding of Hivex, using it only when available. This makes it possible to use hivex < 1.3.14 to build libguestfs (the daemon, actually). Amend the building documentation accordingly, bringing the minimum version of hivex back as it was before commit 64f49df747c0937d9433eb11d4191d92a4af748c. --- .gitignore | 1 +

On Tue, Jan 14, 2020 at 12:04:49AM +0100, Hilko Bengen wrote: > This avoids build failures in separate builds such as this one: > > ,---- > | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma > | ar cr libmlstdutils.a libmlstdutils_a-dummy.o > | ranlib libmlstdutils.a > | File "_none_", line 1:

On Tuesday, 14 January 2020 00:04:49 CET Hilko Bengen wrote: > This avoids build failures in separate builds such as this one: > > ,---- > | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma > | ar cr libmlstdutils.a libmlstdutils_a-dummy.o > | ranlib libmlstdutils.a > | File "_none_", line 1:

This avoids build failures in separate builds such as this one: ,---- | ocamlfind ocamlc -package str,unix -I . -a guestfs_config.cmo stringMap.cmo stringSet.cmo std_utils.cmo -o mlstdutils.cma | ar cr libmlstdutils.a libmlstdutils_a-dummy.o | ranlib libmlstdutils.a | File "_none_", line 1: | Error: Files std_utils.cmo and guestfs_config.cmo | make inconsistent assumptions over

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

Even if ocamlopt is available, always build a bytecode version of ‘common/mlstdutils’. Furthermore, because this library is pure OCaml, we should not be using ‘ocamlmklib’. We should use ‘ocaml{c,opt} -a’ instead. This doesn't make any difference for native code, but for bytecode it was building a broken library. The original reason for making this change is because the generator is always

Last used in commit fd63d896445260ce83f88e58c0219606f97dca9e (in 2013). --- .gitignore | 1 - common/mlstdutils/Makefile.am | 8 -------- 2 files changed, 9 deletions(-) diff --git a/.gitignore b/.gitignore index 302aa2d81..3aca17f67 100644 --- a/.gitignore +++ b/.gitignore @@ -130,7 +130,6 @@ Makefile.in /common/mlstdutils/.depend /common/mlstdutils/bytes.ml

The new module ‘Std_utils’ contains only functions which are pure OCaml and depend only on the OCaml stdlib. Therefore these functions may be used by the generator. The new module is moved to ‘common/mlstdutils’. This also removes the "<stdlib>" hack, and the code which copied the library around. Also ‘Guestfs_config’, ‘Libdir’ and ‘StringMap’ modules are moved since these are

Followup/fix of commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f

They will be generated by configure. --- mlstdutils/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mlstdutils/Makefile.am b/mlstdutils/Makefile.am index d29255e..2b4aed8 100644 --- a/mlstdutils/Makefile.am +++ b/mlstdutils/Makefile.am @@ -19,9 +19,12 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(SOURCES_ML) \ +

Create a module ‘C_utils’ containing functions like ‘drive_name’ and ‘shell_unquote’ which come from the C utilities. The new directory ‘common/mlutils’ also contains the ‘Unix_utils’ wrappers around POSIX functions missing from the OCaml stdlib. --- .gitignore | 3 + Makefile.am | 24 ++--- builder/Makefile.am

On Wed, Dec 18, 2019 at 11:13:48AM +0100, Pino Toscano wrote: > They do not contain messages. > --- > Makefile.am | 1 + > po/POTFILES-ml | 11 ----------- > 2 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index 4dde5002..46a52ca3 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -115,6 +115,7 @@ po/POTFILES-ml:

On Monday, 18 September 2017 18:39:40 CEST Richard W.M. Jones wrote: > dib/output_format_docker.mli | 19 + > dib/output_format_qcow2.mli | 19 + > dib/output_format_raw.mli | 19 + > dib/output_format_squashfs.mli | 19 + > dib/output_format_tar.mli | 19 + >

They do not contain messages. --- Makefile.am | 1 + po/POTFILES-ml | 11 ----------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4dde5002..46a52ca3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -115,6 +115,7 @@ po/POTFILES-ml: configure.ac grep -v '^common/mlprogress/' | \ grep -v '^common/mlvisit/' | \ grep -v

Previously the OCaml compiler was only required if building from git but was at least theoretically optional if building from tarballs (although this was never tested). Since we want to write parts of the daemon in OCaml, this makes OCaml required for all builds. Note that the ‘--disable-ocaml’ option remains, but it now only disables OCaml bindings and OCaml virt tools. Using this option does

Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml