Skip to content

Commit 902ab2f

Browse files
anarazelanarazel
committed
meson: Add windows resource files
The generated resource files aren't exactly the same ones as the old buildsystems generate. Previously "InternalName" and "OriginalFileName" were mostly wrong / not set (despite being required), but that was hard to fix in at least the make build. Additionally, the meson build falls back to a "auto-generated" description when not set, and doesn't set it in a few cases - unlikely that anybody looks at these descriptions in detail. Author: Andres Freund <andres@anarazel.de> Author: Nazir Bilal Yavuz <byavuz81@gmail.com> Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
1 parent a1261cd commit 902ab2f

File tree

118 files changed

+1292
-131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

118 files changed

+1292
-131
lines changed

‎contrib/adminpack/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
adminpack_sources = files(
2+
'adminpack.c',
3+
)
4+
5+
if host_system == 'windows'
6+
adminpack_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'adminpack',
8+
'--FILEDESC', 'adminpack - support functions for pgAdmin',])
9+
endif
10+
111
adminpack = shared_module('adminpack',
2-
['adminpack.c'],
12+
adminpack_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += adminpack

‎contrib/amcheck/meson.build

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
amcheck = shared_module('amcheck', [
2-
'verify_heapam.c',
3-
'verify_nbtree.c',
4-
],
1+
amcheck_sources = files(
2+
'verify_heapam.c',
3+
'verify_nbtree.c',
4+
)
5+
6+
if host_system == 'windows'
7+
amcheck_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
8+
'--NAME', 'amcheck',
9+
'--FILEDESC', 'amcheck - function for verifying relation integrity',])
10+
endif
11+
12+
amcheck = shared_module('amcheck',
13+
amcheck_sources,
514
kwargs: contrib_mod_args,
615
)
716
contrib_targets += amcheck

‎contrib/auth_delay/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
auth_delay_sources = files(
2+
'auth_delay.c',
3+
)
4+
5+
if host_system == 'windows'
6+
auth_delay_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'auth_delay',
8+
'--FILEDESC', 'auth_delay - delay authentication failure reports',])
9+
endif
10+
111
autoinc = shared_module('auth_delay',
2-
['auth_delay.c'],
12+
auth_delay_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += autoinc

‎contrib/auto_explain/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
auto_explain_sources = files(
2+
'auto_explain.c',
3+
)
4+
5+
if host_system == 'windows'
6+
auto_explain_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'auto_explain',
8+
'--FILEDESC', 'auto_explain - logging facility for execution plans',])
9+
endif
10+
111
auto_explain = shared_module('auto_explain',
2-
files('auto_explain.c'),
12+
auto_explain_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += auto_explain

‎contrib/basebackup_to_shell/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ basebackup_to_shell_sources = files(
22
'basebackup_to_shell.c',
33
)
44

5+
if host_system == 'windows'
6+
basebackup_to_shell_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'basebackup_to_shell',
8+
'--FILEDESC', 'basebackup_to_shell - target basebackup to shell command',])
9+
endif
10+
511
basebackup_to_shell = shared_module('basebackup_to_shell',
612
basebackup_to_shell_sources,
713
kwargs: contrib_mod_args,

‎contrib/basic_archive/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ basic_archive_sources = files(
22
'basic_archive.c',
33
)
44

5+
if host_system == 'windows'
6+
basic_archive_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'basic_archive',
8+
'--FILEDESC', 'basic_archive - basic archive module',])
9+
endif
10+
511
basic_archive = shared_module('basic_archive',
612
basic_archive_sources,
713
kwargs: contrib_mod_args,

‎contrib/bloom/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ bloom_sources = files(
77
'blvalidate.c',
88
)
99

10+
if host_system == 'windows'
11+
bloom_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
12+
'--NAME', 'bloom',
13+
'--FILEDESC', 'bloom access method - signature file based index',])
14+
endif
15+
1016
bloom = shared_module('bloom',
1117
bloom_sources,
1218
kwargs: contrib_mod_args,

‎contrib/bool_plperl/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ bool_plperl_sources = files(
66
'bool_plperl.c',
77
)
88

9+
if host_system == 'windows'
10+
bool_plperl_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
11+
'--NAME', 'bool_plperl',
12+
'--FILEDESC', 'bool_plperl - bool transform for plperl',])
13+
endif
14+
915
bool_plperl = shared_module('bool_plperl',
1016
bool_plperl_sources,
1117
include_directories: [plperl_inc, include_directories('.')],

‎contrib/btree_gin/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
btree_gin_sources = files(
2+
'btree_gin.c',
3+
)
4+
5+
if host_system == 'windows'
6+
btree_gin_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'btree_gin',
8+
'--FILEDESC', 'btree_gin - B-tree equivalent GIN operator classes',])
9+
endif
10+
111
btree_gin = shared_module('btree_gin',
2-
files('btree_gin.c'),
12+
btree_gin_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += btree_gin

‎contrib/btree_gist/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ btree_gist_sources = files(
2525
'btree_uuid.c',
2626
)
2727

28+
if host_system == 'windows'
29+
btree_gist_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
30+
'--NAME', 'btree_gist',
31+
'--FILEDESC', 'btree_gist - B-tree equivalent GiST operator classes',])
32+
endif
33+
2834
btree_gist = shared_module('btree_gist',
2935
btree_gist_sources,
3036
kwargs: contrib_mod_args,

‎contrib/citext/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ citext_sources = files(
22
'citext.c',
33
)
44

5+
if host_system == 'windows'
6+
citext_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'citext',
8+
'--FILEDESC', 'citext - case-insensitive character string data type',])
9+
endif
10+
511
citext = shared_module('citext',
612
citext_sources,
713
kwargs: contrib_mod_args,

‎contrib/cube/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ cube_parse = custom_target('cubeparse',
1717
generated_sources += cube_parse.to_list()
1818
cube_sources += cube_parse
1919

20+
if host_system == 'windows'
21+
cube_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
22+
'--NAME', 'cube',
23+
'--FILEDESC', 'cube - multidimensional cube data type',])
24+
endif
25+
2026
cube = shared_module('cube',
2127
cube_sources,
2228
include_directories: include_directories('.'),

‎contrib/dblink/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ dblink_sources = files(
22
'dblink.c',
33
)
44

5+
if host_system == 'windows'
6+
dblink_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'dblink',
8+
'--FILEDESC', 'dblink - connect to other PostgreSQL databases',])
9+
endif
10+
511
dblink = shared_module('dblink',
612
dblink_sources,
713
kwargs: contrib_mod_args + {

‎contrib/dict_int/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
dict_int_sources = files(
2+
'dict_int.c',
3+
)
4+
5+
if host_system == 'windows'
6+
dict_int_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'dict_int',
8+
'--FILEDESC', 'dict_int - add-on dictionary template for full-text search',])
9+
endif
10+
111
dict_int = shared_module('dict_int',
2-
files('dict_int.c'),
12+
dict_int_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += dict_int

‎contrib/dict_xsyn/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
dict_xsyn_sources = files(
2+
'dict_xsyn.c',
3+
)
4+
5+
if host_system == 'windows'
6+
dict_xsyn_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'dict_xsyn',
8+
'--FILEDESC', 'dict_xsyn - add-on dictionary template for full-text search',])
9+
endif
10+
111
dict_xsyn = shared_module('dict_xsyn',
2-
files('dict_xsyn.c'),
12+
dict_xsyn_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += dict_xsyn

‎contrib/earthdistance/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
earthdistance_sources = files(
2+
'earthdistance.c',
3+
)
4+
5+
if host_system == 'windows'
6+
earthdistance_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'earthdistance',
8+
'--FILEDESC', 'earthdistance - calculate distances on the surface of the Earth',])
9+
endif
10+
111
earthdistance = shared_module('earthdistance',
2-
files('earthdistance.c'),
12+
earthdistance_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += earthdistance

‎contrib/file_fdw/meson.build

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
1+
file_fdw_sources = files(
2+
'file_fdw.c',
3+
)
4+
5+
if host_system == 'windows'
6+
file_fdw_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'file_fdw',
8+
'--FILEDESC', 'file_fdw - foreign data wrapper for files',])
9+
endif
10+
111
file_fdw = shared_module('file_fdw',
2-
files('file_fdw.c'),
12+
file_fdw_sources,
313
kwargs: contrib_mod_args,
414
)
515
contrib_targets += file_fdw

‎contrib/fuzzystrmatch/meson.build

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,16 @@
1+
fuzzystrmatch_sources = files(
2+
'fuzzystrmatch.c',
3+
'dmetaphone.c',
4+
)
5+
6+
if host_system == 'windows'
7+
fuzzystrmatch_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
8+
'--NAME', 'fuzzystrmatch',
9+
'--FILEDESC', 'fuzzystrmatch - similarities and distance between strings',])
10+
endif
11+
112
fuzzystrmatch = shared_module('fuzzystrmatch',
2-
files(
3-
'fuzzystrmatch.c',
4-
'dmetaphone.c'
5-
),
13+
fuzzystrmatch_sources,
614
kwargs: contrib_mod_args,
715
)
816
contrib_targets += fuzzystrmatch

‎contrib/hstore/meson.build

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
11
# .. so that includes of hstore/hstore.h work
22
hstore_inc = include_directories('.', '../')
33

4+
hstore_sources = files(
5+
'hstore_compat.c',
6+
'hstore_gin.c',
7+
'hstore_gist.c',
8+
'hstore_io.c',
9+
'hstore_op.c',
10+
'hstore_subs.c',
11+
)
12+
13+
if host_system == 'windows'
14+
hstore_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
15+
'--NAME', 'hstore',
16+
'--FILEDESC', 'hstore - key/value pair data type',])
17+
endif
18+
419
hstore = shared_module('hstore',
5-
files(
6-
'hstore_compat.c',
7-
'hstore_gin.c',
8-
'hstore_gist.c',
9-
'hstore_io.c',
10-
'hstore_op.c',
11-
'hstore_subs.c',
12-
),
20+
hstore_sources,
1321
kwargs: contrib_mod_args,
1422
)
1523
contrib_targets += hstore

‎contrib/hstore_plperl/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ hstore_plperl_sources = files(
66
'hstore_plperl.c',
77
)
88

9+
if host_system == 'windows'
10+
hstore_plperl_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
11+
'--NAME', 'hstore_plperl',
12+
'--FILEDESC', 'hstore_plperl - hstore transform for plperl',])
13+
endif
14+
915
hstore_plperl = shared_module('hstore_plperl',
1016
hstore_plperl_sources,
1117
include_directories: [plperl_inc, hstore_inc],

‎contrib/hstore_plpython/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ hstore_plpython_sources = files(
66
'hstore_plpython.c',
77
)
88

9+
if host_system == 'windows'
10+
hstore_plpython_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
11+
'--NAME', 'hstore_plpython3',
12+
'--FILEDESC', 'hstore_plpython - hstore transform for plpython',])
13+
endif
14+
915
hstore_plpython = shared_module('hstore_plpython3',
1016
hstore_plpython_sources,
1117
include_directories: [plpython_inc, hstore_inc, ],

‎contrib/intarray/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ intarray_sources = files(
88
'_intbig_gist.c',
99
)
1010

11+
if host_system == 'windows'
12+
intarray_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
13+
'--NAME', '_int',
14+
'--FILEDESC', 'intarray - functions and operators for arrays of integers',])
15+
endif
16+
1117
intarray = shared_module('_int',
1218
intarray_sources,
1319
kwargs: contrib_mod_args,

‎contrib/isn/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ isn_sources = files(
22
'isn.c',
33
)
44

5+
if host_system == 'windows'
6+
isn_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
7+
'--NAME', 'isn',
8+
'--FILEDESC', 'isn - data types for international product numbering standards',])
9+
endif
10+
511
isn = shared_module('isn',
612
isn_sources,
713
kwargs: contrib_mod_args,

‎contrib/jsonb_plperl/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ jsonb_plperl_sources = files(
66
'jsonb_plperl.c',
77
)
88

9+
if host_system == 'windows'
10+
jsonb_plperl_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
11+
'--NAME', 'jsonb_plperl',
12+
'--FILEDESC', 'jsonb_plperl - jsonb transform for plperl',])
13+
endif
14+
915
jsonb_plperl = shared_module('jsonb_plperl',
1016
jsonb_plperl_sources,
1117
include_directories: [plperl_inc],

‎contrib/jsonb_plpython/meson.build

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ jsonb_plpython_sources = files(
66
'jsonb_plpython.c',
77
)
88

9+
if host_system == 'windows'
10+
jsonb_plpython_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
11+
'--NAME', 'jsonb_plpython3',
12+
'--FILEDESC', 'jsonb_plpython - jsonb transform for plpython',])
13+
endif
14+
915
jsonb_plpython = shared_module('jsonb_plpython3',
1016
jsonb_plpython_sources,
1117
include_directories: [plpython_inc],

0 commit comments

Comments
 (0)