[libvirt] [PATCHv2 3/3] build: Remove all generated RPC files from GIT

Eric Blake eblake at redhat.com
Fri May 6 21:21:36 UTC 2011 

From: Daniel P. Berrange <berrange at redhat.com>

Stop storing the generated files for the remote protocol client
and server in source control. The generated files will still be
included in the result of 'make dist' to avoid end-users needing
to generate the files

Unfortunately, this means that the strings marked for translation
in generated files are not picked up by gnulib's syntax-check,
I'm working on fixing that in gnulib.

* .gitignore, cfg.mk, po/POTFILES.in: Reflect deletion.
---

Manually edited to elide deletions.

 .gitignore                          |    3 +
 cfg.mk                              |    4 +-
 daemon/qemu_dispatch_args.h         |    5 -
 daemon/qemu_dispatch_bodies.h       |    5 -
 daemon/qemu_dispatch_prototypes.h   |   12 -
 daemon/qemu_dispatch_ret.h          |    5 -
 daemon/qemu_dispatch_table.h        |   14 -
 daemon/remote_dispatch_args.h       |  180 --
 daemon/remote_dispatch_bodies.h     | 5932 -----------------------------------
 daemon/remote_dispatch_prototypes.h | 1620 ----------
 daemon/remote_dispatch_ret.h        |  142 -
 daemon/remote_dispatch_table.h      | 1054 -------
 po/POTFILES.in                      |    2 -
 src/remote/qemu_client_bodies.h     |    3 -
 src/remote/qemu_protocol.c          |   41 -
 src/remote/qemu_protocol.h          |   57 -
 src/remote/remote_client_bodies.h   | 4663 ---------------------------
 src/remote/remote_protocol.c        | 3996 -----------------------
 src/remote/remote_protocol.h        | 3167 -------------------
 19 files changed, 4 insertions(+), 20901 deletions(-)
 delete mode 100644 daemon/qemu_dispatch_args.h
 delete mode 100644 daemon/qemu_dispatch_bodies.h
 delete mode 100644 daemon/qemu_dispatch_prototypes.h
 delete mode 100644 daemon/qemu_dispatch_ret.h
 delete mode 100644 daemon/qemu_dispatch_table.h
 delete mode 100644 daemon/remote_dispatch_args.h
 delete mode 100644 daemon/remote_dispatch_bodies.h
 delete mode 100644 daemon/remote_dispatch_prototypes.h
 delete mode 100644 daemon/remote_dispatch_ret.h
 delete mode 100644 daemon/remote_dispatch_table.h
 delete mode 100644 src/remote/qemu_client_bodies.h
 delete mode 100644 src/remote/qemu_protocol.c
 delete mode 100644 src/remote/qemu_protocol.h
 delete mode 100644 src/remote/remote_client_bodies.h
 delete mode 100644 src/remote/remote_protocol.c
 delete mode 100644 src/remote/remote_protocol.h

diff --git a/.gitignore b/.gitignore
index 803f2a3..87a105f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@
 /config.sub
 /configure
 /configure.lineno
+/daemon/*_dispatch_*.h
 /gnulib/
 /libtool
 /libvirt-*.tar.gz
@@ -49,6 +50,8 @@
 /po/*
 /proxy/
 /src/libvirt_iohelper
+/src/remote/*_client_bodies.h
+/src/remote/*_protocol.[ch]
 /tests/*.log
 /tests/cputest
 /tests/hashtest
diff --git a/cfg.mk b/cfg.mk
index 27ed929..1deb6ba 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -495,8 +495,6 @@ sc_prohibit_newline_at_end_of_diagnostic:
 	  && { echo '$(ME): newline at end of message(s)' 1>&2;		\
 	    exit 1; } || :

-# Regex for grep -E that exempts generated files from style rules.
-preprocessor_exempt = ((qemu|remote)_(driver|protocol)\.h)$$
 # Enforce recommended preprocessor indentation style.
 sc_preprocessor_indentation:
 	@if cppi --version >/dev/null 2>&1; then			\
@@ -614,7 +612,7 @@ exclude_file_name_regexp--sc_prohibit_close = \
 exclude_file_name_regexp--sc_prohibit_doubled_word = ^po/

 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = \
-  (^docs/api_extension/|^tests/qemuhelpdata/|\.(gif|ico|png)$$|^daemon/.*_dispatch_bodies\.h$$|^src/remote/.*_client_bodies\.h$$)
+  (^docs/api_extension/|^tests/qemuhelpdata/|\.(gif|ico|png)$$)

 _src2=src/(util/util|libvirt|lxc/lxc_controller)
 exclude_file_name_regexp--sc_prohibit_fork_wrappers = \
diff --git a/daemon/qemu_dispatch_args.h b/daemon/qemu_dispatch_args.h
deleted file mode 100644
index 81623bc..0000000
--- a/daemon/qemu_dispatch_args.h
+++ /dev/null
diff --git a/daemon/qemu_dispatch_bodies.h b/daemon/qemu_dispatch_bodies.h
deleted file mode 100644
index 8f5bed6..0000000
--- a/daemon/qemu_dispatch_bodies.h
+++ /dev/null
diff --git a/daemon/qemu_dispatch_prototypes.h b/daemon/qemu_dispatch_prototypes.h
deleted file mode 100644
index 031ae38..0000000
--- a/daemon/qemu_dispatch_prototypes.h
+++ /dev/null
diff --git a/daemon/qemu_dispatch_ret.h b/daemon/qemu_dispatch_ret.h
deleted file mode 100644
index 4dcab6c..0000000
--- a/daemon/qemu_dispatch_ret.h
+++ /dev/null
diff --git a/daemon/qemu_dispatch_table.h b/daemon/qemu_dispatch_table.h
deleted file mode 100644
index d8eebd0..0000000
--- a/daemon/qemu_dispatch_table.h
+++ /dev/null
diff --git a/daemon/remote_dispatch_args.h b/daemon/remote_dispatch_args.h
deleted file mode 100644
index 31c02c7..0000000
--- a/daemon/remote_dispatch_args.h
+++ /dev/null
diff --git a/daemon/remote_dispatch_bodies.h b/daemon/remote_dispatch_bodies.h
deleted file mode 100644
index 702a8bd..0000000
--- a/daemon/remote_dispatch_bodies.h
+++ /dev/null
diff --git a/daemon/remote_dispatch_prototypes.h b/daemon/remote_dispatch_prototypes.h
deleted file mode 100644
index b6819c0..0000000
--- a/daemon/remote_dispatch_prototypes.h
+++ /dev/null
diff --git a/daemon/remote_dispatch_ret.h b/daemon/remote_dispatch_ret.h
deleted file mode 100644
index cf63657..0000000
--- a/daemon/remote_dispatch_ret.h
+++ /dev/null
diff --git a/daemon/remote_dispatch_table.h b/daemon/remote_dispatch_table.h
deleted file mode 100644
index c140341..0000000
--- a/daemon/remote_dispatch_table.h
+++ /dev/null
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7f5156c..766f8f6 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,7 +2,6 @@ daemon/dispatch.c
 daemon/libvirtd.c
 daemon/remote.c
 daemon/stream.c
-daemon/remote_dispatch_bodies.h
 src/conf/cpu_conf.c
 src/conf/domain_conf.c
 src/conf/domain_event.c
@@ -64,7 +63,6 @@ src/qemu/qemu_monitor.c
 src/qemu/qemu_monitor_json.c
 src/qemu/qemu_monitor_text.c
 src/qemu/qemu_process.c
-src/remote/remote_client_bodies.h
 src/remote/remote_driver.c
 src/secret/secret_driver.c
 src/security/security_apparmor.c
diff --git a/src/remote/qemu_client_bodies.h b/src/remote/qemu_client_bodies.h
deleted file mode 100644
index 3ca2a91..0000000
--- a/src/remote/qemu_client_bodies.h
+++ /dev/null
diff --git a/src/remote/qemu_protocol.c b/src/remote/qemu_protocol.c
deleted file mode 100644
index 3480c54..0000000
--- a/src/remote/qemu_protocol.c
+++ /dev/null
diff --git a/src/remote/qemu_protocol.h b/src/remote/qemu_protocol.h
deleted file mode 100644
index c2501c7..0000000
--- a/src/remote/qemu_protocol.h
+++ /dev/null
diff --git a/src/remote/remote_client_bodies.h b/src/remote/remote_client_bodies.h
deleted file mode 100644
index 6b6f98d..0000000
--- a/src/remote/remote_client_bodies.h
+++ /dev/null
diff --git a/src/remote/remote_protocol.c b/src/remote/remote_protocol.c
deleted file mode 100644
index 84bc617..0000000
--- a/src/remote/remote_protocol.c
+++ /dev/null
diff --git a/src/remote/remote_protocol.h b/src/remote/remote_protocol.h
deleted file mode 100644
index 8942646..0000000
--- a/src/remote/remote_protocol.h
+++ /dev/null
-- 
1.7.4.4

More information about the libvir-list mailing list