database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-05 23:56:58 +03:00
Code

Revert "Use wildcards instead of manually-maintained file lists in */nls.mk."

Browse Source 
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.
This commit is contained in:
Tom Lane 2022-07-13 14:29:10 -04:00
parent 27d2693187
commit 54ba2f0623
25 changed files with 59 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/initdb/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/initdb/nls.mk # src/bin/initdb/nls.mk
CATALOG_NAME = initdb 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

3
src/bin/pg_amcheck/nls.mk
View File

@ -1,6 +1,7 @@
# src/bin/pg_amcheck/nls.mk # src/bin/pg_amcheck/nls.mk
CATALOG_NAME = pg_amcheck 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/cancel.c \
../../fe_utils/connect_utils.c \ ../../fe_utils/connect_utils.c \
../../fe_utils/option_utils.c \ ../../fe_utils/option_utils.c \

2
src/bin/pg_archivecleanup/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/pg_archivecleanup/nls.mk # src/bin/pg_archivecleanup/nls.mk
CATALOG_NAME = pg_archivecleanup 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

14
src/bin/pg_basebackup/nls.mk
View File

@ -1,6 +1,18 @@
# src/bin/pg_basebackup/nls.mk # src/bin/pg_basebackup/nls.mk
CATALOG_NAME = pg_basebackup 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/compression.c \
../../common/fe_memutils.c \ ../../common/fe_memutils.c \
../../common/file_utils.c \ ../../common/file_utils.c \

3
src/bin/pg_checksums/nls.mk
View File

@ -1,6 +1,7 @@
# src/bin/pg_checksums/nls.mk # src/bin/pg_checksums/nls.mk
CATALOG_NAME = pg_checksums 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 ../../fe_utils/option_utils.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

2
src/bin/pg_config/nls.mk
View File

@ -1,3 +1,3 @@
# src/bin/pg_config/nls.mk # src/bin/pg_config/nls.mk
CATALOG_NAME = pg_config 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

2
src/bin/pg_controldata/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/pg_controldata/nls.mk # src/bin/pg_controldata/nls.mk
CATALOG_NAME = pg_controldata 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

2
src/bin/pg_ctl/nls.mk
View File

@ -1,3 +1,3 @@
# src/bin/pg_ctl/nls.mk # src/bin/pg_ctl/nls.mk
CATALOG_NAME = pg_ctl 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

8
src/bin/pg_dump/nls.mk
View File

@ -1,6 +1,12 @@
# src/bin/pg_dump/nls.mk # src/bin/pg_dump/nls.mk
CATALOG_NAME = pg_dump 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/exec.c ../../common/fe_memutils.c \
../../common/wait_error.c \ ../../common/wait_error.c \
../../fe_utils/option_utils.c ../../fe_utils/option_utils.c

2
src/bin/pg_resetwal/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/pg_resetwal/nls.mk # src/bin/pg_resetwal/nls.mk
CATALOG_NAME = pg_resetwal 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

2
src/bin/pg_rewind/nls.mk
View File

@ -1,6 +1,6 @@
# src/bin/pg_rewind/nls.mk # src/bin/pg_rewind/nls.mk
CATALOG_NAME = pg_rewind 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \ GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
report_invalid_record:2:c-format report_invalid_record:2:c-format

2
src/bin/pg_test_fsync/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/pg_test_fsync/nls.mk # src/bin/pg_test_fsync/nls.mk
CATALOG_NAME = pg_test_fsync 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

2
src/bin/pg_test_timing/nls.mk
View File

@ -1,3 +1,3 @@
# src/bin/pg_test_timing/nls.mk # src/bin/pg_test_timing/nls.mk
CATALOG_NAME = pg_test_timing CATALOG_NAME = pg_test_timing
GETTEXT_FILES = $(wildcard *.c) GETTEXT_FILES = pg_test_timing.c

4
src/bin/pg_upgrade/nls.mk
View File

@ -1,6 +1,8 @@
# src/bin/pg_upgrade/nls.mk # src/bin/pg_upgrade/nls.mk
CATALOG_NAME = pg_upgrade 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_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
GETTEXT_FLAGS = \ GETTEXT_FLAGS = \
pg_fatal:1:c-format \ pg_fatal:1:c-format \

4
src/bin/pg_verifybackup/nls.mk
View File

@ -1,6 +1,8 @@
# src/bin/pg_verifybackup/nls.mk # src/bin/pg_verifybackup/nls.mk
CATALOG_NAME = pg_verifybackup 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/fe_memutils.c \
../../common/jsonapi.c ../../common/jsonapi.c
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \ GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \

2
src/bin/pg_waldump/nls.mk
View File

@ -1,5 +1,5 @@
# src/bin/pg_waldump/nls.mk # src/bin/pg_waldump/nls.mk
CATALOG_NAME = pg_waldump 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_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

6
src/bin/psql/nls.mk
View File

@ -1,6 +1,10 @@
# src/bin/psql/nls.mk # src/bin/psql/nls.mk
CATALOG_NAME = psql 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 \ ../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \ ../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
../../common/wait_error.c ../../port/thread.c ../../common/wait_error.c ../../port/thread.c

7
src/bin/scripts/nls.mk
View File

@ -1,6 +1,11 @@
# src/bin/scripts/nls.mk # src/bin/scripts/nls.mk
CATALOG_NAME = pgscripts 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/parallel_slot.c \
../../fe_utils/cancel.c ../../fe_utils/print.c \ ../../fe_utils/cancel.c ../../fe_utils/print.c \
../../fe_utils/connect_utils.c \ ../../fe_utils/connect_utils.c \

2
src/interfaces/ecpg/ecpglib/nls.mk
View File

@ -1,5 +1,5 @@
# src/interfaces/ecpg/ecpglib/nls.mk # src/interfaces/ecpg/ecpglib/nls.mk
CATALOG_NAME = ecpglib CATALOG_NAME = ecpglib
GETTEXT_FILES = $(wildcard *.c) GETTEXT_FILES = connect.c descriptor.c error.c execute.c misc.c
GETTEXT_TRIGGERS = ecpg_gettext GETTEXT_TRIGGERS = ecpg_gettext
GETTEXT_FLAGS = ecpg_gettext:1:pass-c-format GETTEXT_FLAGS = ecpg_gettext:1:pass-c-format

2
src/interfaces/ecpg/preproc/nls.mk
View File

@ -1,5 +1,5 @@
# src/interfaces/ecpg/preproc/nls.mk # src/interfaces/ecpg/preproc/nls.mk
CATALOG_NAME = ecpg 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_TRIGGERS = mmerror:3 mmfatal:2
GETTEXT_FLAGS = mmerror:3:c-format mmfatal:2:c-format GETTEXT_FLAGS = mmerror:3:c-format mmfatal:2:c-format

2
src/interfaces/libpq/nls.mk
View File

@ -1,5 +1,5 @@
# src/interfaces/libpq/nls.mk # src/interfaces/libpq/nls.mk
CATALOG_NAME = libpq 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_TRIGGERS = libpq_gettext pqInternalNotice:2
GETTEXT_FLAGS = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format GETTEXT_FLAGS = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format

2
src/pl/plperl/nls.mk
View File

@ -1,5 +1,5 @@
# src/pl/plperl/nls.mk # src/pl/plperl/nls.mk
CATALOG_NAME = plperl CATALOG_NAME = plperl
GETTEXT_FILES = $(wildcard *.c) GETTEXT_FILES = plperl.c SPI.c
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

2
src/pl/plpgsql/src/nls.mk
View File

@ -1,5 +1,5 @@
# src/pl/plpgsql/src/nls.mk # src/pl/plpgsql/src/nls.mk
CATALOG_NAME = plpgsql 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_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

3
src/pl/plpython/nls.mk
View File

@ -1,6 +1,7 @@
# src/pl/plpython/nls.mk # src/pl/plpython/nls.mk
CATALOG_NAME = plpython 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_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \ GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
PLy_elog:2:c-format \ PLy_elog:2:c-format \

2
src/pl/tcl/nls.mk
View File

@ -1,5 +1,5 @@
# src/pl/tcl/nls.mk # src/pl/tcl/nls.mk
CATALOG_NAME = pltcl CATALOG_NAME = pltcl
GETTEXT_FILES = $(wildcard *.c) GETTEXT_FILES = pltcl.c
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)