similar to: [PATCH] build: build C sources using OCaml API with CAML_NAME_SPACE

While there is only one OCaml source, build it as small library: this way it is easier to use, and there is no need to copy the sources from here. --- .gitignore | 1 + mlv2v/Makefile.am | 71 ++++++++++++++++++++++++++++++++++++++++++++--- mlv2v/dummy.c | 2 ++ 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 mlv2v/dummy.c diff --git a/.gitignore b/.gitignore

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +- common/mltools/Makefile.am | 2 +- common/mlutils/Makefile.am | 2 +-

- Add $(srcdir), $(builddir) to Makefiles where required - Post-process ocamldep output - generate ocaml/.depends Gbp-Pq: Name 0012-Fix-out-of-tree-builds-of-OCaml-components.patch --- builder/Makefile.am | 7 ++++--- common/mlgettext/Makefile.am | 2 +- common/mlpcre/Makefile.am | 2 +- common/mlprogress/Makefile.am | 2 +- common/mlstdutils/Makefile.am | 2 +-

Do not build the mlv2v, and mllibvirt submodules, as they are not used. --- Makefile.am | 4 ---- configure.ac | 2 -- 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 28f542765..b1e88a42b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -164,10 +164,6 @@ SUBDIRS += common/mlvisit SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize

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 Mon, Dec 16, 2019 at 03:58:29PM +0100, Pino Toscano wrote: > Use the newer copy shipped locally as 3rdparty, instead of the one in > the common submodule, as the latter copy will go away soon. > --- > .gitignore | 2 ++ > Makefile.am | 2 +- > configure.ac | 2 +- > test-harness/Makefile.am | 2 +- > v2v/Makefile.am | 4

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

They are empty sources used to build OCaml-only targets using automake, so there is no documentation to extract. --- Makefile.am | 1 + docs/C_SOURCE_FILES | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index d3cf64cc1..ec342225a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -320,6 +320,7 @@ docs/C_SOURCE_FILES: configure.ac

Use also custom_compare_ext_default for the compare_ext field. According to the git logs, this was introduced in OCaml 3.12.1, which is earlier than out minimum required version. mlaugeas is not touched by this change, since it is a copy of a 3rd party library (and thus it will be fixed there first). --- common/mlpcre/pcre-c.c | 3 ++- common/mlprogress/progress-c.c | 3 ++-

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

Just like the similar series that already went in for libguestfs [1], do similar fixes also for virt-v2v, with additional fixes for the builddir!=srcdir case. This will also need the fix to subdir-rules.mk. [1] https://www.redhat.com/archives/libguestfs/2019-December/msg00062.html Pino Toscano (7): Update common to latest build: stop shipping files generated by configure build: use the

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 2 ++ Makefile.am | 2 +- configure.ac | 2 +- test-harness/Makefile.am | 2 +- v2v/Makefile.am | 4 ++-- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index

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:

These are generated in many different ways in the various subdirectories, and sometimes not generated correctly. Introduce a script to do this in one place, and hopefully correctly. This is mostly simple refactoring, but I got rid of a couple of things: (1) The ‘make depend’ rule doesn't appear to be needed. automake (or make?) seems to rebuild the ‘.depend’ file automatically just

This is an extended version of: https://www.redhat.com/archives/libguestfs/2019-September/msg00288.html Apparently I forgot it on my tree, so I'm posting that series again, adding an extra cleanup more due to the v2v/common splits. Pino Toscano (6): tests: switch away from xgetcwd daemon: move read_whole_file to common utils daemon: switch from read_file to read_whole_file daemon:

This commit bundles the ocaml-augeas library (upstream here: http://git.annexia.org/?p=ocaml-augeas.git;a=summary). It's identical to the upstream version and should remain so. We can work towards using system ocaml-augeas, when it's more widely available. --- .gitignore | 1 + Makefile.am | 1 + common/mlaugeas/Makefile.am | 91 +++++++++++++

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

Use the newer copy shipped locally as 3rdparty, instead of the one in the common submodule, as the latter copy will go away soon. --- .gitignore | 1 + Makefile.am | 6 +++--- configure.ac | 2 +- daemon/Makefile.am | 4 ++-- docs/guestfs-hacking.pod | 19 ++++++++++++++----- ocaml-dep.sh.in | 2 +- 6 files changed, 22 insertions(+), 12

OCaml has a small runtime which is statically linked into the virt tools (providing things like GC and primitives). Since OCaml 4.03 it has been possible to select variants of this runtime, one of which is compiled with -fPIC, using ‘ocamlopt -runtime-variant _pic’. This has performance implications on i686, but is relatively free on other architectures. Since it (in theory) adds to the

Because this 'feature' is broken (since 2013): https://debbugs.gnu.org/cgi/bugreport.cgi?bug=13928 we have to replace all instances of $(top_srcdir) in *_SOURCES lines with a relative path. According to what I read, this shouldn't break split builds, but I didn't test it. The only things automake moans about now are: * Unescaped left brace in regex is deprecated, passed