Skip to content

Commit ed2a417

Browse files
WillAydWillAyd
authored
GH-45447: [CI][GLib] Use meson format for Meson configuration files (#45448)
### Rationale for this change Meson introduced its own formatting tool back in release 1.5.0. This helps enforce consistency in the configuration files and reduce unnecessary diffs ### What changes are included in this PR? Added a pre-commit hook for Meson format and ran it against Meson files currently in the repo ### Are these changes tested? N/A ### Are there any user-facing changes? No * GitHub Issue: #45447 Authored-by: Will Ayd <[email protected]> Signed-off-by: Sutou Kouhei <[email protected]>
1 parent dab09f5 commit ed2a417

File tree

13 files changed

+984
-884
lines changed

13 files changed

+984
-884
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,3 +197,8 @@ repos:
197197
?^c_glib/test/run-test\.sh$|
198198
?^dev/release/utils-generate-checksum\.sh$|
199199
)
200+
- repo: https://github.com/trim21/pre-commit-mirror-meson
201+
rev: v1.6.1
202+
hooks:
203+
- id: meson-fmt
204+
args: ['--inplace']

‎c_glib/arrow-cuda-glib/meson.build‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -17,88 +17,89 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
sources = files(
21-
'cuda.cpp',
22-
)
20+
sources = files('cuda.cpp')
2321

24-
c_headers = files(
25-
'arrow-cuda-glib.h',
26-
'cuda.h',
27-
)
22+
c_headers = files('arrow-cuda-glib.h', 'cuda.h')
2823

29-
cpp_headers = files(
30-
'arrow-cuda-glib.hpp',
31-
'cuda.hpp',
32-
)
24+
cpp_headers = files('arrow-cuda-glib.hpp', 'cuda.hpp')
3325

3426
version_h = configure_file(
35-
input: 'version.h.in',
36-
output: 'version.h',
37-
command: [python3, generate_version_header_py, '--library', 'GARROW_CUDA', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
27+
input: 'version.h.in',
28+
output: 'version.h',
29+
command: [
30+
python3,
31+
generate_version_header_py,
32+
'--library',
33+
'GARROW_CUDA',
34+
'--version',
35+
version,
36+
'--input',
37+
'@INPUT@',
38+
'--output',
39+
'@OUTPUT@',
40+
],
3841
)
3942

4043
c_headers += version_h
4144

4245
headers = c_headers + cpp_headers
4346
install_headers(headers, subdir: 'arrow-cuda-glib')
4447

45-
dependencies = [
46-
arrow_cuda,
47-
arrow_glib,
48-
]
49-
libarrow_cuda_glib = library('arrow-cuda-glib',
50-
sources: sources,
51-
install: true,
52-
dependencies: dependencies,
53-
implicit_include_directories: false,
54-
include_directories: base_include_directories,
55-
cpp_args: ['-DGARROW_CUDA_COMPILATION'],
56-
soversion: so_version,
57-
version: library_version)
58-
arrow_cuda_glib = declare_dependency(link_with: libarrow_cuda_glib,
59-
include_directories: base_include_directories,
60-
dependencies: dependencies)
48+
dependencies = [arrow_cuda, arrow_glib]
49+
libarrow_cuda_glib = library(
50+
'arrow-cuda-glib',
51+
sources: sources,
52+
install: true,
53+
dependencies: dependencies,
54+
implicit_include_directories: false,
55+
include_directories: base_include_directories,
56+
cpp_args: ['-DGARROW_CUDA_COMPILATION'],
57+
soversion: so_version,
58+
version: library_version,
59+
)
60+
arrow_cuda_glib = declare_dependency(
61+
link_with: libarrow_cuda_glib,
62+
include_directories: base_include_directories,
63+
dependencies: dependencies,
64+
)
6165
if target_machine.system() != 'windows'
62-
pkgconfig.generate(libarrow_cuda_glib,
63-
description: 'C API for Apache Arrow CUDA based on GLib',
64-
filebase: 'arrow-cuda-glib',
65-
name: 'Apache Arrow CUDA GLib',
66-
requires: ['arrow-glib', 'arrow-cuda'],
67-
variables: pkgconfig_variables,
68-
version: version)
66+
pkgconfig.generate(
67+
libarrow_cuda_glib,
68+
description: 'C API for Apache Arrow CUDA based on GLib',
69+
filebase: 'arrow-cuda-glib',
70+
name: 'Apache Arrow CUDA GLib',
71+
requires: ['arrow-glib', 'arrow-cuda'],
72+
variables: pkgconfig_variables,
73+
version: version,
74+
)
6975
endif
7076

7177
if have_gi
72-
gir_dependencies = [
73-
declare_dependency(sources: arrow_glib_gir),
74-
]
75-
gir_extra_args = [
76-
'--warn-all',
77-
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
78-
]
79-
arrow_cuda_glib_gir = \
80-
gnome.generate_gir(libarrow_cuda_glib,
81-
dependencies: gir_dependencies,
82-
export_packages: 'arrow-cuda-glib',
83-
extra_args: gir_extra_args,
84-
header: 'arrow-cuda-glib/arrow-cuda-glib.h',
85-
identifier_prefix: 'GArrowCUDA',
86-
includes: [
87-
'Arrow-1.0',
88-
],
89-
kwargs: generate_gi_common_args,
90-
namespace: 'ArrowCUDA',
91-
sources: sources + c_headers,
92-
symbol_prefix: 'garrow_cuda')
78+
gir_dependencies = [declare_dependency(sources: arrow_glib_gir)]
79+
gir_extra_args = [
80+
'--warn-all',
81+
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
82+
]
83+
arrow_cuda_glib_gir = gnome.generate_gir(
84+
libarrow_cuda_glib,
85+
dependencies: gir_dependencies,
86+
export_packages: 'arrow-cuda-glib',
87+
extra_args: gir_extra_args,
88+
header: 'arrow-cuda-glib/arrow-cuda-glib.h',
89+
identifier_prefix: 'GArrowCUDA',
90+
includes: ['Arrow-1.0'],
91+
kwargs: generate_gi_common_args,
92+
namespace: 'ArrowCUDA',
93+
sources: sources + c_headers,
94+
symbol_prefix: 'garrow_cuda',
95+
)
9396

94-
if generate_vapi
95-
arrow_cuda_glib_vapi = \
96-
gnome.generate_vapi('arrow-cuda-glib',
97-
install: true,
98-
packages: [
99-
arrow_glib_vapi,
100-
'gio-2.0',
101-
],
102-
sources: [arrow_cuda_glib_gir[0]])
103-
endif
97+
if generate_vapi
98+
arrow_cuda_glib_vapi = gnome.generate_vapi(
99+
'arrow-cuda-glib',
100+
install: true,
101+
packages: [arrow_glib_vapi, 'gio-2.0'],
102+
sources: [arrow_cuda_glib_gir[0]],
103+
)
104+
endif
104105
endif

‎c_glib/arrow-dataset-glib/meson.build‎

Lines changed: 97 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -20,110 +20,124 @@
2020
project_name = 'arrow-dataset-glib'
2121

2222
sources = files(
23-
'dataset-factory.cpp',
24-
'dataset.cpp',
25-
'file-format.cpp',
26-
'fragment.cpp',
27-
'partitioning.cpp',
28-
'scanner.cpp',
23+
'dataset-factory.cpp',
24+
'dataset.cpp',
25+
'file-format.cpp',
26+
'fragment.cpp',
27+
'partitioning.cpp',
28+
'scanner.cpp',
2929
)
3030

3131
c_headers = files(
32-
'arrow-dataset-glib.h',
33-
'dataset-definition.h',
34-
'dataset-factory.h',
35-
'dataset.h',
36-
'file-format.h',
37-
'fragment.h',
38-
'partitioning.h',
39-
'scanner.h',
32+
'arrow-dataset-glib.h',
33+
'dataset-definition.h',
34+
'dataset-factory.h',
35+
'dataset.h',
36+
'file-format.h',
37+
'fragment.h',
38+
'partitioning.h',
39+
'scanner.h',
4040
)
4141

4242
cpp_headers = files(
43-
'arrow-dataset-glib.hpp',
44-
'dataset-factory.hpp',
45-
'dataset.hpp',
46-
'file-format.hpp',
47-
'fragment.hpp',
48-
'partitioning.hpp',
49-
'scanner.hpp',
43+
'arrow-dataset-glib.hpp',
44+
'dataset-factory.hpp',
45+
'dataset.hpp',
46+
'file-format.hpp',
47+
'fragment.hpp',
48+
'partitioning.hpp',
49+
'scanner.hpp',
5050
)
5151

5252
version_h = configure_file(
53-
input: 'version.h.in',
54-
output: 'version.h',
55-
command: [python3, generate_version_header_py, '--library', 'GADATASET', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
53+
input: 'version.h.in',
54+
output: 'version.h',
55+
command: [
56+
python3,
57+
generate_version_header_py,
58+
'--library',
59+
'GADATASET',
60+
'--version',
61+
version,
62+
'--input',
63+
'@INPUT@',
64+
'--output',
65+
'@OUTPUT@',
66+
],
5667
)
5768

5869
c_headers += version_h
5970

60-
enums = gnome.mkenums('enums',
61-
sources: c_headers,
62-
identifier_prefix: 'GADataset',
63-
symbol_prefix: 'gadataset',
64-
c_template: 'enums.c.template',
65-
h_template: 'enums.h.template',
66-
install_dir: join_paths(include_dir, project_name),
67-
install_header: true)
71+
enums = gnome.mkenums(
72+
'enums',
73+
sources: c_headers,
74+
identifier_prefix: 'GADataset',
75+
symbol_prefix: 'gadataset',
76+
c_template: 'enums.c.template',
77+
h_template: 'enums.h.template',
78+
install_dir: join_paths(include_dir, project_name),
79+
install_header: true,
80+
)
6881
enums_source = enums[0]
6982
enums_header = enums[1]
7083

7184
headers = c_headers + cpp_headers
7285
install_headers(headers, subdir: project_name)
7386

74-
dependencies = [
75-
arrow_dataset,
76-
arrow_glib,
77-
]
78-
libarrow_dataset_glib = library('arrow-dataset-glib',
79-
sources: sources + enums,
80-
install: true,
81-
dependencies: dependencies,
82-
implicit_include_directories: false,
83-
include_directories: base_include_directories,
84-
cpp_args: ['-DGADATASET_COMPILATION'],
85-
c_args: ['-DGADATASET_COMPILATION'],
86-
soversion: so_version,
87-
version: library_version)
88-
arrow_dataset_glib = declare_dependency(link_with: libarrow_dataset_glib,
89-
include_directories: base_include_directories,
90-
dependencies: dependencies,
91-
sources: enums_header)
87+
dependencies = [arrow_dataset, arrow_glib]
88+
libarrow_dataset_glib = library(
89+
'arrow-dataset-glib',
90+
sources: sources + enums,
91+
install: true,
92+
dependencies: dependencies,
93+
implicit_include_directories: false,
94+
include_directories: base_include_directories,
95+
cpp_args: ['-DGADATASET_COMPILATION'],
96+
c_args: ['-DGADATASET_COMPILATION'],
97+
soversion: so_version,
98+
version: library_version,
99+
)
100+
arrow_dataset_glib = declare_dependency(
101+
link_with: libarrow_dataset_glib,
102+
include_directories: base_include_directories,
103+
dependencies: dependencies,
104+
sources: enums_header,
105+
)
92106

93-
pkgconfig.generate(libarrow_dataset_glib,
94-
description: 'C API for Apache Arrow Dataset based on GLib',
95-
filebase: 'arrow-dataset-glib',
96-
name: 'Apache Arrow Dataset GLib',
97-
requires: ['arrow-glib', 'arrow-dataset'],
98-
variables: pkgconfig_variables,
99-
version: version)
107+
pkgconfig.generate(
108+
libarrow_dataset_glib,
109+
description: 'C API for Apache Arrow Dataset based on GLib',
110+
filebase: 'arrow-dataset-glib',
111+
name: 'Apache Arrow Dataset GLib',
112+
requires: ['arrow-glib', 'arrow-dataset'],
113+
variables: pkgconfig_variables,
114+
version: version,
115+
)
100116

101117
if have_gi
102-
arrow_dataset_glib_gir = \
103-
gnome.generate_gir(libarrow_dataset_glib,
104-
dependencies: declare_dependency(sources: arrow_glib_gir),
105-
export_packages: 'arrow-dataset-glib',
106-
extra_args: [
107-
'--warn-all',
108-
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
109-
],
110-
header: 'arrow-dataset-glib/arrow-dataset-glib.h',
111-
identifier_prefix: 'GADataset',
112-
includes: [
113-
'Arrow-1.0',
114-
],
115-
kwargs: generate_gi_common_args,
116-
namespace: 'ArrowDataset',
117-
sources: sources + c_headers + enums,
118-
symbol_prefix: 'gadataset')
118+
arrow_dataset_glib_gir = gnome.generate_gir(
119+
libarrow_dataset_glib,
120+
dependencies: declare_dependency(sources: arrow_glib_gir),
121+
export_packages: 'arrow-dataset-glib',
122+
extra_args: [
123+
'--warn-all',
124+
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
125+
],
126+
header: 'arrow-dataset-glib/arrow-dataset-glib.h',
127+
identifier_prefix: 'GADataset',
128+
includes: ['Arrow-1.0'],
129+
kwargs: generate_gi_common_args,
130+
namespace: 'ArrowDataset',
131+
sources: sources + c_headers + enums,
132+
symbol_prefix: 'gadataset',
133+
)
119134

120-
if generate_vapi
121-
gnome.generate_vapi('arrow-dataset-glib',
122-
install: true,
123-
packages: [
124-
arrow_glib_vapi,
125-
'gio-2.0',
126-
],
127-
sources: [arrow_dataset_glib_gir[0]])
128-
endif
135+
if generate_vapi
136+
gnome.generate_vapi(
137+
'arrow-dataset-glib',
138+
install: true,
139+
packages: [arrow_glib_vapi, 'gio-2.0'],
140+
sources: [arrow_dataset_glib_gir[0]],
141+
)
142+
endif
129143
endif

0 commit comments

Comments
 (0)