External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-17 15:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: Properly generate and check virkeepaliveprotocol-structs

Browse Source 
This fixes make dist broken by recent keepalive series
This commit is contained in:
Jiri Denemark 2011-11-24 14:16:36 +01:00
parent 8455705959
commit 04a469338d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@ -247,14 +247,15 @@ EXTRA_DIST += $(REMOTE_DRIVER_PROTOCOL) \
# The alternation of the following regexps matches both cases. # The alternation of the following regexps matches both cases.
r1 = /\* \d+ \*/ r1 = /\* \d+ \*/
r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/ r2 = /\* <[[:xdigit:]]+> \S+:\d+ \*/
struct_prefix = (remote_|qemu_|virNet|keepalive_)
PDWTAGS = \ PDWTAGS = \
$(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \ $(AM_V_GEN)if (pdwtags --help) > /dev/null 2>&1; then \
pdwtags --verbose $(<:.lo=.$(OBJEXT)) \ pdwtags --verbose $(<:.lo=.$(OBJEXT)) \
| perl -0777 -n \ | perl -0777 -n \
-e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \ -e 'foreach my $$p (split m!\n*(?:$(r1)|$(r2))\n!) {' \
-e ' if ($$p =~ /^(struct|enum) (remote_|qemu_|virNet)/ ||' \ -e ' if ($$p =~ /^(struct|enum) $(struct_prefix)/ ||' \
-e ' $$p =~ /^enum {/) {' \ -e ' $$p =~ /^enum {/) {' \
-e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \ -e ' $$p =~ s!\t*/\*.*?\*/!!sg;' \
-e ' $$p =~ s!\s+\n!\n!sg;' \ -e ' $$p =~ s!\s+\n!\n!sg;' \
-e ' $$p =~ s!\s+$$!!;' \ -e ' $$p =~ s!\s+$$!!;' \
@ -267,7 +268,7 @@ PDWTAGS = \
-e ' print "/* -*- c -*- */\n";' \ -e ' print "/* -*- c -*- */\n";' \
-e '}' \ -e '}' \
-e 'END {' \ -e 'END {' \
-e ' if ($$n < 3) {' \ -e ' if ($$n < 1) {' \
-e ' warn "WARNING: your pdwtags program is too old\n";' \ -e ' warn "WARNING: your pdwtags program is too old\n";' \
-e ' warn "WARNING: skipping the $@ test\n";' \ -e ' warn "WARNING: skipping the $@ test\n";' \
-e ' warn "WARNING: install dwarves-1.3 or newer\n";' \ -e ' warn "WARNING: install dwarves-1.3 or newer\n";' \
@ -295,6 +296,7 @@ $(srcdir)/%_protocol-structs: libvirt_driver_remote_la-%_protocol.lo
$(srcdir)/virnetprotocol-structs: libvirt_net_rpc_la-virnetprotocol.lo $(srcdir)/virnetprotocol-structs: libvirt_net_rpc_la-virnetprotocol.lo
$(PDWTAGS) $(PDWTAGS)
$(srcdir)/virkeepaliveprotocol-structs: libvirt_net_rpc_la-virkeepaliveprotocol.lo $(srcdir)/virkeepaliveprotocol-structs: libvirt_net_rpc_la-virkeepaliveprotocol.lo
$(PDWTAGS)
else !WITH_REMOTE else !WITH_REMOTE
# These generated files must live in git, because they cannot be re-generated # These generated files must live in git, because they cannot be re-generated
# when configured --without-remote. # when configured --without-remote.

5
src/virkeepaliveprotocol-structs Normal file
View File

@ -0,0 +1,5 @@
/* -*- c -*- */
enum keepalive_procedure {
KEEPALIVE_PROC_PING = 1,
KEEPALIVE_PROC_PONG = 2,
};