mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
Move the RPC generator scripts into src/rpc
Move the daemon/remote_generator.pl to src/rpc/gendispatch.pl and move the src/remote/rpcgen_fix.pl to src/rpc/genprotocol.pl * daemon/Makefile.am: Update for new name/location of generator * src/Makefile.am: Update for new name/location of generator
This commit is contained in:
Daniel P. Berrange
parent
434de30da5
commit
b17b4afafd
6
cfg.mk
6
cfg.mk
@ -615,9 +615,9 @@ exclude_file_name_regexp--sc_avoid_write = \
|
||||
exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/
|
||||
|
||||
exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \
|
||||
^daemon/remote_generator\.pl$$
|
||||
^src/rpc/gendispatch\.pl$$
|
||||
|
||||
exclude_file_name_regexp--sc_po_check = ^(docs/|daemon/remote_generator\.pl$$)
|
||||
exclude_file_name_regexp--sc_po_check = ^(docs/|src/rpc/gendispatch\.pl$$)
|
||||
|
||||
exclude_file_name_regexp--sc_prohibit_VIR_ERR_NO_MEMORY = \
|
||||
^(include/libvirt/virterror\.h|daemon/dispatch\.c|src/util/virterror\.c)$$
|
||||
@ -645,7 +645,7 @@ exclude_file_name_regexp--sc_prohibit_gethostname = ^src/util/util\.c$$
|
||||
exclude_file_name_regexp--sc_prohibit_gettext_noop = ^docs/
|
||||
|
||||
exclude_file_name_regexp--sc_prohibit_newline_at_end_of_diagnostic = \
|
||||
^daemon/remote_generator\.pl$$
|
||||
^src/rpc/gendispatch\.pl$$
|
||||
|
||||
exclude_file_name_regexp--sc_prohibit_nonreentrant = \
|
||||
^((po|docs|tests)/|tools/(virsh|console)\.c$$)
|
||||
|
||||
@ -28,7 +28,6 @@ AVAHI_SOURCES = \
|
||||
|
||||
DISTCLEANFILES =
|
||||
EXTRA_DIST = \
|
||||
remote_generator.pl \
|
||||
remote_dispatch_bodies.h \
|
||||
qemu_dispatch_bodies.h \
|
||||
libvirtd.conf \
|
||||
@ -56,54 +55,54 @@ BUILT_SOURCES =
|
||||
REMOTE_PROTOCOL = $(top_srcdir)/src/remote/remote_protocol.x
|
||||
QEMU_PROTOCOL = $(top_srcdir)/src/remote/qemu_protocol.x
|
||||
|
||||
$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/remote_dispatch_prototypes.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -p remote \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -c -p remote \
|
||||
$(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/remote_dispatch_table.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/remote_dispatch_table.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -t remote \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -c -t remote \
|
||||
$(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/remote_dispatch_args.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/remote_dispatch_args.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -a remote \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -c -a remote \
|
||||
$(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/remote_dispatch_ret.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/remote_dispatch_ret.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -r remote \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -c -r remote \
|
||||
$(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/remote_dispatch_bodies.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -c -b remote \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -c -b remote \
|
||||
$(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/qemu_dispatch_prototypes.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -p qemu \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -p qemu \
|
||||
$(QEMU_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/qemu_dispatch_table.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/qemu_dispatch_table.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -t qemu \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -t qemu \
|
||||
$(QEMU_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/qemu_dispatch_args.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/qemu_dispatch_args.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -a qemu \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -a qemu \
|
||||
$(QEMU_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/qemu_dispatch_ret.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -r qemu \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -r qemu \
|
||||
$(QEMU_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/remote_generator.pl \
|
||||
$(srcdir)/qemu_dispatch_bodies.h: $(srcdir)/../src/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote_generator.pl -b qemu \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/../src/rpc/gendispatch.pl -b qemu \
|
||||
$(QEMU_PROTOCOL) > $@
|
||||
|
||||
if WITH_LIBVIRTD
|
||||
|
||||
@ -174,14 +174,14 @@ REMOTE_PROTOCOL = $(srcdir)/remote/remote_protocol.x
|
||||
QEMU_PROTOCOL = $(srcdir)/remote/qemu_protocol.x
|
||||
REMOTE_DRIVER_PROTOCOL = $(REMOTE_PROTOCOL) $(QEMU_PROTOCOL)
|
||||
|
||||
$(srcdir)/remote/remote_client_bodies.h: $(REMOTE_PROTOCOL) \
|
||||
$(top_srcdir)/daemon/remote_generator.pl
|
||||
$(AM_V_GEN)perl -w $(top_srcdir)/daemon/remote_generator.pl \
|
||||
$(srcdir)/remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
|
||||
$(REMOTE_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \
|
||||
-c -k remote $(REMOTE_PROTOCOL) > $@
|
||||
|
||||
$(srcdir)/remote/qemu_client_bodies.h: $(QEMU_PROTOCOL) \
|
||||
$(top_srcdir)/daemon/remote_generator.pl
|
||||
$(AM_V_GEN)perl -w $(top_srcdir)/daemon/remote_generator.pl \
|
||||
$(srcdir)/remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
|
||||
$(QEMU_PROTOCOL)
|
||||
$(AM_V_GEN)perl -w $(srcdir)/rpc/gendispatch.pl \
|
||||
-k qemu $(QEMU_PROTOCOL) > $@
|
||||
|
||||
REMOTE_DRIVER_SOURCES = \
|
||||
@ -190,8 +190,7 @@ REMOTE_DRIVER_SOURCES = \
|
||||
$(REMOTE_DRIVER_GENERATED)
|
||||
|
||||
EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \
|
||||
$(REMOTE_DRIVER_GENERATED) \
|
||||
remote/rpcgen_fix.pl
|
||||
$(REMOTE_DRIVER_GENERATED)
|
||||
|
||||
# Ensure that we don't change the struct or member names or member ordering
|
||||
# in remote_protocol.x The embedded perl below needs a few comments, and
|
||||
@ -572,12 +571,12 @@ $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED)
|
||||
endif WITH_REMOTE
|
||||
|
||||
%protocol.c: %protocol.x %protocol.h $(srcdir)/remote/rpcgen_fix.pl
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote/rpcgen_fix.pl $(RPCGEN) -c \
|
||||
$(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -c \
|
||||
$< $@
|
||||
|
||||
%protocol.h: %protocol.x $(srcdir)/remote/rpcgen_fix.pl
|
||||
$(AM_V_GEN)perl -w $(srcdir)/remote/rpcgen_fix.pl $(RPCGEN) -h \
|
||||
$< $@
|
||||
%protocol.h: %protocol.x $(srcdir)/rpc/genprotocol.pl
|
||||
$(AM_V_GEN)perl -w $(srcdir)/rpc/genprotocol.pl $(RPCGEN) -h \
|
||||
$< $@
|
||||
|
||||
if WITH_XEN
|
||||
if WITH_DRIVER_MODULES
|
||||
@ -1190,6 +1189,11 @@ endif
|
||||
|
||||
noinst_LTLIBRARIES += libvirt-net-rpc.la libvirt-net-rpc-server.la libvirt-net-rpc-client.la
|
||||
|
||||
EXTRA_DIST += \
|
||||
rpc/virnetprotocol.x \
|
||||
rpc/gendispatch.pl \
|
||||
rpc/genprotocol.pl
|
||||
|
||||
libvirt_net_rpc_la_SOURCES = \
|
||||
rpc/virnetmessage.h rpc/virnetmessage.c \
|
||||
rpc/virnetprotocol.h rpc/virnetprotocol.c \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user