8:46 a.m.
*** BLURB HERE? ***
Pino Toscano (4):
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
docs/Makefile.am | 4 ++--
generator/main.ml | 11 +++++++----
perl/Makefile.am | 2 +-
python/Makefile.am | 3 ++-
tests/daemon/Makefile.am | 1 -
5 files changed, 12 insertions(+), 9 deletions(-)
--
2.23.0
8:46 a.m.
New subject: [PATCH 1/4] build: stop shipping files generated by configure
They will be generated by configure.
---
python/Makefile.am | 3 ++-
tests/daemon/Makefile.am | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/Makefile.am b/python/Makefile.am
index 673de3157..9aca202b5 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -38,8 +38,9 @@ EXTRA_DIST = \
setup.py.in \
run-bindtests \
run-python-tests \
+ t/__init__.py \
t/README \
- t/*.py
+ t/test[0-9]*.py
if HAVE_PYTHON
diff --git a/tests/daemon/Makefile.am b/tests/daemon/Makefile.am
index 053cad3e1..921e6d1df 100644
--- a/tests/daemon/Makefile.am
+++ b/tests/daemon/Makefile.am
@@ -30,7 +30,6 @@ TESTS = \
TESTS_ENVIRONMENT = $(top_builddir)/run --test
EXTRA_DIST = \
- captive-daemon.pm \
$(TESTS)
check-valgrind:
--
2.23.0
8:46 a.m.
New subject: [PATCH 2/4] docs: fix out-of-source documentation build
Invoke make-internal-documentation.pl by its path in the source
directory.
Also, depend on it to regenerate the documentation in case
make-internal-documentation.pl changes.
---
docs/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
index e1f2df952..f16f16c5e 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -151,9 +151,9 @@ stamp-guestfs-hacking.pod: guestfs-hacking.pod
internal-documentation.pod
source_files := $(shell cat $(srcdir)/C_SOURCE_FILES)
-internal-documentation.pod: $(source_files:%=$(top_srcdir)/%)
+internal-documentation.pod: $(source_files:%=$(top_srcdir)/%)
$(srcdir)/make-internal-documentation.pl
rm -f $@ $@-t
- ./make-internal-documentation.pl \
+ $(srcdir)/make-internal-documentation.pl \
--srcdir $(top_srcdir) \
-o $@-t \
$(source_files)
--
2.23.0
8:46 a.m.
New subject: [PATCH 3/4] generator: do not generate mlv2v files when not needed
mlv2v is not shipped with libguestfs, so do not try to generate the
files for it in case generator is invoked on a release tarball.
---
generator/main.ml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/generator/main.ml b/generator/main.ml
index 741954e8e..09b4c8922 100644
--- a/generator/main.ml
+++ b/generator/main.ml
@@ -347,10 +347,13 @@ Run it from the top source directory using the command
output_to "gobject/src/session.c"
GObject.generate_gobject_session_source;
- output_to "common/mlv2v/uefi.ml"
- UEFI.generate_uefi_ml;
- output_to "common/mlv2v/uefi.mli"
- UEFI.generate_uefi_mli;
+ (* mlv2v may not be shipped in this source. *)
+ if is_regular_file "common/mlv2v/Makefile.am" then (
+ output_to "common/mlv2v/uefi.ml"
+ UEFI.generate_uefi_ml;
+ output_to "common/mlv2v/uefi.mli"
+ UEFI.generate_uefi_mli;
+ );
output_to "common/mlcustomize/customize_cmdline.mli"
Customize.generate_customize_cmdline_mli;
--
2.23.0
8:46 a.m.
New subject: [PATCH 4/4] perl: fix path to Build.PL
It is a generated file, so it is in the build directory.
---
perl/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 49bf6cc63..212bcb81e 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -59,7 +59,7 @@ clean-local: Build
./Build clean
Build: Build.PL
- $(PERL) $(srcdir)/Build.PL --prefix "@prefix@"
+ $(PERL) Build.PL --prefix "@prefix@"
TESTS_ENVIRONMENT = $(top_builddir)/run --test
--
2.23.0
9:11 a.m.
New subject: [PATCH 4/4] perl: fix path to Build.PL
On Thu, Dec 12, 2019 at 03:46:15PM +0100, Pino Toscano wrote:
It is a generated file, so it is in the build directory.
---
perl/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/perl/Makefile.am b/perl/Makefile.am
index 49bf6cc63..212bcb81e 100644
--- a/perl/Makefile.am
+++ b/perl/Makefile.am
@@ -59,7 +59,7 @@ clean-local: Build
./Build clean
Build: Build.PL
- $(PERL) $(srcdir)/Build.PL --prefix "@prefix@"
+ $(PERL) Build.PL --prefix "@prefix@"
TESTS_ENVIRONMENT = $(top_builddir)/run --test
ACK series, thanks.
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines. Supports shell scripting,
bindings from many languages. http://libguestfs.org
1809
days inactive
1809
days old
5 comments
2 participants
participants (2)
-
Pino Toscano -
Richard W.M. Jones