similar to: [PATCH 1/2] builder: fix paths to mlstdutils & mlutils

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

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

Per my previous email: https://www.redhat.com/archives/libguestfs/2017-September/msg00203.html I'd like to talk about requiring a more modern version of the OCaml compiler. These commits show some of the code changes which would be possible with OCaml >= 3.12 [which it turns out we already require by accident] and also with OCaml >= 4.02. The latter is my favoured option. Rich.

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

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

On distros with OCaml < 4.02 we need to create a compatibility Bytes module. However we didn't create the interface file (bytes.mli) which would mean that dependencies wouldn't be created correctly for parallel builds. This commit uses ‘ocaml -i’ to create an interface file which exports everything. --- .gitignore | 1 + m4/guestfs-ocaml.m4 | 3 ++- 2 files changed, 3

--- 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)

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 >

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

Removed extra $(OCAML_BYTES_COMPAT_CMO). Add if HAVE_OCAMLOPT around the call to ocamlopt. Tested with OCaml 4.01 on RHEL 7. Rich.

--- builder/Makefile.am | 6 +++++- builder/languages.ml | 13 ++++++------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index e64c8991f..1b51376be 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -126,6 +126,7 @@ OCAMLPACKAGES = \ -I $(top_builddir)/ocaml \ -I $(top_builddir)/common/mlstdutils \ -I

No change, just reposting without the "for discussion" tag. I think we should allow this as it seems like a nice coding style for a limited subset of imperative-style code. Rich.

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

Miscellaneous refactoring, but the main one is to rename mllib/ as common/mltools/ Rich.

v3 -> v4: Use HAVE_OCAMLOPT in both places.

When parts of the daemon were previously converted to OCaml, the previous PCRE regexps were converted to Str regexps. Restore the original PCRE regexps. There was also one case where an original call to glob(3) was replaced by a Str regexp, and this is replaced by a PCRE regexp (although it is in fact identical in this instance). This updates commit b48da89dd6edce325f4c1f2956435c4d383ebe77 and

These safe wrappers around Pervasives.open_in and Pervasives.open_out ensure that exceptions escaping cannot leave unclosed files. --- common/mlstdutils/std_utils.ml | 39 ++++++++++++++++++++-------------- common/mlstdutils/std_utils.mli | 12 +++++++++++ common/mltools/tools_utils.ml | 39 +++++++++++++++++----------------- dib/dib.ml | 9 ++++----

v1 -> v2: - Fixed everything mentioned in patch review. - Libdir module is removed as a separate commit. Rich.