Skip to content

Commit 2a71ad6

Browse files
peterepetere
committed
Break up long GETTEXT_FILES lists
One file per line seems best. We already did this in some cases. This adopts the same format everywhere (except in some cases where the list reasonably fits on one line).
1 parent 822e8e2 commit 2a71ad6

File tree

12 files changed

+138
-31
lines changed

12 files changed

+138
-31
lines changed

‎src/bin/initdb/nls.mk

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# src/bin/initdb/nls.mk
22
CATALOG_NAME = initdb
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
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
findtimezone.c \
5+
initdb.c \
6+
../../common/exec.c \
7+
../../common/fe_memutils.c \
8+
../../common/file_utils.c \
9+
../../common/pgfnames.c \
10+
../../common/restricted_token.c \
11+
../../common/rmtree.c \
12+
../../common/username.c \
13+
../../common/wait_error.c \
14+
../../port/dirmod.c
415
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt
516
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_ctl/nls.mk

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
# src/bin/pg_ctl/nls.mk
22
CATALOG_NAME = pg_ctl
3-
GETTEXT_FILES = pg_ctl.c ../../common/exec.c ../../common/fe_memutils.c ../../common/wait_error.c ../../port/path.c
3+
GETTEXT_FILES = pg_ctl.c \
4+
../../common/exec.c \
5+
../../common/fe_memutils.c \
6+
../../common/wait_error.c \
7+
../../port/path.c

‎src/bin/pg_dump/nls.mk

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
11
# src/bin/pg_dump/nls.mk
22
CATALOG_NAME = pg_dump
33
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 \
10-
../../common/exec.c ../../common/fe_memutils.c \
4+
pg_backup_archiver.c \
5+
pg_backup_db.c \
6+
pg_backup_custom.c \
7+
pg_backup_null.c \
8+
pg_backup_tar.c \
9+
pg_backup_directory.c \
10+
dumputils.c \
11+
compress_io.c \
12+
pg_dump.c \
13+
common.c \
14+
pg_dump_sort.c \
15+
pg_restore.c \
16+
pg_dumpall.c \
17+
parallel.c \
18+
parallel.h \
19+
pg_backup_utils.c \
20+
pg_backup_utils.h \
21+
../../common/exec.c \
22+
../../common/fe_memutils.c \
1123
../../common/wait_error.c \
1224
../../fe_utils/option_utils.c
1325
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \

‎src/bin/pg_resetwal/nls.mk

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# src/bin/pg_resetwal/nls.mk
22
CATALOG_NAME = pg_resetwal
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_resetwal.c ../../common/restricted_token.c
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
pg_resetwal.c \
5+
../../common/restricted_token.c
46
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS)
57
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/bin/pg_rewind/nls.mk

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# src/bin/pg_rewind/nls.mk
22
CATALOG_NAME = pg_rewind
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
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
datapagemap.c \
5+
file_ops.c \
6+
filemap.c \
7+
libpq_source.c \
8+
local_source.c \
9+
parsexlog.c \
10+
pg_rewind.c \
11+
timeline.c \
12+
xlogreader.c \
13+
../../common/fe_memutils.c \
14+
../../common/restricted_token.c \
15+
../../fe_utils/archive.c \
16+
../../fe_utils/recovery_gen.c
417
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
518
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
619
report_invalid_record:2:c-format

‎src/bin/pg_upgrade/nls.mk

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
# src/bin/pg_upgrade/nls.mk
22
CATALOG_NAME = pg_upgrade
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 relfilenumber.c \
5-
server.c tablespace.c util.c version.c
3+
GETTEXT_FILES = check.c \
4+
controldata.c \
5+
dump.c \
6+
exec.c \
7+
file.c \
8+
function.c \
9+
info.c \
10+
option.c \
11+
parallel.c \
12+
pg_upgrade.c \
13+
relfilenumber.c \
14+
server.c \
15+
tablespace.c \
16+
util.c \
17+
version.c
618
GETTEXT_TRIGGERS = pg_fatal pg_log:2 prep_status prep_status_progress report_status:2
719
GETTEXT_FLAGS = \
820
pg_fatal:1:c-format \

‎src/bin/pg_waldump/nls.mk

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# src/bin/pg_waldump/nls.mk
22
CATALOG_NAME = pg_waldump
3-
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) pg_waldump.c xlogreader.c xlogstats.c
3+
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4+
pg_waldump.c \
5+
xlogreader.c \
6+
xlogstats.c
47
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) report_invalid_record:2
58
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \
69
report_invalid_record:2:c-format

‎src/bin/psql/nls.mk

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,29 @@
11
# src/bin/psql/nls.mk
22
CATALOG_NAME = psql
33
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 \
8-
../../fe_utils/cancel.c ../../fe_utils/print.c ../../fe_utils/psqlscan.c \
9-
../../common/exec.c ../../common/fe_memutils.c ../../common/username.c \
10-
../../common/wait_error.c ../../port/thread.c
4+
command.c \
5+
common.c \
6+
copy.c \
7+
crosstabview.c \
8+
help.c \
9+
input.c \
10+
large_obj.c \
11+
mainloop.c \
12+
psqlscanslash.c \
13+
startup.c \
14+
describe.c \
15+
sql_help.h \
16+
sql_help.c \
17+
tab-complete.c \
18+
variables.c \
19+
../../fe_utils/cancel.c \
20+
../../fe_utils/print.c \
21+
../../fe_utils/psqlscan.c \
22+
../../common/exec.c \
23+
../../common/fe_memutils.c \
24+
../../common/username.c \
25+
../../common/wait_error.c \
26+
../../port/thread.c
1127
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) \
1228
HELP0 HELPN N_ simple_prompt simple_prompt_extended
1329
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS) \

‎src/bin/scripts/nls.mk

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,22 @@
11
# src/bin/scripts/nls.mk
22
CATALOG_NAME = pgscripts
33
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
4-
createdb.c createuser.c \
5-
dropdb.c dropuser.c \
6-
clusterdb.c vacuumdb.c reindexdb.c \
4+
createdb.c \
5+
createuser.c \
6+
dropdb.c \
7+
dropuser.c \
8+
clusterdb.c \
9+
vacuumdb.c \
10+
reindexdb.c \
711
pg_isready.c \
812
common.c \
913
../../fe_utils/parallel_slot.c \
10-
../../fe_utils/cancel.c ../../fe_utils/print.c \
14+
../../fe_utils/cancel.c \
15+
../../fe_utils/print.c \
1116
../../fe_utils/connect_utils.c \
1217
../../fe_utils/option_utils.c \
1318
../../fe_utils/query_utils.c \
14-
../../common/fe_memutils.c ../../common/username.c
19+
../../common/fe_memutils.c \
20+
../../common/username.c
1521
GETTEXT_TRIGGERS = $(FRONTEND_COMMON_GETTEXT_TRIGGERS) simple_prompt yesno_prompt
1622
GETTEXT_FLAGS = $(FRONTEND_COMMON_GETTEXT_FLAGS)

‎src/interfaces/libpq/nls.mk

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
# src/interfaces/libpq/nls.mk
22
CATALOG_NAME = libpq
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
3+
GETTEXT_FILES = fe-auth.c \
4+
fe-auth-scram.c \
5+
fe-connect.c \
6+
fe-exec.c \
7+
fe-gssapi-common.c \
8+
fe-lobj.c \
9+
fe-misc.c \
10+
fe-protocol3.c \
11+
fe-secure.c \
12+
fe-secure-common.c \
13+
fe-secure-gssapi.c \
14+
fe-secure-openssl.c \
15+
win32.c \
16+
../../port/thread.c
417
GETTEXT_TRIGGERS = libpq_append_conn_error:2 \
518
libpq_append_error:2 \
619
libpq_gettext pqInternalNotice:2

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# src/pl/plpgsql/src/nls.mk
22
CATALOG_NAME = plpgsql
3-
GETTEXT_FILES = pl_comp.c pl_exec.c pl_gram.c pl_funcs.c pl_handler.c pl_scanner.c
3+
GETTEXT_FILES = pl_comp.c \
4+
pl_exec.c \
5+
pl_gram.c \
6+
pl_funcs.c \
7+
pl_handler.c \
8+
pl_scanner.c
49
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) yyerror plpgsql_yyerror
510
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS)

‎src/pl/plpython/nls.mk

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
# src/pl/plpython/nls.mk
22
CATALOG_NAME = plpython
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
3+
GETTEXT_FILES = plpy_cursorobject.c \
4+
plpy_elog.c \
5+
plpy_exec.c \
6+
plpy_main.c \
7+
plpy_planobject.c \
8+
plpy_plpymodule.c \
9+
plpy_procedure.c \
10+
plpy_resultobject.c \
11+
plpy_spi.c \
12+
plpy_subxactobject.c \
13+
plpy_typeio.c \
14+
plpy_util.c
515
GETTEXT_TRIGGERS = $(BACKEND_COMMON_GETTEXT_TRIGGERS) PLy_elog:2 PLy_exception_set:2 PLy_exception_set_plural:2,3
616
GETTEXT_FLAGS = $(BACKEND_COMMON_GETTEXT_FLAGS) \
717
PLy_elog:2:c-format \

0 commit comments

Comments
 (0)