Pino Toscano
2019-Dec-18 10:15 UTC
[Libguestfs] [PATCH] po: reduce the list of extracted sources
Prune from the list of sources where to extract messages various sources with no messages: - .pl and .pm files, as they do not contain messages: almost all the .pl files are tests, and the only .pm file is the Perl Sys::Guestfs module, which wraps the XS extension - dummy.c sources; they are empty sources used to build OCaml-only targets using automake - gperf generated sources - C/OCaml tests --- Makefile.am | 6 ++++-- po/POTFILES | 23 ----------------------- po/POTFILES-ml | 11 ----------- 3 files changed, 4 insertions(+), 36 deletions(-) diff --git a/Makefile.am b/Makefile.am index ec342225a..25255a62d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,11 +328,12 @@ docs/C_SOURCE_FILES: configure.ac po/POTFILES: configure.ac rm -f $@ $@-t cd $(srcdir); \ - find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ + find $(DIST_SUBDIRS) -name '*.c' | \ grep -v -E '^(examples|gnulib|perl/(blib|examples)|po-docs|tests|test-data|bundled)/' | \ - grep -v -E '/((guestfs|rc)_protocol\.c)$$' | \ + grep -v -E '/((guestfs|rc)_protocol\.c|dummy\.c)$$' | \ grep -v -E '^python/utils\.c$$' | \ grep -v -E '^perl/lib/Sys/Guestfs\.c$$' | \ + grep -v -E '.*-(tests|gperf)\.c$$' | \ LC_ALL=C sort -u > $@-t mv $@-t $@ @@ -341,6 +342,7 @@ po/POTFILES-ml: configure.ac cd $(srcdir); \ find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \ grep -v '^builder/templates/' | \ + grep -v -E '.*_tests\.ml$$' | \ LC_ALL=C sort > $@-t mv $@-t $@ diff --git a/po/POTFILES b/po/POTFILES index 64eb3f9ce..3cd1ddd47 100644 --- a/po/POTFILES +++ b/po/POTFILES @@ -12,23 +12,15 @@ cat/log.c cat/ls.c cat/tail.c common/edit/file-edit.c -common/errnostring/errnostring-gperf.c common/errnostring/errnostring.c -common/mlcustomize/dummy.c -common/mlgettext/dummy.c -common/mlpcre/dummy.c common/mlpcre/pcre-c.c common/mlprogress/progress-c.c -common/mlstdutils/dummy.c common/mltools/JSON_parser-c.c -common/mltools/dummy.c common/mltools/getopt-c.c common/mltools/tools_utils-c.c common/mltools/uri-c.c common/mlutils/c_utils-c.c -common/mlutils/dummy.c common/mlutils/unix_utils-c.c -common/mlvisit/dummy.c common/mlvisit/visit-c.c common/mlxml/xml-c.c common/options/config.c @@ -43,7 +35,6 @@ common/parallel/domains.c common/parallel/estimate-max-threads.c common/parallel/parallel.c common/progress/progress.c -common/qemuopts/qemuopts-tests.c common/qemuopts/qemuopts.c common/structs/structs-cleanups.c common/structs/structs-print.c @@ -54,9 +45,7 @@ common/utils/utils.c common/visit/visit.c common/windows/windows.c customize/crypt-c.c -customize/dummy.c customize/perl_edit-c.c -customize/test-password.pl daemon/9p.c daemon/acl.c daemon/augeas.c @@ -181,9 +170,7 @@ daemon/zerofree.c df/df.c df/main.c df/output.c -dib/dummy.c diff/diff.c -docs/make-internal-documentation.pl edit/edit.c erlang/actions-0.c erlang/actions-1.c @@ -196,7 +183,6 @@ erlang/dispatch.c erlang/main.c erlang/structs.c fish/alloc.c -fish/cmds-gperf.c fish/cmds.c fish/completion.c fish/copy.c @@ -246,7 +232,6 @@ fuse/guestunmount.c fuse/test-fuse.c fuse/test-guestmount-fd.c fuse/test-guestunmount-fd.c -get-kernel/dummy.c gobject/src/optargs-add_domain.c gobject/src/optargs-add_drive.c gobject/src/optargs-add_drive_scratch.c @@ -405,7 +390,6 @@ lib/tmpdirs.c lib/tsk.c lib/uefi.c lib/umask.c -lib/unit-tests.c lib/version.c lib/wait.c lib/whole-file.c @@ -415,8 +399,6 @@ make-fs/make-fs.c ocaml/guestfs-c-actions.c ocaml/guestfs-c-errnos.c ocaml/guestfs-c.c -perl/bindtests.pl -perl/lib/Sys/Guestfs.pm php/extension/guestfs_php.c python/actions-0.c python/actions-1.c @@ -431,9 +413,6 @@ python/structs.c rescue/escape.c rescue/rescue.c rescue/suggest.c -rescue/test-virt-rescue.pl -resize/dummy.c -resize/test-virt-resize.pl ruby/ext/guestfs/actions-0.c ruby/ext/guestfs/actions-1.c ruby/ext/guestfs/actions-2.c @@ -443,6 +422,4 @@ ruby/ext/guestfs/actions-5.c ruby/ext/guestfs/actions-6.c ruby/ext/guestfs/handle.c ruby/ext/guestfs/module.c -sparsify/dummy.c -sysprep/dummy.c test-tool/test-tool.c diff --git a/po/POTFILES-ml b/po/POTFILES-ml index 96de6837b..a9b6efdaa 100644 --- a/po/POTFILES-ml +++ b/po/POTFILES-ml @@ -4,7 +4,6 @@ builder/cmdline.ml builder/downloader.ml builder/index.ml builder/index_parser.ml -builder/index_parser_tests.ml builder/ini_reader.ml builder/languages.ml builder/list_entries.ml @@ -23,37 +22,27 @@ common/mlcustomize/customize_cmdline.ml common/mlcustomize/firstboot.ml common/mlgettext/common_gettext.ml common/mlpcre/PCRE.ml -common/mlpcre/pcre_tests.ml common/mlprogress/progress.ml common/mlstdutils/guestfs_config.ml common/mlstdutils/std_utils.ml -common/mlstdutils/std_utils_tests.ml common/mlstdutils/stringMap.ml common/mlstdutils/stringSet.ml common/mltools/JSON.ml common/mltools/JSON_parser.ml -common/mltools/JSON_parser_tests.ml -common/mltools/JSON_tests.ml common/mltools/URI.ml common/mltools/checksums.ml common/mltools/curl.ml common/mltools/getopt.ml -common/mltools/getopt_tests.ml -common/mltools/machine_readable_tests.ml common/mltools/planner.ml common/mltools/regedit.ml common/mltools/registry.ml -common/mltools/tools_messages_tests.ml common/mltools/tools_utils.ml -common/mltools/tools_utils_tests.ml common/mltools/urandom.ml common/mltools/xpath_helpers.ml common/mlutils/c_utils.ml -common/mlutils/c_utils_unit_tests.ml common/mlutils/unix_utils.ml common/mlv2v/uefi.ml common/mlvisit/visit.ml -common/mlvisit/visit_tests.ml common/mlxml/xml.ml customize/append_line.ml customize/crypt.ml -- 2.24.1
Richard W.M. Jones
2020-Jan-09 13:31 UTC
Re: [Libguestfs] [PATCH] po: reduce the list of extracted sources
On Wed, Dec 18, 2019 at 11:15:31AM +0100, Pino Toscano wrote:> Prune from the list of sources where to extract messages various sources > with no messages: > - .pl and .pm files, as they do not contain messages: almost all the > .pl files are tests, and the only .pm file is the Perl Sys::Guestfs > module, which wraps the XS extension > - dummy.c sources; they are empty sources used to build OCaml-only > targets using automake > - gperf generated sources > - C/OCaml tests > --- > Makefile.am | 6 ++++-- > po/POTFILES | 23 ----------------------- > po/POTFILES-ml | 11 ----------- > 3 files changed, 4 insertions(+), 36 deletions(-) > > diff --git a/Makefile.am b/Makefile.am > index ec342225a..25255a62d 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -328,11 +328,12 @@ docs/C_SOURCE_FILES: configure.ac > po/POTFILES: configure.ac > rm -f $@ $@-t > cd $(srcdir); \ > - find $(DIST_SUBDIRS) -name '*.c' -o -name '*.pl' -o -name '*.pm' | \ > + find $(DIST_SUBDIRS) -name '*.c' | \ > grep -v -E '^(examples|gnulib|perl/(blib|examples)|po-docs|tests|test-data|bundled)/' | \ > - grep -v -E '/((guestfs|rc)_protocol\.c)$$' | \ > + grep -v -E '/((guestfs|rc)_protocol\.c|dummy\.c)$$' | \ > grep -v -E '^python/utils\.c$$' | \ > grep -v -E '^perl/lib/Sys/Guestfs\.c$$' | \ > + grep -v -E '.*-(tests|gperf)\.c$$' | \ > LC_ALL=C sort -u > $@-t > mv $@-t $@ > > @@ -341,6 +342,7 @@ po/POTFILES-ml: configure.ac > cd $(srcdir); \ > find builder common/ml* customize dib get-kernel resize sparsify sysprep -name '*.ml' | \ > grep -v '^builder/templates/' | \ > + grep -v -E '.*_tests\.ml$$' | \ > LC_ALL=C sort > $@-t > mv $@-t $@ > > diff --git a/po/POTFILES b/po/POTFILES > index 64eb3f9ce..3cd1ddd47 100644 > --- a/po/POTFILES > +++ b/po/POTFILES > @@ -12,23 +12,15 @@ cat/log.c > cat/ls.c > cat/tail.c > common/edit/file-edit.c > -common/errnostring/errnostring-gperf.c > common/errnostring/errnostring.c > -common/mlcustomize/dummy.c > -common/mlgettext/dummy.c > -common/mlpcre/dummy.c > common/mlpcre/pcre-c.c > common/mlprogress/progress-c.c > -common/mlstdutils/dummy.c > common/mltools/JSON_parser-c.c > -common/mltools/dummy.c > common/mltools/getopt-c.c > common/mltools/tools_utils-c.c > common/mltools/uri-c.c > common/mlutils/c_utils-c.c > -common/mlutils/dummy.c > common/mlutils/unix_utils-c.c > -common/mlvisit/dummy.c > common/mlvisit/visit-c.c > common/mlxml/xml-c.c > common/options/config.c > @@ -43,7 +35,6 @@ common/parallel/domains.c > common/parallel/estimate-max-threads.c > common/parallel/parallel.c > common/progress/progress.c > -common/qemuopts/qemuopts-tests.c > common/qemuopts/qemuopts.c > common/structs/structs-cleanups.c > common/structs/structs-print.c > @@ -54,9 +45,7 @@ common/utils/utils.c > common/visit/visit.c > common/windows/windows.c > customize/crypt-c.c > -customize/dummy.c > customize/perl_edit-c.c > -customize/test-password.pl > daemon/9p.c > daemon/acl.c > daemon/augeas.c > @@ -181,9 +170,7 @@ daemon/zerofree.c > df/df.c > df/main.c > df/output.c > -dib/dummy.c > diff/diff.c > -docs/make-internal-documentation.pl > edit/edit.c > erlang/actions-0.c > erlang/actions-1.c > @@ -196,7 +183,6 @@ erlang/dispatch.c > erlang/main.c > erlang/structs.c > fish/alloc.c > -fish/cmds-gperf.c > fish/cmds.c > fish/completion.c > fish/copy.c > @@ -246,7 +232,6 @@ fuse/guestunmount.c > fuse/test-fuse.c > fuse/test-guestmount-fd.c > fuse/test-guestunmount-fd.c > -get-kernel/dummy.c > gobject/src/optargs-add_domain.c > gobject/src/optargs-add_drive.c > gobject/src/optargs-add_drive_scratch.c > @@ -405,7 +390,6 @@ lib/tmpdirs.c > lib/tsk.c > lib/uefi.c > lib/umask.c > -lib/unit-tests.c > lib/version.c > lib/wait.c > lib/whole-file.c > @@ -415,8 +399,6 @@ make-fs/make-fs.c > ocaml/guestfs-c-actions.c > ocaml/guestfs-c-errnos.c > ocaml/guestfs-c.c > -perl/bindtests.pl > -perl/lib/Sys/Guestfs.pm > php/extension/guestfs_php.c > python/actions-0.c > python/actions-1.c > @@ -431,9 +413,6 @@ python/structs.c > rescue/escape.c > rescue/rescue.c > rescue/suggest.c > -rescue/test-virt-rescue.pl > -resize/dummy.c > -resize/test-virt-resize.pl > ruby/ext/guestfs/actions-0.c > ruby/ext/guestfs/actions-1.c > ruby/ext/guestfs/actions-2.c > @@ -443,6 +422,4 @@ ruby/ext/guestfs/actions-5.c > ruby/ext/guestfs/actions-6.c > ruby/ext/guestfs/handle.c > ruby/ext/guestfs/module.c > -sparsify/dummy.c > -sysprep/dummy.c > test-tool/test-tool.c > diff --git a/po/POTFILES-ml b/po/POTFILES-ml > index 96de6837b..a9b6efdaa 100644 > --- a/po/POTFILES-ml > +++ b/po/POTFILES-ml > @@ -4,7 +4,6 @@ builder/cmdline.ml > builder/downloader.ml > builder/index.ml > builder/index_parser.ml > -builder/index_parser_tests.ml > builder/ini_reader.ml > builder/languages.ml > builder/list_entries.ml > @@ -23,37 +22,27 @@ common/mlcustomize/customize_cmdline.ml > common/mlcustomize/firstboot.ml > common/mlgettext/common_gettext.ml > common/mlpcre/PCRE.ml > -common/mlpcre/pcre_tests.ml > common/mlprogress/progress.ml > common/mlstdutils/guestfs_config.ml > common/mlstdutils/std_utils.ml > -common/mlstdutils/std_utils_tests.ml > common/mlstdutils/stringMap.ml > common/mlstdutils/stringSet.ml > common/mltools/JSON.ml > common/mltools/JSON_parser.ml > -common/mltools/JSON_parser_tests.ml > -common/mltools/JSON_tests.ml > common/mltools/URI.ml > common/mltools/checksums.ml > common/mltools/curl.ml > common/mltools/getopt.ml > -common/mltools/getopt_tests.ml > -common/mltools/machine_readable_tests.ml > common/mltools/planner.ml > common/mltools/regedit.ml > common/mltools/registry.ml > -common/mltools/tools_messages_tests.ml > common/mltools/tools_utils.ml > -common/mltools/tools_utils_tests.ml > common/mltools/urandom.ml > common/mltools/xpath_helpers.ml > common/mlutils/c_utils.ml > -common/mlutils/c_utils_unit_tests.ml > common/mlutils/unix_utils.ml > common/mlv2v/uefi.ml > common/mlvisit/visit.ml > -common/mlvisit/visit_tests.ml > common/mlxml/xml.ml > customize/append_line.ml > customize/crypt.ml > -- > 2.24.1Looks fine, so ACK. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/