Skip to content

Commit 54ba2f0

Browse files
tglsfdctglsfdc
committed
Revert "Use wildcards instead of manually-maintained file lists in */nls.mk."
This reverts commit 617d691. 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.
1 parent 27d2693 commit 54ba2f0

File tree

25 files changed

+59
-25
lines changed

25 files changed

+59
-25
lines changed

‎src/bin/initdb/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/initdb/nls.mk
22
CATALOG_NAME = initdb
3-
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
3+
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
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_amcheck/nls.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# src/bin/pg_amcheck/nls.mk
22
CATALOG_NAME = pg_amcheck
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
pg_amcheck.c \
45
../../fe_utils/cancel.c \
56
../../fe_utils/connect_utils.c \
67
../../fe_utils/option_utils.c \

‎src/bin/pg_archivecleanup/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_archivecleanup/nls.mk
22
CATALOG_NAME = pg_archivecleanup
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_archivecleanup.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_basebackup/nls.mk

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
# src/bin/pg_basebackup/nls.mk
22
CATALOG_NAME = pg_basebackup
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
bbstreamer_file.c \
5+
bbstreamer_gzip.c \
6+
bbstreamer_inject.c \
7+
bbstreamer_lz4.c \
8+
bbstreamer_tar.c \
9+
bbstreamer_zstd.c \
10+
pg_basebackup.c \
11+
pg_receivewal.c \
12+
pg_recvlogical.c \
13+
receivelog.c \
14+
streamutil.c \
15+
walmethods.c \
416
../../common/compression.c \
517
../../common/fe_memutils.c \
618
../../common/file_utils.c \

‎src/bin/pg_checksums/nls.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# src/bin/pg_checksums/nls.mk
22
CATALOG_NAME = pg_checksums
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
pg_checksums.c \
45
../../fe_utils/option_utils.c
56
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
67
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_config/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# src/bin/pg_config/nls.mk
22
CATALOG_NAME = pg_config
3-
GETTEXT_FILES = $(wildcard *.c) ../../common/config_info.c ../../common/exec.c
3+
GETTEXT_FILES = pg_config.c ../../common/config_info.c ../../common/exec.c

‎src/bin/pg_controldata/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_controldata/nls.mk
22
CATALOG_NAME = pg_controldata
3-
GETTEXT_FILES = $(wildcard *.c) ../../common/controldata_utils.c
3+
GETTEXT_FILES = pg_controldata.c ../../common/controldata_utils.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_ctl/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# src/bin/pg_ctl/nls.mk
22
CATALOG_NAME = pg_ctl
3-
GETTEXT_FILES = $(wildcard *.c) ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
3+
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c

‎src/bin/pg_dump/nls.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# src/bin/pg_dump/nls.mk
22
CATALOG_NAME = pg_dump
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
pg_backup_archiver.c pg_backup_db.c pg_backup_custom.c \
5+
pg_backup_null.c pg_backup_tar.c \
6+
pg_backup_directory.c dumputils.c compress_io.c \
7+
pg_dump.c common.c pg_dump_sort.c \
8+
pg_restore.c pg_dumpall.c \
9+
parallel.c parallel.h pg_backup_utils.c pg_backup_utils.h \
410
../../common/exec.c ../../common/fe_memutils.c \
511
../../common/wait_error.c \
612
../../fe_utils/option_utils.c

‎src/bin/pg_resetwal/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_resetwal/nls.mk
22
CATALOG_NAME = pg_resetwal
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) ../../common/restricted_token.c
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_rewind/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# src/bin/pg_rewind/nls.mk
22
CATALOG_NAME = pg_rewind
3-
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
3+
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
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
66
report_invalid_record:2:c-format

‎src/bin/pg_test_fsync/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_test_fsync/nls.mk
22
CATALOG_NAME = pg_test_fsync
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_test_fsync.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) die
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_test_timing/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# src/bin/pg_test_timing/nls.mk
22
CATALOG_NAME = pg_test_timing
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = pg_test_timing.c

‎src/bin/pg_upgrade/nls.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# src/bin/pg_upgrade/nls.mk
22
CATALOG_NAME = pg_upgrade
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = check.c controldata.c dump.c exec.c file.c function.c \
4+
info.c option.c parallel.c pg_upgrade.c relfilenode.c \
5+
server.c tablespace.c util.c version.c
46
GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
57
GETTEXT_FLAGS = \
68
pg_fatal:1:c-format \

‎src/bin/pg_verifybackup/nls.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# src/bin/pg_verifybackup/nls.mk
22
CATALOG_NAME = pg_verifybackup
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
parse_manifest.c \
5+
pg_verifybackup.c \
46
../../common/fe_memutils.c \
57
../../common/jsonapi.c
68
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \

‎src/bin/pg_waldump/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/bin/pg_waldump/nls.mk
22
CATALOG_NAME = pg_waldump
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c)
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c
44
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/psql/nls.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# src/bin/psql/nls.mk
22
CATALOG_NAME = psql
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
command.c common.c copy.c crosstabview.c help.c input.c large_obj.c \
5+
mainloop.c psqlscanslash.c startup.c \
6+
describe.c sql_help.h sql_help.c \
7+
tab-complete.c variables.c \
48
../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
59
../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
610
../../common/wait_error.c ../../port/thread.c

‎src/bin/scripts/nls.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
# src/bin/scripts/nls.mk
22
CATALOG_NAME = pgscripts
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) $(wildcard *.c) \
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
createdb.c createuser.c \
5+
dropdb.c dropuser.c \
6+
clusterdb.c vacuumdb.c reindexdb.c \
7+
pg_isready.c \
8+
common.c \
49
../../fe_utils/parallel_slot.c \
510
../../fe_utils/cancel.c ../../fe_utils/print.c \
611
../../fe_utils/connect_utils.c \

‎src/interfaces/ecpg/ecpglib/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/interfaces/ecpg/ecpglib/nls.mk
22
CATALOG_NAME = ecpglib
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = connect.c descriptor.c error.c execute.c misc.c
44
GETTEXT_TRIGGERS = ecpg_gettext
55
GETTEXT_FLAGS = ecpg_gettext:1:pass-c-format

‎src/interfaces/ecpg/preproc/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/interfaces/ecpg/preproc/nls.mk
22
CATALOG_NAME = ecpg
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = descriptor.c ecpg.c pgc.c preproc.c type.c variable.c
44
GETTEXT_TRIGGERS = mmerror:3 mmfatal:2
55
GETTEXT_FLAGS = mmerror:3:c-format mmfatal:2:c-format

‎src/interfaces/libpq/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/interfaces/libpq/nls.mk
22
CATALOG_NAME = libpq
3-
GETTEXT_FILES = $(wildcard *.c) ../../port/thread.c
3+
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
44
GETTEXT_TRIGGERS = libpq_gettext pqInternalNotice:2
55
GETTEXT_FLAGS = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format

‎src/pl/plperl/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/pl/plperl/nls.mk
22
CATALOG_NAME = plperl
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = plperl.c SPI.c
44
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

‎src/pl/plpgsql/src/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/pl/plpgsql/src/nls.mk
22
CATALOG_NAME = plpgsql
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
44
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
55
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

‎src/pl/plpython/nls.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# src/pl/plpython/nls.mk
22
CATALOG_NAME = plpython
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = plpy_cursorobject.c plpy_elog.c plpy_exec.c plpy_main.c plpy_planobject.c plpy_plpymodule.c \
4+
plpy_procedure.c plpy_resultobject.c plpy_spi.c plpy_subxactobject.c plpy_typeio.c plpy_util.c
45
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
56
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
67
PLy_elog:2:c-format \

‎src/pl/tcl/nls.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# src/pl/tcl/nls.mk
22
CATALOG_NAME = pltcl
3-
GETTEXT_FILES = $(wildcard *.c)
3+
GETTEXT_FILES = pltcl.c
44
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS)
55
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy