search for: noinst_script

...'. Signed-off-by: Eric Blake <eblake@redhat.com> --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 315aa36..7815258 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,8 @@ EXTRA_DIST = \ valgrind-suppressions \ m4/.gitignore +noinst_SCRIPTS = nbdkit + SUBDIRS = \ docs \ include \ -- 2.13.6

...--- ocaml/examples/Makefile.am | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index b516647..3b9901a 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -6,15 +6,18 @@ if HAVE_OCAML noinst_SCRIPTS = lvs +OCAMLFINDFLAGS = -ccopt '-L $(top_builddir)/src/.libs' + lvs: lvs.ml - $(OCAMLFIND) ocamlopt -warn-error A -I .. mlguestfs.cmxa $< -o $@ + $(OCAMLFIND) ocamlopt $(OCAMLFINDFLAGS) \ + -warn-error A -I .. mlguestfs.cmxa $< -o $@ if BUILD_OCAML_VIEWER noinst_SCRIPT...

..._redhat_et_libguestfs_GuestFS.h +if HAVE_JAVAH + com_redhat_et_libguestfs_GuestFS.h: $(java_prefix)/GuestFS.class rm -f $@ $(JAVAH) -classpath $(srcdir):. com.redhat.et.libguestfs.GuestFS +else + +com_redhat_et_libguestfs_GuestFS.h: libguestfs-${VERSION}.jar + +endif + # Documentation. noinst_SCRIPTS = doc-stamp diff --git a/m4/guestfs-java.m4 b/m4/guestfs-java.m4 index 9d0f948b6..2ab932ac4 100644 --- a/m4/guestfs-java.m4 +++ b/m4/guestfs-java.m4 @@ -73,9 +73,7 @@ if test "x$with_java" != "xno"; then else JAVAC="$JAVA/bin/javac" fi -...

...AC_SUBST(CELT_LT_REVISION) AC_SUBST(CELT_LT_AGE) +AC_SUBST(LIBCELT_SUFFIX) # For automake. VERSION=$CELT_VERSION diff --git a/libcelt/Makefile.am b/libcelt/Makefile.am index 7c574cc..c4f3787 100644 --- a/libcelt/Makefile.am +++ b/libcelt/Makefile.am @@ -11,17 +11,17 @@ TESTS = match-test.sh noinst_SCRIPTS = match-test.sh -lib_LTLIBRARIES = libcelt.la +lib_LTLIBRARIES = libcelt at LIBCELT_SUFFIX@.la # Sources for compilation in the library -libcelt_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \ +libcelt at LIBCELT_SUFFIX@_la_SOURCES = bands.c celt.c cwrs.c ecintrin.h entcode.c \ en...

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...--- > Makefile.am | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/Makefile.am b/Makefile.am > index 315aa36..7815258 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -39,6 +39,8 @@ EXTRA_DIST = \ > valgrind-suppressions \ > m4/.gitignore > > +noinst_SCRIPTS = nbdkit > + > SUBDIRS = \ > docs \ > include \ ACK This is missing from a few places in libguestfs too ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v c...

...- firstboot.cmx \ - perl_edit.cmx \ - tTY.cmx \ - fsync.cmx \ - progress.cmx \ - uRI.cmx \ - crypt.cmx \ - password.cmx \ - mkdtemp.cmx \ - planner.cmx + mkdtemp-c.o + +if HAVE_OCAMLOPT +OBJECTS += $(patsubst %,%.cmx,$(ocaml_modules)) +else +OBJECTS += $(patsubst %,%.cmo,$(ocaml_modules)) +endif noinst_SCRIPTS = dummy @@ -116,11 +123,20 @@ OCAMLCLIBS = \ -L../gnulib/lib/.libs -lgnu dummy: $(OBJECTS) +if HAVE_OCAMLOPT $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) \ mlguestfs.cmxa -linkpkg $^ \ -cclib '$(OCAMLCLIBS)' \ $(OCAML_GCOV_LDFLAGS) \ -o $@ +else + $(OCAMLFIND) ocamlc $(...

...cmo \ + crypt.cmo \ + password.cmo + +OBJECTS_opt = \ $(top_builddir)/fish/guestfish-progress.o \ $(top_builddir)/fish/guestfish-uri.o \ tty-c.o \ @@ -86,31 +110,53 @@ OBJECTS = \ crypt.cmx \ password.cmx +if HAVE_OCAMLOPT +FINAL_BINARY = dummy.opt +else +FINAL_BINARY = dummy.bc +endif noinst_SCRIPTS = dummy # -I $(top_builddir)/src/.libs is a hack which forces corresponding -L # option to be passed to gcc, so we don't try linking against an # installed copy of libguestfs. -OCAMLPACKAGES = -package str,unix -I $(top_builddir)/src/.libs -I ../ocaml +OCAMLPACKAGES = \ + -package str,uni...

This is a first attempt to build libguestfs with just a ocaml bytecode compiler. The three tools written in ocaml will be build only when an ocamlopt compiler is available. Olaf --- Makefile.am | 5 ++++- configure.ac | 2 ++ ocaml/Makefile.am | 20 +++++++++++++++++--- resize/Makefile.am | 2 +- sparsify/Makefile.am | 2 +- sysprep/Makefile.am | 2 +- 6

...4 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,8 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = \ .dir-locals.el \ .gitignore \ - html/pod.css + html/pod.css \ + $(NULL) SUBDIRS = \ generator \ @@ -36,7 +37,8 @@ SUBDIRS = \ sh \ ocaml \ ocaml/examples \ - interop + interop \ + $(NULL) noinst_SCRIPTS = run diff --git a/common-rules.mk b/common-rules.mk index 498d221..eb8c92e 100644 --- a/common-rules.mk +++ b/common-rules.mk @@ -18,6 +18,9 @@ # common-rules.mk is included in every Makefile.am. # subdir-rules.mk is included only in subdirectories. +# Convenient list terminator +NULL = + CL...

...- wrapper.c | 237 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 248 insertions(+), 164 deletions(-) diff --git a/Makefile.am b/Makefile.am index d5ef59f..cd41132 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,16 @@ EXTRA_DIST = \ CLEANFILES += html/*.html -noinst_SCRIPTS = nbdkit +# NB: This is not the real nbdkit binary. It's a wrapper that allows +# you to run nbdkit from the build directory before it is installed. +noinst_PROGRAMS = nbdkit +nbdkit_SOURCES = wrapper.c src/options.h +nbdkit_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -Dbuilddir=\"$(abs_top_b...

This patch series solves the FreeBSD shebang problem in a completely different way, and a few other things besides. I propose that we replace ./nbdkit with a C program. The C program is a straightforward translation of the shell script. Some advantages of this approach are: - We can parse options in exactly the same way as the real program. - Use the more accurate ‘is_short_name’ test for

...- wrapper.c | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 270 insertions(+), 164 deletions(-) diff --git a/Makefile.am b/Makefile.am index d5ef59f..cd41132 100644 --- a/Makefile.am +++ b/Makefile.am @@ -46,7 +46,16 @@ EXTRA_DIST = \ CLEANFILES += html/*.html -noinst_SCRIPTS = nbdkit +# NB: This is not the real nbdkit binary. It's a wrapper that allows +# you to run nbdkit from the build directory before it is installed. +noinst_PROGRAMS = nbdkit +nbdkit_SOURCES = wrapper.c src/options.h +nbdkit_CPPFLAGS = \ + -I$(top_srcdir)/src \ + -Dbuilddir=\"$(abs_top_b...

...CAMLCFLAGS) -package unix -c $< -o $@ diff --git a/ocaml/examples/Makefile.am b/ocaml/examples/Makefile.am index 5f4177c..29c9466 100644 --- a/ocaml/examples/Makefile.am +++ b/ocaml/examples/Makefile.am @@ -24,11 +24,8 @@ EXTRA_DIST = \ inspect_vm.ml \ guestfs-ocaml.pod -CLEANFILES = \ - $(noinst_SCRIPTS) \ - *.cmi *.cmo *.cmx *.o \ - guestfs-ocaml.3 \ - stamp-guestfs-ocaml.pod +CLEANFILES += \ + $(noinst_SCRIPTS) man_MANS = guestfs-ocaml.3 noinst_DATA = $(top_builddir)/website/guestfs-ocaml.3.html diff --git a/p2v/Makefile.am b/p2v/Makefile.am index d1dcc34..5cac334 100644 --- a/p2v/Makefile....

Still not working, but I took the latest patch and: - rebased it against libnbd 1.0 - fixed it so it handles new args and cbargs The generator now runs without warnings. This patch doesn't handle optargs at all. In C these are converted to non-optional parameter. Rust doesn't (AFAIK) have optional or labelled arguments unfortunately. Rich.

...UDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +include $(top_srcdir)/common-rules.mk + +EXTRA_DIST = \ + Cargo.toml.in \ + examples/ramdisk.rs \ + nbdkit-rust-plugin.pod \ + src/lib.rs + +if HAVE_RUST + +noinst_SCRIPTS = \ + target/release/libnbdkit.rlib \ + target/release/examples/libramdisk.so + +target/release/libnbdkit.rlib: Cargo.toml src/lib.rs + cargo build --release + +target/release/examples/libramdisk.so: Cargo.toml examples/ramdisk.rs + cargo build --release --example ramdisk + +if HAVE_POD + +man_MAN...

This adds very rough support for writing nbdkit plugins in Rust. This is not very idiomatic -- essentially we're handling the direct C calls from nbdkit in Rust. We have to use ‘unsafe’ in a few places because there's no way to tell the Rust code that nbdkit satisfies guarantees (eg. around thread safety, always returning leaked pointers back to the close function, always doing bounds

v1 was here: https://www.redhat.com/archives/libguestfs/2018-November/msg00147.html v2: - Use stdbool for booleans. - Use __attribute__((format(printf))). - Don't abort on invalid options, exit with failure instead. - Preserve long/short option choices in the output. - Add '=' in long option output, ie. always use --longopt=arg. - Add "--" parameter

...d/src/glue.rs +/rust/libnbd-sys/src/lib.rs +/rust/target /sh/nbdsh /sh/nbdsh.1 /stamp-h1 diff --git a/Makefile.am b/Makefile.am index 6a0f4bdfc653..f28f828f6b7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,6 +38,7 @@ SUBDIRS = \ ocaml \ ocaml/examples \ interop \ + rust \ $(NULL) noinst_SCRIPTS = run diff --git a/configure.ac b/configure.ac index 91d08341d732..339073cf6660 100644 --- a/configure.ac +++ b/configure.ac @@ -258,6 +258,19 @@ AS_IF([test "x$enable_python" != "xno"],[ AM_CONDITIONAL([HAVE_PYTHON], [test "x$PYTHON" != "xno" &&am...

** INCOMPLETE ** This is the generator change as discussed on the list already. The Python and OCaml bindings are not yet done. It passes all [C only] tests and valgrind. Note that nbd_add_close_callback is inconsistent with other closure types because it passes the user_data parameter after the function. (This is not caused by the current patch, it was already inconsistent). We decided that