Use wildcards instead of manually-maintained file lists in */nls.mk.
authorTom Lane <tgl@sss.pgh.pa.us>
Wed, 13 Jul 2022 16:56:42 +0000 (12:56 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Wed, 13 Jul 2022 16:56:42 +0000 (12:56 -0400)
The backend already used a mechanically-generated list of *.c files,
but everywhere else we had a manually-written-out list of files in
which to seek translatable messages.  Commit b0a55e432 contains the
latest in a long line of failures to update those lists.  Rather than
manually fix its oversight, let's change to using "$(wildcard *.c)"
in all these nls.mk files.

Many of these files also have manual references to some *.c files
in other directories, most often src/common/.  Perhaps we should try
to improve that situation too; but it's a bit less clear how, so for
now just fix the local file references.

Kyotaro Horiguchi and Tom Lane

Discussion: https://postgr.es/m/20220713.160853.453362706160476128.horikyota.ntt@gmail.com

25 files changed:
src/bin/initdb/nls.mk
src/bin/pg_amcheck/nls.mk
src/bin/pg_archivecleanup/nls.mk
src/bin/pg_basebackup/nls.mk
src/bin/pg_checksums/nls.mk
src/bin/pg_config/nls.mk
src/bin/pg_controldata/nls.mk
src/bin/pg_ctl/nls.mk
src/bin/pg_dump/nls.mk
src/bin/pg_resetwal/nls.mk
src/bin/pg_rewind/nls.mk
src/bin/pg_test_fsync/nls.mk
src/bin/pg_test_timing/nls.mk
src/bin/pg_upgrade/nls.mk
src/bin/pg_verifybackup/nls.mk
src/bin/pg_waldump/nls.mk
src/bin/psql/nls.mk
src/bin/scripts/nls.mk
src/interfaces/ecpg/ecpglib/nls.mk
src/interfaces/ecpg/preproc/nls.mk
src/interfaces/libpq/nls.mk
src/pl/plperl/nls.mk
src/pl/plpgsql/src/nls.mk
src/pl/plpython/nls.mk
src/pl/tcl/nls.mk

index 19c91368493ed0873449e092a2cdefd551b9a538..d7ee359cd17a426b6af90bb4c8e3aa09c3a656e2 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/initdb/nls.mk
 CATALOG_NAME     = initdb
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) findtimezone.c initdb.c ../../common/exec.c ../../common/fe_memutils.c ../../common/file_utils.c ../../common/pgfnames.c ../../common/restricted_token.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) ../../common/exec.c ../../common/fe_memutils.c ../../common/file_utils.c ../../common/pgfnames.c ../../common/restricted_token.c ../../common/rmtree.c ../../common/username.c ../../common/wait_error.c ../../port/dirmod.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index 5e6171952c0f756b432c5c97ed1175a8bfd40021..e6813d4d97f6996df8e75b10873fa92c9f3071eb 100644 (file)
@@ -1,7 +1,6 @@
 # src/bin/pg_amcheck/nls.mk
 CATALOG_NAME     = pg_amcheck
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   pg_amcheck.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../fe_utils/cancel.c \
                    ../../fe_utils/connect_utils.c \
                    ../../fe_utils/option_utils.c \
index 801cf1c51e8426cf8685f7db8ffb6f29e03d466a..e04a0d54e567755fd8f803a8c6b9b07dcbb457c6 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/pg_archivecleanup/nls.mk
 CATALOG_NAME     = pg_archivecleanup
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index 8d28e249dedfb2c723655f38ccb60eb74651a94f..14a39d906f68407cc77dc3137b745d79881841c7 100644 (file)
@@ -1,18 +1,6 @@
 # src/bin/pg_basebackup/nls.mk
 CATALOG_NAME     = pg_basebackup
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   bbstreamer_file.c \
-                   bbstreamer_gzip.c \
-                   bbstreamer_inject.c \
-                   bbstreamer_lz4.c \
-                   bbstreamer_tar.c \
-                   bbstreamer_zstd.c \
-                   pg_basebackup.c \
-                   pg_receivewal.c \
-                   pg_recvlogical.c \
-                   receivelog.c \
-                   streamutil.c \
-                   walmethods.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../common/compression.c \
                    ../../common/fe_memutils.c \
                    ../../common/file_utils.c \
index f7cd2a5ee937116545dabd0c582a34647e9ef26c..b6ce911add54256255b2550b5985ec60dad8b9d1 100644 (file)
@@ -1,7 +1,6 @@
 # src/bin/pg_checksums/nls.mk
 CATALOG_NAME     = pg_checksums
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   pg_checksums.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../fe_utils/option_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index d86c28c404d682e74fd707cc83b43507b1673f65..1e8d00d35545ab25be7f7c3e886c50532705d836 100644 (file)
@@ -1,3 +1,3 @@
 # src/bin/pg_config/nls.mk
 CATALOG_NAME     = pg_config
-GETTEXT_FILES    = pg_config.c ../../common/config_info.c ../../common/exec.c
+GETTEXT_FILES    = $(wildcard *.c) ../../common/config_info.c ../../common/exec.c
index ab34205b960105a111700ab5282aef490f1a57fa..e2927d55024c4abe1719e5e14318ed06b55ee781 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/pg_controldata/nls.mk
 CATALOG_NAME     = pg_controldata
-GETTEXT_FILES    = pg_controldata.c ../../common/controldata_utils.c
+GETTEXT_FILES    = $(wildcard *.c) ../../common/controldata_utils.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index 84e7fb4e56084f2ba77658679b5d400864032c68..d0e739efa744f78a1705c6dbdbf32ec4f6554ee3 100644 (file)
@@ -1,3 +1,3 @@
 # src/bin/pg_ctl/nls.mk
 CATALOG_NAME     = pg_ctl
-GETTEXT_FILES    = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
+GETTEXT_FILES    = $(wildcard *.c) ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
index 3054f93fadf9f32cd5aa7a21a95b85b0a6c2b1a6..1ad8a860eeb2dc9fdbd146b34310bc253856f382 100644 (file)
@@ -1,12 +1,6 @@
 # src/bin/pg_dump/nls.mk
 CATALOG_NAME     = pg_dump
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
-                   pg_backup_null.c pg_backup_tar.c \
-                   pg_backup_directory.c dumputils.c compress_io.c \
-                   pg_dump.c common.c pg_dump_sort.c \
-                   pg_restore.c pg_dumpall.c \
-                   parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../common/exec.c ../../common/fe_memutils.c \
                    ../../common/wait_error.c \
                    ../../fe_utils/option_utils.c
index bc25482f2ca439709b1f866d574221f2f2698bc1..2ad24ce7b96a28b6ff3eb56d1b8c47a9822093c1 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/pg_resetwal/nls.mk
 CATALOG_NAME     = pg_resetwal
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) ../../common/restricted_token.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index 0618cb8c2cff51a7ac6d947d93ec4e8c92bd0332..5ed09c70ba4450c7161d185155b4c4d6430a8239 100644 (file)
@@ -1,6 +1,6 @@
 # src/bin/pg_rewind/nls.mk
 CATALOG_NAME     = pg_rewind
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) datapagemap.c file_ops.c filemap.c libpq_source.c local_source.c parsexlog.c pg_rewind.c timeline.c xlogreader.c ../../common/fe_memutils.c ../../common/restricted_token.c ../../fe_utils/archive.c ../../fe_utils/recovery_gen.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) ../../common/fe_memutils.c ../../common/restricted_token.c ../../fe_utils/archive.c ../../fe_utils/recovery_gen.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
     report_invalid_record:2:c-format
index a50782036ca662e994660e06a439cc3ef55bba88..32733360905bc623d75db190b4bdc6b1aec48f60 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/pg_test_fsync/nls.mk
 CATALOG_NAME     = pg_test_fsync
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index 331931c591f7d01611de38ebf2f6a181ca4936e0..198350a6b73c484231fec3f4d6c1908476c5b473 100644 (file)
@@ -1,3 +1,3 @@
 # src/bin/pg_test_timing/nls.mk
 CATALOG_NAME     = pg_test_timing
-GETTEXT_FILES    = pg_test_timing.c
+GETTEXT_FILES    = $(wildcard *.c)
index 8a4ebbcbe93f57864a8bd4dccc925782fa6f4066..1262c1714d0613e78ba59bb93fcdcb611e78f779 100644 (file)
@@ -1,8 +1,6 @@
 # src/bin/pg_upgrade/nls.mk
 CATALOG_NAME     = pg_upgrade
-GETTEXT_FILES    = check.c controldata.c dump.c exec.c file.c function.c \
-                   info.c option.c parallel.c pg_upgrade.c relfilenode.c \
-                   server.c tablespace.c util.c version.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
 GETTEXT_FLAGS    = \
     pg_fatal:1:c-format \
index eba73a2c0586e9b7a74f066ba4e001116d79dc0f..72d89c009d9a1555180f0e5a424123e74e64fa9f 100644 (file)
@@ -1,8 +1,6 @@
 # src/bin/pg_verifybackup/nls.mk
 CATALOG_NAME     = pg_verifybackup
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   parse_manifest.c \
-                   pg_verifybackup.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../common/fe_memutils.c \
                    ../../common/jsonapi.c
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
index a9eeb6712bc6bf3afe5dd78f33b20ee97e876489..6857da9bca1a4fdaadafd72815102b70b0ee5757 100644 (file)
@@ -1,5 +1,5 @@
 # src/bin/pg_waldump/nls.mk
 CATALOG_NAME     = pg_waldump
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
 GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(FRONTEND_COMMON_GETTEXT_FLAGS)
index dad5816b9c737f2f0230f470c377da19ed6dbc1c..37c1ced20aa878cdf8cd8e0a89b6aa04732d0e38 100644 (file)
@@ -1,10 +1,6 @@
 # src/bin/psql/nls.mk
 CATALOG_NAME     = psql
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   command.c common.c copy.c crosstabview.c help.c input.c large_obj.c \
-                   mainloop.c psqlscanslash.c startup.c \
-                   describe.c sql_help.h sql_help.c \
-                   tab-complete.c variables.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
                    ../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
                    ../../common/wait_error.c ../../port/thread.c
index f4638a06f0daecb6c3cd6a4b73d33a46ca115711..52a05eb900660511a0a5f1f5c01ed8d00abc3a0d 100644 (file)
@@ -1,11 +1,6 @@
 # src/bin/scripts/nls.mk
 CATALOG_NAME     = pgscripts
-GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) \
-                   createdb.c createuser.c \
-                   dropdb.c dropuser.c \
-                   clusterdb.c vacuumdb.c reindexdb.c \
-                   pg_isready.c \
-                   common.c \
+GETTEXT_FILES    = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
                    ../../fe_utils/parallel_slot.c \
                    ../../fe_utils/cancel.c ../../fe_utils/print.c \
                    ../../fe_utils/connect_utils.c \
index 77eecc98f38aff0b266a26a3b251a1e329433f09..66d0b62cf4537ca7e0b3e77ce095abed2e286f1d 100644 (file)
@@ -1,5 +1,5 @@
 # src/interfaces/ecpg/ecpglib/nls.mk
 CATALOG_NAME     = ecpglib
-GETTEXT_FILES    = connect.c descriptor.c error.c execute.c misc.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = ecpg_gettext
 GETTEXT_FLAGS    = ecpg_gettext:1:pass-c-format
index 55ea19a44ed989597ad8ce04fc29515cf18dcd41..58f8c6b8cec03fd0c31cc94de464a37725a0ed50 100644 (file)
@@ -1,5 +1,5 @@
 # src/interfaces/ecpg/preproc/nls.mk
 CATALOG_NAME     = ecpg
-GETTEXT_FILES    = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = mmerror:3 mmfatal:2
 GETTEXT_FLAGS    = mmerror:3:c-format mmfatal:2:c-format
index 9256b426c1d4911e3fda7caf772d408ffe70fc41..fe2cf1a8d17e0cbf41d9da8d2a70f5a637ba57ed 100644 (file)
@@ -1,5 +1,5 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME     = libpq
-GETTEXT_FILES    = fe-auth.c fe-auth-scram.c fe-connect.c fe-exec.c fe-gssapi-common.c fe-lobj.c fe-misc.c fe-protocol3.c fe-secure.c fe-secure-common.c fe-secure-gssapi.c fe-secure-openssl.c win32.c ../../port/thread.c
+GETTEXT_FILES    = $(wildcard *.c) ../../port/thread.c
 GETTEXT_TRIGGERS = libpq_gettext pqInternalNotice:2
 GETTEXT_FLAGS    = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format
index 8c41bfac7a920c3df25c69dda846480c58a6be7c..88cc006500494f835bc44488f65a26ae7e50714e 100644 (file)
@@ -1,5 +1,5 @@
 # src/pl/plperl/nls.mk
 CATALOG_NAME     = plperl
-GETTEXT_FILES    = plperl.c SPI.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)
index 2bd620a8ddd26ed47ad3b26c49176a70b5c7dcfb..1fa6e23a9162cefa71fe55ba05782eec4cebd307 100644 (file)
@@ -1,5 +1,5 @@
 # src/pl/plpgsql/src/nls.mk
 CATALOG_NAME     = plpgsql
-GETTEXT_FILES    = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)
index 4c68a0e571de1c40aa1978d2c61397d10ce9fb4f..1202870a3f69ae9f69e09216a0fadc350261ee93 100644 (file)
@@ -1,7 +1,6 @@
 # src/pl/plpython/nls.mk
 CATALOG_NAME     = plpython
-GETTEXT_FILES    = plpy_cursorobject.c plpy_elog.c plpy_exec.c plpy_main.c plpy_planobject.c plpy_plpymodule.c \
-                   plpy_procedure.c plpy_resultobject.c plpy_spi.c plpy_subxactobject.c plpy_typeio.c plpy_util.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS) \
     PLy_elog:2:c-format \
index 8366998df1530f75efa55075648a7b1f188d3af6..05388d3cdba0cb7dc342276c7892d0dc56c9a6b4 100644 (file)
@@ -1,5 +1,5 @@
 # src/pl/tcl/nls.mk
 CATALOG_NAME     = pltcl
-GETTEXT_FILES    = pltcl.c
+GETTEXT_FILES    = $(wildcard *.c)
 GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
 GETTEXT_FLAGS    = $(BACKEND_COMMON_GETTEXT_FLAGS)