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 <william.ayd@icloud.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
apache · Feb 7, 2025 · ed2a417 · ed2a417
1 parent dab09f5
commit ed2a417
Show file tree

Hide file tree

Showing 13 changed files with 984 additions and 884 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -197,3 +197,8 @@ repos:
           ?^c_glib/test/run-test\.sh$|
           ?^dev/release/utils-generate-checksum\.sh$|
           )
+  - repo: https://github.com/trim21/pre-commit-mirror-meson
+    rev: v1.6.1
+    hooks:
+      - id: meson-fmt
+        args: ['--inplace']
diff --git a/c_glib/arrow-cuda-glib/meson.build b/c_glib/arrow-cuda-glib/meson.build
@@ -17,88 +17,89 @@
 # specific language governing permissions and limitations
 # under the License.
 
-sources = files(
-  'cuda.cpp',
-)
+sources = files('cuda.cpp')
 
-c_headers = files(
-  'arrow-cuda-glib.h',
-  'cuda.h',
-)
+c_headers = files('arrow-cuda-glib.h', 'cuda.h')
 
-cpp_headers = files(
-  'arrow-cuda-glib.hpp',
-  'cuda.hpp',
-)
+cpp_headers = files('arrow-cuda-glib.hpp', 'cuda.hpp')
 
 version_h = configure_file(
-  input: 'version.h.in',
-  output: 'version.h',
-  command: [python3, generate_version_header_py, '--library', 'GARROW_CUDA', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+    input: 'version.h.in',
+    output: 'version.h',
+    command: [
+        python3,
+        generate_version_header_py,
+        '--library',
+        'GARROW_CUDA',
+        '--version',
+        version,
+        '--input',
+        '@INPUT@',
+        '--output',
+        '@OUTPUT@',
+    ],
 )
 
 c_headers += version_h
 
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: 'arrow-cuda-glib')
 
-dependencies = [
-  arrow_cuda,
-  arrow_glib,
-]
-libarrow_cuda_glib = library('arrow-cuda-glib',
-                             sources: sources,
-                             install: true,
-                             dependencies: dependencies,
-                             implicit_include_directories: false,
-                             include_directories: base_include_directories,
-                             cpp_args: ['-DGARROW_CUDA_COMPILATION'],
-                             soversion: so_version,
-                             version: library_version)
-arrow_cuda_glib = declare_dependency(link_with: libarrow_cuda_glib,
-                                     include_directories: base_include_directories,
-                                     dependencies: dependencies)
+dependencies = [arrow_cuda, arrow_glib]
+libarrow_cuda_glib = library(
+    'arrow-cuda-glib',
+    sources: sources,
+    install: true,
+    dependencies: dependencies,
+    implicit_include_directories: false,
+    include_directories: base_include_directories,
+    cpp_args: ['-DGARROW_CUDA_COMPILATION'],
+    soversion: so_version,
+    version: library_version,
+)
+arrow_cuda_glib = declare_dependency(
+    link_with: libarrow_cuda_glib,
+    include_directories: base_include_directories,
+    dependencies: dependencies,
+)
 if target_machine.system() != 'windows'
-  pkgconfig.generate(libarrow_cuda_glib,
-                     description: 'C API for Apache Arrow CUDA based on GLib',
-                     filebase: 'arrow-cuda-glib',
-                     name: 'Apache Arrow CUDA GLib',
-                     requires: ['arrow-glib', 'arrow-cuda'],
-                     variables: pkgconfig_variables,
-                     version: version)
+    pkgconfig.generate(
+        libarrow_cuda_glib,
+        description: 'C API for Apache Arrow CUDA based on GLib',
+        filebase: 'arrow-cuda-glib',
+        name: 'Apache Arrow CUDA GLib',
+        requires: ['arrow-glib', 'arrow-cuda'],
+        variables: pkgconfig_variables,
+        version: version,
+    )
 endif
 
 if have_gi
-  gir_dependencies = [
-    declare_dependency(sources: arrow_glib_gir),
-  ]
-  gir_extra_args = [
-    '--warn-all',
-    '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
-  ]
-  arrow_cuda_glib_gir = \
-    gnome.generate_gir(libarrow_cuda_glib,
-                       dependencies: gir_dependencies,
-                       export_packages: 'arrow-cuda-glib',
-                       extra_args: gir_extra_args,
-                       header: 'arrow-cuda-glib/arrow-cuda-glib.h',
-                       identifier_prefix: 'GArrowCUDA',
-                       includes: [
-                         'Arrow-1.0',
-                       ],
-                       kwargs: generate_gi_common_args,
-                       namespace: 'ArrowCUDA',
-                       sources: sources + c_headers,
-                       symbol_prefix: 'garrow_cuda')
+    gir_dependencies = [declare_dependency(sources: arrow_glib_gir)]
+    gir_extra_args = [
+        '--warn-all',
+        '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+    ]
+    arrow_cuda_glib_gir = gnome.generate_gir(
+        libarrow_cuda_glib,
+        dependencies: gir_dependencies,
+        export_packages: 'arrow-cuda-glib',
+        extra_args: gir_extra_args,
+        header: 'arrow-cuda-glib/arrow-cuda-glib.h',
+        identifier_prefix: 'GArrowCUDA',
+        includes: ['Arrow-1.0'],
+        kwargs: generate_gi_common_args,
+        namespace: 'ArrowCUDA',
+        sources: sources + c_headers,
+        symbol_prefix: 'garrow_cuda',
+    )
 
-  if generate_vapi
-    arrow_cuda_glib_vapi = \
-      gnome.generate_vapi('arrow-cuda-glib',
-                          install: true,
-                          packages: [
-                            arrow_glib_vapi,
-                            'gio-2.0',
-                          ],
-                          sources: [arrow_cuda_glib_gir[0]])
-  endif
+    if generate_vapi
+        arrow_cuda_glib_vapi = gnome.generate_vapi(
+            'arrow-cuda-glib',
+            install: true,
+            packages: [arrow_glib_vapi, 'gio-2.0'],
+            sources: [arrow_cuda_glib_gir[0]],
+        )
+    endif
 endif
diff --git a/c_glib/arrow-dataset-glib/meson.build b/c_glib/arrow-dataset-glib/meson.build
@@ -20,110 +20,124 @@
 project_name = 'arrow-dataset-glib'
 
 sources = files(
-  'dataset-factory.cpp',
-  'dataset.cpp',
-  'file-format.cpp',
-  'fragment.cpp',
-  'partitioning.cpp',
-  'scanner.cpp',
+    'dataset-factory.cpp',
+    'dataset.cpp',
+    'file-format.cpp',
+    'fragment.cpp',
+    'partitioning.cpp',
+    'scanner.cpp',
 )
 
 c_headers = files(
-  'arrow-dataset-glib.h',
-  'dataset-definition.h',
-  'dataset-factory.h',
-  'dataset.h',
-  'file-format.h',
-  'fragment.h',
-  'partitioning.h',
-  'scanner.h',
+    'arrow-dataset-glib.h',
+    'dataset-definition.h',
+    'dataset-factory.h',
+    'dataset.h',
+    'file-format.h',
+    'fragment.h',
+    'partitioning.h',
+    'scanner.h',
 )
 
 cpp_headers = files(
-  'arrow-dataset-glib.hpp',
-  'dataset-factory.hpp',
-  'dataset.hpp',
-  'file-format.hpp',
-  'fragment.hpp',
-  'partitioning.hpp',
-  'scanner.hpp',
+    'arrow-dataset-glib.hpp',
+    'dataset-factory.hpp',
+    'dataset.hpp',
+    'file-format.hpp',
+    'fragment.hpp',
+    'partitioning.hpp',
+    'scanner.hpp',
 )
 
 version_h = configure_file(
-  input: 'version.h.in',
-  output: 'version.h',
-  command: [python3, generate_version_header_py, '--library', 'GADATASET', '--version', version, '--input', '@INPUT@', '--output', '@OUTPUT@'],
+    input: 'version.h.in',
+    output: 'version.h',
+    command: [
+        python3,
+        generate_version_header_py,
+        '--library',
+        'GADATASET',
+        '--version',
+        version,
+        '--input',
+        '@INPUT@',
+        '--output',
+        '@OUTPUT@',
+    ],
 )
 
 c_headers += version_h
 
-enums = gnome.mkenums('enums',
-                      sources: c_headers,
-                      identifier_prefix: 'GADataset',
-                      symbol_prefix: 'gadataset',
-                      c_template: 'enums.c.template',
-                      h_template: 'enums.h.template',
-                      install_dir: join_paths(include_dir, project_name),
-                      install_header: true)
+enums = gnome.mkenums(
+    'enums',
+    sources: c_headers,
+    identifier_prefix: 'GADataset',
+    symbol_prefix: 'gadataset',
+    c_template: 'enums.c.template',
+    h_template: 'enums.h.template',
+    install_dir: join_paths(include_dir, project_name),
+    install_header: true,
+)
 enums_source = enums[0]
 enums_header = enums[1]
 
 headers = c_headers + cpp_headers
 install_headers(headers, subdir: project_name)
 
-dependencies = [
-  arrow_dataset,
-  arrow_glib,
-]
-libarrow_dataset_glib = library('arrow-dataset-glib',
-                                sources: sources + enums,
-                                install: true,
-                                dependencies: dependencies,
-                                implicit_include_directories: false,
-                                include_directories: base_include_directories,
-                                cpp_args: ['-DGADATASET_COMPILATION'],
-                                c_args: ['-DGADATASET_COMPILATION'],
-                                soversion: so_version,
-                                version: library_version)
-arrow_dataset_glib = declare_dependency(link_with: libarrow_dataset_glib,
-                                        include_directories: base_include_directories,
-                                        dependencies: dependencies,
-                                        sources: enums_header)
+dependencies = [arrow_dataset, arrow_glib]
+libarrow_dataset_glib = library(
+    'arrow-dataset-glib',
+    sources: sources + enums,
+    install: true,
+    dependencies: dependencies,
+    implicit_include_directories: false,
+    include_directories: base_include_directories,
+    cpp_args: ['-DGADATASET_COMPILATION'],
+    c_args: ['-DGADATASET_COMPILATION'],
+    soversion: so_version,
+    version: library_version,
+)
+arrow_dataset_glib = declare_dependency(
+    link_with: libarrow_dataset_glib,
+    include_directories: base_include_directories,
+    dependencies: dependencies,
+    sources: enums_header,
+)
 
-pkgconfig.generate(libarrow_dataset_glib,
-                   description: 'C API for Apache Arrow Dataset based on GLib',
-                   filebase: 'arrow-dataset-glib',
-                   name: 'Apache Arrow Dataset GLib',
-                   requires: ['arrow-glib', 'arrow-dataset'],
-                   variables: pkgconfig_variables,
-                   version: version)
+pkgconfig.generate(
+    libarrow_dataset_glib,
+    description: 'C API for Apache Arrow Dataset based on GLib',
+    filebase: 'arrow-dataset-glib',
+    name: 'Apache Arrow Dataset GLib',
+    requires: ['arrow-glib', 'arrow-dataset'],
+    variables: pkgconfig_variables,
+    version: version,
+)
 
 if have_gi
-  arrow_dataset_glib_gir = \
-    gnome.generate_gir(libarrow_dataset_glib,
-                       dependencies: declare_dependency(sources: arrow_glib_gir),
-                       export_packages: 'arrow-dataset-glib',
-                       extra_args: [
-                         '--warn-all',
-                         '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
-                       ],
-                       header: 'arrow-dataset-glib/arrow-dataset-glib.h',
-                       identifier_prefix: 'GADataset',
-                       includes: [
-                         'Arrow-1.0',
-                       ],
-                       kwargs: generate_gi_common_args,
-                       namespace: 'ArrowDataset',
-                       sources: sources + c_headers + enums,
-                       symbol_prefix: 'gadataset')
+    arrow_dataset_glib_gir = gnome.generate_gir(
+        libarrow_dataset_glib,
+        dependencies: declare_dependency(sources: arrow_glib_gir),
+        export_packages: 'arrow-dataset-glib',
+        extra_args: [
+            '--warn-all',
+            '--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
+        ],
+        header: 'arrow-dataset-glib/arrow-dataset-glib.h',
+        identifier_prefix: 'GADataset',
+        includes: ['Arrow-1.0'],
+        kwargs: generate_gi_common_args,
+        namespace: 'ArrowDataset',
+        sources: sources + c_headers + enums,
+        symbol_prefix: 'gadataset',
+    )
 
-  if generate_vapi
-    gnome.generate_vapi('arrow-dataset-glib',
-                        install: true,
-                        packages: [
-                          arrow_glib_vapi,
-                          'gio-2.0',
-                        ],
-                        sources: [arrow_dataset_glib_gir[0]])
-  endif
+    if generate_vapi
+        gnome.generate_vapi(
+            'arrow-dataset-glib',
+            install: true,
+            packages: [arrow_glib_vapi, 'gio-2.0'],
+            sources: [arrow_dataset_glib_gir[0]],
+        )
+    endif
 endif