search for: sources_ml

...e35a7b3 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ bindtests.tmp cscope.out .deps +.dirstamp .gdb_history .libs Makefile diff --git a/builder/Makefile.am b/builder/Makefile.am index 083e3a4..fcaa70a 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -72,13 +72,13 @@ SOURCES_ML = \ builder.ml SOURCES_C = \ - $(top_srcdir)/mllib/fsync-c.c \ - $(top_srcdir)/mllib/uri-c.c \ - $(top_srcdir)/mllib/mkdtemp-c.c \ - $(top_srcdir)/customize/perl_edit-c.c \ - $(top_srcdir)/customize/crypt-c.c \ - $(top_srcdir)/fish/uri.c \ - $(top_srcdir)/fish/file-edit.c \ + ../mllib/fsync-c....

...kefile.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) \ + $(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \ std_utils_tests.ml +CONFIGURE_GENERATED_ML = \ + guestfs_config.ml + SOURCES_MLI = if HAVE_BYTES_COMPAT_ML @@ -41,7 +44,7 @@ SOURCES_ML += bytes.ml endif SOURCES_ML += \ - guestfs_config.ml \ + $(CONFIGURE_G...

Simplifies the build a bit. This is on top of the previous SELinux relabelling patch set, although not related to it. Rich.

...$(OCAMLBEST)" was resolved as "ocamlfind byte" which did not work. --- Makefile.am | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 109d2c8..4dc6f12 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,18 +56,18 @@ SOURCES_ML = $(filter %.ml,$(SOURCES)) BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) -if !HAVE_OCAMLOPT -OBJECTS = $(BOBJECTS) -else -OBJECTS = $(XOBJECTS) -endif - OCAMLPACKAGES = -package unix,str OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ -febootstrap: $(OBJECTS) - $(OCAMLFIND) $(...

Rather complex patch to solve a small user error. Warn if the user is doing something like: virt-builder -o /dev/sdX1 Rich.

....depend /mlvisit/visit_tests /mlxml/.depend diff --git a/mlv2v/Makefile.am b/mlv2v/Makefile.am index 9e82148..945f981 100644 --- a/mlv2v/Makefile.am +++ b/mlv2v/Makefile.am @@ -18,11 +18,74 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(generator_built) + $(generator_built) \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + $(SOURCES_C) -# Note: These are not compiled into a library. They are used directly -# by virt-v2v and are only located here because the files are -# generated (since the split). generator_built = \ uefi.mli \ uefi.ml + +SOURCES_MLI = \ + uefi.mli + +SOURCES_ML = \ +...

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

--- src/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 7f99b8a..932881b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,17 +104,18 @@ supermin_CFLAGS = \ BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) +OCAMLPACKAGES = -package unix,str +OCAMLFLAGS = -warn-error CDEFLMPSUVXYZ + if !HAVE_OCAMLOPT OBJECTS = $(BOBJECTS) BEST = c +OCAMLFLAGS += -custom else OBJECTS = $(XOBJECTS) BEST = opt endif -OCAMLPACKAGES = -package unix,str -OCAMLFLA...

...diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7c71920c4..20440aaee 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -59,9 +59,13 @@ generator_built = \ structs.ml \ structs.mli +CONFIGURE_GENERATED_ML = \ + daemon_config.ml + EXTRA_DIST = \ $(generator_built) \ - $(SOURCES_MLI) $(SOURCES_ML) \ + $(SOURCES_MLI) \ + $(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \ daemon_utils_tests.ml \ guestfsd.pod @@ -297,7 +301,7 @@ SOURCES_MLI = \ utils.mli SOURCES_ML = \ - daemon_config.ml \ + $(CONFIGURE_GENERATED_ML) \ utils.ml \ structs.ml \ optgroups.ml \...

...emu-boot.c utils/qemu-speed-test/qemu-speed-test.c v2v/domainxml-c.c v2v/utils-c.c -v2v/xml-c.c +mllib/xml-c.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 4cf495555..1a21f825f 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -28,6 +28,8 @@ EXTRA_DIST = \ test-getopt.sh SOURCES_MLI = \ + xml.mli \ + xpath_helpers.mli \ checksums.mli \ common_utils.mli \ curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../cat/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \ progres...

..., 66 insertions(+), 11 deletions(-) create mode 100644 sparsify/cmdline.mli diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am index 33f418b..d99f311 100644 --- a/sparsify/Makefile.am +++ b/sparsify/Makefile.am @@ -18,13 +18,16 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(SOURCES_ML) $(SOURCES_C) \ + $(SOURCES_MLI) $(SOURCES_ML) $(SOURCES_C) \ virt-sparsify.pod \ test-virt-sparsify.sh \ test-virt-sparsify-in-place.sh CLEANFILES = *~ *.annot *.cmi *.cmo *.cmx *.cmxa *.o virt-sparsify +SOURCES_MLI = \ + cmdline.mli + SOURCES_ML = \ utils.ml \ cmdline.ml \ diff --...

.../osinfo.ml create mode 100644 mllib/osinfo.mli create mode 100644 mllib/osinfopath.ml diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 1a21f825f..eb9753e45 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ $(SOURCES_MLI) \ - $(filter-out guestfs_config.ml libdir.ml,$(SOURCES_ML)) \ + $(filter-out guestfs_config.ml libdir.ml osinfopath.ml,$(SOURCES_ML)) \ $(SOURCES_C) \ common_utils_tests.ml \ getopt_tests.ml \ @@ -40,6 +40,7 @@ SOURCES_MLI = \ getopt.mli \ JSON.mli \ mkdtemp.mli \ + osinfo.mli \ pla...

*** BLURB HERE? *** Pino Toscano (6): build: stop shipping files generated by configure docs: fix out-of-source documentation build generator: do not generate mlv2v files when not needed perl: fix path to Build.PL rust: fix path to lib.rs rust: fix list of generator-built files daemon/Makefile.am | 8 ++++++-- docs/Makefile.am | 4 ++-- generator/main.ml | 11

--- v2v/Makefile.am | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 03f818c..0dd9d9b 100644 --- a/v2v/Makefile.am +++ b/v2v/Makefile.am @@ -97,12 +97,7 @@ SOURCES_ML = \ v2v.ml SOURCES_C = \ - $(top_srcdir)/fish/progress.c \ - $(top_srcdir)/fish/file-edit.c \ - $(top_srcdir)/mllib/progress-c.c \ $(top_srcdir)/mllib/mkdtemp-c.c \ - $(top_srcdir)/customize/crypt-c.c \ - $(top_srcdir)/customize/perl_edit-c.c \ domainxml-c.c \ kvmuid-c.c \ utils-c.c \...

...++++++ daemon/parted.mli | 19 ++++++++++++++++ generator/actions_core.ml | 1 + 5 files changed, 77 insertions(+), 42 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 5fd0d77c6..4ee62e564 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -264,6 +264,7 @@ SOURCES_MLI = \ link.mli \ mount.mli \ mountable.mli \ + parted.mli \ utils.mli SOURCES_ML = \ @@ -278,6 +279,7 @@ SOURCES_ML = \ is.ml \ link.ml \ mount.ml \ + parted.ml \ callbacks.ml \ daemon.ml diff --git a/daemon/parted.c b/daemon/parted.c index 03e83cb32..a1e5c81cf 100644 --- a/da...

This patch series is just FYI at the moment. However it does pass the tests. The daemon is a self-contained program. We don't need to write it all in C. Writing parts of it in OCaml would make it simpler and less error-prone. In particular if the daemon was written in a more sane programming language then we could move the inspection code to run entirely inside the appliance, which would

...$(SOURCES_C) +nodist_supermin_SOURCES = format-ext2-init-bin.h supermin_CFLAGS = \ -I$(shell $(OCAMLC) -where) \ $(EXT2FS_CFLAGS) $(COM_ERR_CFLAGS) $(LIBRPM_CFLAGS) \ -Wall $(WERROR_CFLAGS) \ -I$(top_srcdir)/lib -I../lib +format-ext2-init-c.$(OBJEXT): format-ext2-init-bin.h BOBJECTS = $(SOURCES_ML:.ml=.cmo) XOBJECTS = $(SOURCES_ML:.ml=.cmx) @@ -132,9 +134,9 @@ OBJECTS = $(XOBJECTS) BEST = opt endif -supermin_DEPENDENCIES = $(OBJECTS) format-ext2-init-bin.o +supermin_DEPENDENCIES = $(OBJECTS) -supermin_LDADD = format-ext2-init-bin.o ../lib/libgnu.a +supermin_LDADD = ../lib/libgnu.a...

...ils/qemu-boot/qemu-boot.c utils/qemu-speed-test/qemu-speed-test.c v2v/domainxml-c.c v2v/utils-c.c -v2v/xml-c.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 78fdf0211..aa5472ade 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -28,6 +28,8 @@ EXTRA_DIST = \ test-getopt.sh SOURCES_MLI = \ + xml.mli \ + xpath_helpers.mli \ checksums.mli \ common_utils.mli \ curl.mli \ @@ -67,7 +69,9 @@ SOURCES_ML = \ JSON.ml \ curl.ml \ exit.ml \ - checksums.ml + checksums.ml \ + xml.ml \ + xpath_helpers.ml SOURCES_C = \ ../common/visit/visit.c \ @@ -85,7 +89,8 @@ SOURCES_C = \...

...ile.mli | 19 +++++++++++ generator/actions_core.ml | 1 + 5 files changed, 82 insertions(+), 80 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 40b770762..6fb1c5384 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -256,6 +256,7 @@ guestfsd_CFLAGS = \ SOURCES_MLI = \ chroot.mli \ sysroot.mli \ + file.mli \ utils.mli SOURCES_ML = \ @@ -263,6 +264,7 @@ SOURCES_ML = \ utils.ml \ sysroot.ml \ chroot.ml \ + file.ml \ callbacks.ml \ daemon.ml diff --git a/daemon/file.c b/daemon/file.c index 84874dc6f..ee79eb507 100644 --- a/daemon/file.c +++...

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