Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 9a0ddc3

Browse files
committed
Format list of catalog files in makefile vertically
This makes it easier to compare the lists visually with the corresponding meson lists. In passing, copy over some relevant comments from the makefiles to meson.build. Reviewed-by: Andres Freund <andres@anarazel.de> Reviewed-by: Alvaro Herrera <alvherre@alvh.no-ip.org> Discussion: https://www.postgresql.org/message-id/flat/a306be82-ee71-4554-d499-49a45a654396%40eisentraut.org
1 parent d6d1430 commit 9a0ddc3

File tree

2 files changed

+93
-25
lines changed

2 files changed

+93
-25
lines changed

src/backend/catalog/Makefile

Lines changed: 88 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -55,38 +55,101 @@ include $(top_srcdir)/src/backend/common.mk
5555
# must appear first, and pg_statistic before pg_statistic_ext_data, and
5656
# there are reputedly other, undocumented ordering dependencies.
5757
CATALOG_HEADERS := \
58-
pg_proc.h pg_type.h pg_attribute.h pg_class.h \
59-
pg_attrdef.h pg_constraint.h pg_inherits.h pg_index.h pg_operator.h \
60-
pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \
61-
pg_language.h pg_largeobject_metadata.h pg_largeobject.h pg_aggregate.h \
62-
pg_statistic.h pg_statistic_ext.h pg_statistic_ext_data.h \
63-
pg_rewrite.h pg_trigger.h pg_event_trigger.h pg_description.h \
64-
pg_cast.h pg_enum.h pg_namespace.h pg_conversion.h pg_depend.h \
65-
pg_database.h pg_db_role_setting.h pg_tablespace.h \
66-
pg_authid.h pg_auth_members.h pg_shdepend.h pg_shdescription.h \
67-
pg_ts_config.h pg_ts_config_map.h pg_ts_dict.h \
68-
pg_ts_parser.h pg_ts_template.h pg_extension.h \
69-
pg_foreign_data_wrapper.h pg_foreign_server.h pg_user_mapping.h \
70-
pg_foreign_table.h pg_policy.h pg_replication_origin.h \
71-
pg_default_acl.h pg_init_privs.h pg_seclabel.h pg_shseclabel.h \
72-
pg_collation.h pg_parameter_acl.h pg_partitioned_table.h \
73-
pg_range.h pg_transform.h \
74-
pg_sequence.h pg_publication.h pg_publication_namespace.h \
75-
pg_publication_rel.h pg_subscription.h pg_subscription_rel.h
58+
pg_proc.h \
59+
pg_type.h \
60+
pg_attribute.h \
61+
pg_class.h \
62+
pg_attrdef.h \
63+
pg_constraint.h \
64+
pg_inherits.h \
65+
pg_index.h \
66+
pg_operator.h \
67+
pg_opfamily.h \
68+
pg_opclass.h \
69+
pg_am.h \
70+
pg_amop.h \
71+
pg_amproc.h \
72+
pg_language.h \
73+
pg_largeobject_metadata.h \
74+
pg_largeobject.h \
75+
pg_aggregate.h \
76+
pg_statistic.h \
77+
pg_statistic_ext.h \
78+
pg_statistic_ext_data.h \
79+
pg_rewrite.h \
80+
pg_trigger.h \
81+
pg_event_trigger.h \
82+
pg_description.h \
83+
pg_cast.h \
84+
pg_enum.h \
85+
pg_namespace.h \
86+
pg_conversion.h \
87+
pg_depend.h \
88+
pg_database.h \
89+
pg_db_role_setting.h \
90+
pg_tablespace.h \
91+
pg_authid.h \
92+
pg_auth_members.h \
93+
pg_shdepend.h \
94+
pg_shdescription.h \
95+
pg_ts_config.h \
96+
pg_ts_config_map.h \
97+
pg_ts_dict.h \
98+
pg_ts_parser.h \
99+
pg_ts_template.h \
100+
pg_extension.h \
101+
pg_foreign_data_wrapper.h \
102+
pg_foreign_server.h \
103+
pg_user_mapping.h \
104+
pg_foreign_table.h \
105+
pg_policy.h \
106+
pg_replication_origin.h \
107+
pg_default_acl.h \
108+
pg_init_privs.h \
109+
pg_seclabel.h \
110+
pg_shseclabel.h \
111+
pg_collation.h \
112+
pg_parameter_acl.h \
113+
pg_partitioned_table.h \
114+
pg_range.h \
115+
pg_transform.h \
116+
pg_sequence.h \
117+
pg_publication.h \
118+
pg_publication_namespace.h \
119+
pg_publication_rel.h \
120+
pg_subscription.h \
121+
pg_subscription_rel.h
76122

77123
GENERATED_HEADERS := $(CATALOG_HEADERS:%.h=%_d.h) schemapg.h system_fk_info.h
78124

79125
POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/, $(CATALOG_HEADERS))
80126

81127
# The .dat files we need can just be listed alphabetically.
82128
POSTGRES_BKI_DATA = $(addprefix $(top_srcdir)/src/include/catalog/,\
83-
pg_aggregate.dat pg_am.dat pg_amop.dat pg_amproc.dat pg_authid.dat \
84-
pg_cast.dat pg_class.dat pg_collation.dat pg_conversion.dat \
85-
pg_database.dat pg_language.dat \
86-
pg_namespace.dat pg_opclass.dat pg_operator.dat pg_opfamily.dat \
87-
pg_proc.dat pg_range.dat pg_tablespace.dat \
88-
pg_ts_config.dat pg_ts_config_map.dat pg_ts_dict.dat pg_ts_parser.dat \
89-
pg_ts_template.dat pg_type.dat \
129+
pg_aggregate.dat \
130+
pg_am.dat \
131+
pg_amop.dat \
132+
pg_amproc.dat \
133+
pg_authid.dat \
134+
pg_cast.dat \
135+
pg_class.dat \
136+
pg_collation.dat \
137+
pg_conversion.dat \
138+
pg_database.dat \
139+
pg_language.dat \
140+
pg_namespace.dat \
141+
pg_opclass.dat \
142+
pg_operator.dat \
143+
pg_opfamily.dat \
144+
pg_proc.dat \
145+
pg_range.dat \
146+
pg_tablespace.dat \
147+
pg_ts_config.dat \
148+
pg_ts_config_map.dat \
149+
pg_ts_dict.dat \
150+
pg_ts_parser.dat \
151+
pg_ts_template.dat \
152+
pg_type.dat \
90153
)
91154

92155
all: distprep generated-header-symlinks

src/include/catalog/meson.build

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Copyright (c) 2022-2023, PostgreSQL Global Development Group
22

3+
# Note: the order of this list determines the order in which the catalog
4+
# header files are assembled into postgres.bki. BKI_BOOTSTRAP catalogs
5+
# must appear first, and pg_statistic before pg_statistic_ext_data, and
6+
# there are reputedly other, undocumented ordering dependencies.
37
catalog_headers = [
48
'pg_proc.h',
59
'pg_type.h',
@@ -67,6 +71,7 @@ catalog_headers = [
6771
'pg_subscription_rel.h',
6872
]
6973

74+
# The .dat files we need can just be listed alphabetically.
7075
bki_data = [
7176
'pg_aggregate.dat',
7277
'pg_am.dat',

0 commit comments

Comments
 (0)