search for: have_bytes_module

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

...b/m4/guestfs-ocaml.m4 @@ -175,7 +175,7 @@ AM_CONDITIONAL([HAVE_OCAML_GETTEXT], dnl Create the backwards compatibility Bytes module for OCaml < 4.02. mkdir -p common/mlstdutils -rm -f common/mlstdutils/bytes.ml +rm -f common/mlstdutils/bytes.ml common/mlstdutils/bytes.mli AS_IF([test "x$have_Bytes_module" = "xno"],[ cat > common/mlstdutils/bytes.ml <<EOF include String @@ -183,6 +183,7 @@ let of_string = String.copy let to_string = String.copy let sub_string = String.sub EOF + $OCAMLC -i common/mlstdutils/bytes.ml > common/mlstdutils/bytes.mli OCAML_BYTES...

...t a/m4/guestfs-ocaml.m4 b/m4/guestfs-ocaml.m4 index fea11a334..d3c4bd645 100644 --- a/m4/guestfs-ocaml.m4 +++ b/m4/guestfs-ocaml.m4 @@ -145,7 +145,6 @@ if test "x$enable_daemon" = "xyes"; then fi OCAML_PKG_gettext=no -OCAML_PKG_libvirt=no OCAML_PKG_oUnit=no ounit_is_v2=no have_Bytes_module=no @@ -158,7 +157,6 @@ AS_IF([test "x$OCAMLC" != "xno"],[ GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml]) - AC_CHECK_OCAML_PKG(libvirt) AC_CHECK_OCAML_PKG(oUnit) # oUnit >= 2 is required, so check that it has OUnit2. @@ -182,8 +1...

...no" && test "x$OCAML_GETTEXT" != "xno"]) dnl Create the backwards compatibility Bytes module for OCaml < 4.02. -mkdir -p generator mllib -rm -f generator/bytes.ml mllib/bytes.ml +mkdir -p common/mlstdutils +rm -f common/mlstdutils/bytes.ml AS_IF([test "x$have_Bytes_module" = "xno"],[ - cat > generator/bytes.ml <<EOF + cat > common/mlstdutils/bytes.ml <<EOF include String let of_string = String.copy let to_string = String.copy let sub_string = String.sub EOF - ln -s ../generator/bytes.ml mllib/bytes.ml - OCAML_GENERAT...

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

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.

https://bugzilla.redhat.com/show_bug.cgi?id=1441197

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

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

...> ('a, 'b, 'c, 'c, 'c, 'd) format6 end EOF - fi chmod -w $1 ]) diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4 index e944f363f..bb4cfb070 100644 --- a/m4/guestfs_ocaml.m4 +++ b/m4/guestfs_ocaml.m4 @@ -90,13 +90,15 @@ OCAML_PKG_oUnit=no ounit_is_v2=no have_Bytes_module=no AS_IF([test "x$OCAMLC" != "xno"],[ - # Create mllib/common_gettext.ml, gettext functions or stubs. + # Create mllib/common_gettext.ml and mllib/commit_gettext.mli, + # gettext functions or stubs. # If we're building in a different directory, then mllib/ m...

This works reliably for me ... Rich.

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this is a mostly done attempt to switch to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all

Hi, this series switches virt-2v to ocaml-libvirt, embedding the latest version of it from git. This way, it is possible to improve the way v2v connects to libvirt for both input, and output modules, and interacts with libvirt (e.g. no more virsh calls needed in virt-v2v). As side effect, virt-v2v now requires libvirt, as keeping it optional would create too much burden. I could not test all