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,

0 commit comments

Comments
 (0)