From 54ba2f06236a7588433a5825134759ed798eccbf Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 13 Jul 2022 14:29:10 -0400 Subject: [PATCH] Revert "Use wildcards instead of manually-maintained file lists in */nls.mk." This reverts commit 617d69141220f277170927e03a19d2f1b77aed77. While I still think the basic idea is attractive, we need to sort out what happens with built .c files, and there also seem to be VPATH issues. --- src/bin/initdb/nls.mk | 2 +- src/bin/pg_amcheck/nls.mk | 3 ++- src/bin/pg_archivecleanup/nls.mk | 2 +- src/bin/pg_basebackup/nls.mk | 14 +++++++++++++- src/bin/pg_checksums/nls.mk | 3 ++- src/bin/pg_config/nls.mk | 2 +- src/bin/pg_controldata/nls.mk | 2 +- src/bin/pg_ctl/nls.mk | 2 +- src/bin/pg_dump/nls.mk | 8 +++++++- src/bin/pg_resetwal/nls.mk | 2 +- src/bin/pg_rewind/nls.mk | 2 +- src/bin/pg_test_fsync/nls.mk | 2 +- src/bin/pg_test_timing/nls.mk | 2 +- src/bin/pg_upgrade/nls.mk | 4 +++- src/bin/pg_verifybackup/nls.mk | 4 +++- src/bin/pg_waldump/nls.mk | 2 +- src/bin/psql/nls.mk | 6 +++++- src/bin/scripts/nls.mk | 7 ++++++- src/interfaces/ecpg/ecpglib/nls.mk | 2 +- src/interfaces/ecpg/preproc/nls.mk | 2 +- src/interfaces/libpq/nls.mk | 2 +- src/pl/plperl/nls.mk | 2 +- src/pl/plpgsql/src/nls.mk | 2 +- src/pl/plpython/nls.mk | 3 ++- src/pl/tcl/nls.mk | 2 +- 25 files changed, 59 insertions(+), 25 deletions(-) diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk index d7ee359cd1..19c9136849 100644 --- a/src/bin/initdb/nls.mk +++ b/src/bin/initdb/nls.mk @@ -1,5 +1,5 @@ # src/bin/initdb/nls.mk CATALOG_NAME = initdb -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_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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_amcheck/nls.mk b/src/bin/pg_amcheck/nls.mk index e6813d4d97..5e6171952c 100644 --- a/src/bin/pg_amcheck/nls.mk +++ b/src/bin/pg_amcheck/nls.mk @@ -1,6 +1,7 @@ # src/bin/pg_amcheck/nls.mk CATALOG_NAME = pg_amcheck -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ + pg_amcheck.c \ ../../fe_utils/cancel.c \ ../../fe_utils/connect_utils.c \ ../../fe_utils/option_utils.c \ diff --git a/src/bin/pg_archivecleanup/nls.mk b/src/bin/pg_archivecleanup/nls.mk index e04a0d54e5..801cf1c51e 100644 --- a/src/bin/pg_archivecleanup/nls.mk +++ b/src/bin/pg_archivecleanup/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_archivecleanup/nls.mk CATALOG_NAME = pg_archivecleanup -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_basebackup/nls.mk b/src/bin/pg_basebackup/nls.mk index 14a39d906f..8d28e249de 100644 --- a/src/bin/pg_basebackup/nls.mk +++ b/src/bin/pg_basebackup/nls.mk @@ -1,6 +1,18 @@ # src/bin/pg_basebackup/nls.mk CATALOG_NAME = pg_basebackup -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +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 \ ../../common/compression.c \ ../../common/fe_memutils.c \ ../../common/file_utils.c \ diff --git a/src/bin/pg_checksums/nls.mk b/src/bin/pg_checksums/nls.mk index b6ce911add..f7cd2a5ee9 100644 --- a/src/bin/pg_checksums/nls.mk +++ b/src/bin/pg_checksums/nls.mk @@ -1,6 +1,7 @@ # src/bin/pg_checksums/nls.mk CATALOG_NAME = pg_checksums -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ + pg_checksums.c \ ../../fe_utils/option_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_config/nls.mk b/src/bin/pg_config/nls.mk index 1e8d00d355..d86c28c404 100644 --- a/src/bin/pg_config/nls.mk +++ b/src/bin/pg_config/nls.mk @@ -1,3 +1,3 @@ # src/bin/pg_config/nls.mk CATALOG_NAME = pg_config -GETTEXT_FILES = $(wildcard *.c) ../../common/config_info.c ../../common/exec.c +GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c diff --git a/src/bin/pg_controldata/nls.mk b/src/bin/pg_controldata/nls.mk index e2927d5502..ab34205b96 100644 --- a/src/bin/pg_controldata/nls.mk +++ b/src/bin/pg_controldata/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_controldata/nls.mk CATALOG_NAME = pg_controldata -GETTEXT_FILES = $(wildcard *.c) ../../common/controldata_utils.c +GETTEXT_FILES = pg_controldata.c ../../common/controldata_utils.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk index d0e739efa7..84e7fb4e56 100644 --- a/src/bin/pg_ctl/nls.mk +++ b/src/bin/pg_ctl/nls.mk @@ -1,3 +1,3 @@ # src/bin/pg_ctl/nls.mk CATALOG_NAME = pg_ctl -GETTEXT_FILES = $(wildcard *.c) ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c +GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk index 1ad8a860ee..3054f93fad 100644 --- a/src/bin/pg_dump/nls.mk +++ b/src/bin/pg_dump/nls.mk @@ -1,6 +1,12 @@ # src/bin/pg_dump/nls.mk CATALOG_NAME = pg_dump -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +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 \ ../../common/exec.c ../../common/fe_memutils.c \ ../../common/wait_error.c \ ../../fe_utils/option_utils.c diff --git a/src/bin/pg_resetwal/nls.mk b/src/bin/pg_resetwal/nls.mk index 2ad24ce7b9..bc25482f2c 100644 --- a/src/bin/pg_resetwal/nls.mk +++ b/src/bin/pg_resetwal/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_resetwal/nls.mk CATALOG_NAME = pg_resetwal -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) ../../common/restricted_token.c +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_rewind/nls.mk b/src/bin/pg_rewind/nls.mk index 5ed09c70ba..0618cb8c2c 100644 --- a/src/bin/pg_rewind/nls.mk +++ b/src/bin/pg_rewind/nls.mk @@ -1,6 +1,6 @@ # src/bin/pg_rewind/nls.mk CATALOG_NAME = pg_rewind -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_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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2 GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \ report_invalid_record:2:c-format diff --git a/src/bin/pg_test_fsync/nls.mk b/src/bin/pg_test_fsync/nls.mk index 3273336090..a50782036c 100644 --- a/src/bin/pg_test_fsync/nls.mk +++ b/src/bin/pg_test_fsync/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_test_fsync/nls.mk CATALOG_NAME = pg_test_fsync -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/pg_test_timing/nls.mk b/src/bin/pg_test_timing/nls.mk index 198350a6b7..331931c591 100644 --- a/src/bin/pg_test_timing/nls.mk +++ b/src/bin/pg_test_timing/nls.mk @@ -1,3 +1,3 @@ # src/bin/pg_test_timing/nls.mk CATALOG_NAME = pg_test_timing -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = pg_test_timing.c diff --git a/src/bin/pg_upgrade/nls.mk b/src/bin/pg_upgrade/nls.mk index 1262c1714d..8a4ebbcbe9 100644 --- a/src/bin/pg_upgrade/nls.mk +++ b/src/bin/pg_upgrade/nls.mk @@ -1,6 +1,8 @@ # src/bin/pg_upgrade/nls.mk CATALOG_NAME = pg_upgrade -GETTEXT_FILES = $(wildcard *.c) +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_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2 GETTEXT_FLAGS = \ pg_fatal:1:c-format \ diff --git a/src/bin/pg_verifybackup/nls.mk b/src/bin/pg_verifybackup/nls.mk index 72d89c009d..eba73a2c05 100644 --- a/src/bin/pg_verifybackup/nls.mk +++ b/src/bin/pg_verifybackup/nls.mk @@ -1,6 +1,8 @@ # src/bin/pg_verifybackup/nls.mk CATALOG_NAME = pg_verifybackup -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \ + parse_manifest.c \ + pg_verifybackup.c \ ../../common/fe_memutils.c \ ../../common/jsonapi.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ diff --git a/src/bin/pg_waldump/nls.mk b/src/bin/pg_waldump/nls.mk index 6857da9bca..a9eeb6712b 100644 --- a/src/bin/pg_waldump/nls.mk +++ b/src/bin/pg_waldump/nls.mk @@ -1,5 +1,5 @@ # src/bin/pg_waldump/nls.mk CATALOG_NAME = pg_waldump -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) +GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk index 37c1ced20a..dad5816b9c 100644 --- a/src/bin/psql/nls.mk +++ b/src/bin/psql/nls.mk @@ -1,6 +1,10 @@ # src/bin/psql/nls.mk CATALOG_NAME = psql -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +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 \ ../../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 diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk index 52a05eb900..f4638a06f0 100644 --- a/src/bin/scripts/nls.mk +++ b/src/bin/scripts/nls.mk @@ -1,6 +1,11 @@ # src/bin/scripts/nls.mk CATALOG_NAME = pgscripts -GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \ +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 \ ../../fe_utils/parallel_slot.c \ ../../fe_utils/cancel.c ../../fe_utils/print.c \ ../../fe_utils/connect_utils.c \ diff --git a/src/interfaces/ecpg/ecpglib/nls.mk b/src/interfaces/ecpg/ecpglib/nls.mk index 66d0b62cf4..77eecc98f3 100644 --- a/src/interfaces/ecpg/ecpglib/nls.mk +++ b/src/interfaces/ecpg/ecpglib/nls.mk @@ -1,5 +1,5 @@ # src/interfaces/ecpg/ecpglib/nls.mk CATALOG_NAME = ecpglib -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = connect.c descriptor.c error.c execute.c misc.c GETTEXT_TRIGGERS = ecpg_gettext GETTEXT_FLAGS = ecpg_gettext:1:pass-c-format diff --git a/src/interfaces/ecpg/preproc/nls.mk b/src/interfaces/ecpg/preproc/nls.mk index 58f8c6b8ce..55ea19a44e 100644 --- a/src/interfaces/ecpg/preproc/nls.mk +++ b/src/interfaces/ecpg/preproc/nls.mk @@ -1,5 +1,5 @@ # src/interfaces/ecpg/preproc/nls.mk CATALOG_NAME = ecpg -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c GETTEXT_TRIGGERS = mmerror:3 mmfatal:2 GETTEXT_FLAGS = mmerror:3:c-format mmfatal:2:c-format diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk index fe2cf1a8d1..9256b426c1 100644 --- a/src/interfaces/libpq/nls.mk +++ b/src/interfaces/libpq/nls.mk @@ -1,5 +1,5 @@ # src/interfaces/libpq/nls.mk CATALOG_NAME = libpq -GETTEXT_FILES = $(wildcard *.c) ../../port/thread.c +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_TRIGGERS = libpq_gettext pqInternalNotice:2 GETTEXT_FLAGS = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format diff --git a/src/pl/plperl/nls.mk b/src/pl/plperl/nls.mk index 88cc006500..8c41bfac7a 100644 --- a/src/pl/plperl/nls.mk +++ b/src/pl/plperl/nls.mk @@ -1,5 +1,5 @@ # src/pl/plperl/nls.mk CATALOG_NAME = plperl -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = plperl.c SPI.c GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) diff --git a/src/pl/plpgsql/src/nls.mk b/src/pl/plpgsql/src/nls.mk index 1fa6e23a91..2bd620a8dd 100644 --- a/src/pl/plpgsql/src/nls.mk +++ b/src/pl/plpgsql/src/nls.mk @@ -1,5 +1,5 @@ # src/pl/plpgsql/src/nls.mk CATALOG_NAME = plpgsql -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) diff --git a/src/pl/plpython/nls.mk b/src/pl/plpython/nls.mk index 1202870a3f..4c68a0e571 100644 --- a/src/pl/plpython/nls.mk +++ b/src/pl/plpython/nls.mk @@ -1,6 +1,7 @@ # src/pl/plpython/nls.mk CATALOG_NAME = plpython -GETTEXT_FILES = $(wildcard *.c) +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_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 \ diff --git a/src/pl/tcl/nls.mk b/src/pl/tcl/nls.mk index 05388d3cdb..8366998df1 100644 --- a/src/pl/tcl/nls.mk +++ b/src/pl/tcl/nls.mk @@ -1,5 +1,5 @@ # src/pl/tcl/nls.mk CATALOG_NAME = pltcl -GETTEXT_FILES = $(wildcard *.c) +GETTEXT_FILES = pltcl.c GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)