Merge pull request #220 from OpenBrickProtocolFoundation/add_meson_checks

Add meson format checks

Author: Totto16

.github/workflows/meson.yml

@@ -0,0 +1,28 @@
+name: Meson Checks CI
+
+on:
+  push:
+    branches: ['main']
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  meson_format:
+    name: Run Meson Format Checks
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: '0'
+
+      - name: Check Files
+        uses: Totto16/meson-format-action@1
+        with:
+          format-file: ./meson.format
+          only-git-files: true
+
+  ## TODO: use mesonlint from
+  ## https://github.com/JCWasmx86/mesonlsp
+  ## once it is maitained again
+  # meson_lint:
+  #   name: Run Meson Lint Checks

meson.format

@@ -0,0 +1,6 @@
+max_line_length = 100
+end_of_line = 'lf'
+insert_final_newline = true
+sort_files = true
+kwargs_force_multiline = true
+no_single_comma_function = true

src/executables/game/meson.build

@@ -1,7 +1 @@
-main_files += files(
-    'application.cpp',
-    'application.hpp',
-    'main.cpp',
-    'parser.cpp',
-    'parser.hpp',
-)
+main_files += files('application.cpp', 'application.hpp', 'main.cpp', 'parser.cpp', 'parser.hpp')

src/executables/meson.build

@@ -46,21 +46,20 @@ if build_application
                 endif
 
                 if not fs.exists(APP_ROMFS)
-                    error(
-                        'APP_ROMFS should exist, but doesn\'t: \''
-                        + APP_ROMFS
-                        + '\'',
-                    )
+                    error('APP_ROMFS should exist, but doesn\'t: \''
+                        + APP_ROMFS + '\'')
                 endif
 
                 if not APP_ROMFS.endswith('/')
                     APP_ROMFS = APP_ROMFS + '/'
                 endif
 
                 emscripten_link_args += [
-                    '--preload-file', APP_ROMFS + '@/assets/',
+                    '--preload-file',
+                    APP_ROMFS + '@/assets/',
                     # based on: https://github.com/emscripten-core/emscripten/blob/main/src/shell_minimal.html
-                    '--shell-file', meson.project_source_root() / 'platforms' / 'emscripten' / 'shell_file.html',
+                    '--shell-file',
+                    meson.project_source_root() / 'platforms' / 'emscripten' / 'shell_file.html',
                 ]
 
             endif
@@ -85,7 +84,9 @@ if build_application
 
             oopetris_html = executable(
                 emscripten_name,
-                objects: oopetris_js.extract_all_objects(recursive: true),
+                objects: oopetris_js.extract_all_objects(
+                    recursive: true
+                ),
                 dependencies: emscripten_deps,
                 link_args: emscripten_link_args,
                 override_options: emscripten_options,
@@ -94,12 +95,15 @@ if build_application
                 link_depends: [oopetris_js],
             )
 
-            python3 = find_program('python3', required: false)
+            python3 = find_program(
+                'python3',
+                required: false,
+            )
 
             if python3.found()
 
                 server_py = files(
-                    meson.project_source_root() / 'platforms' / 'emscripten' / 'server.py',
+                    meson.project_source_root() / 'platforms' / 'emscripten' / 'server.py'
                 )
 
                 dest_path = meson.project_build_root() / 'src' / 'executables'
@@ -112,7 +116,10 @@ if build_application
 
             endif
 
-            wasm_validate_exe = find_program('wasm-validate', required: false)
+            wasm_validate_exe = find_program(
+                'wasm-validate',
+                required: false,
+            )
 
             if wasm_validate_exe.found()
 
@@ -123,7 +130,6 @@ if build_application
                     wasm_validate_exe,
                     args: ['--enable-threads', wasm_file],
                     depends: [oopetris_js, oopetris_html],
-
                 )
             endif
 
@@ -170,7 +176,7 @@ if build_application
                 makensis = find_program('makensis')
 
                 nsis_script = files(
-                    meson.project_source_root() / 'tools' / 'installer' / 'setup.nsi',
+                    meson.project_source_root() / 'tools' / 'installer' / 'setup.nsi'
                 )
 
                 run_target(
@@ -184,9 +190,7 @@ if build_application
                         + meson.project_source_root(),
                         '-DPROJECT_BUILD_DIR=' + meson.project_build_root(),
                         '-DDYNAMIC_LIBRARIES_DIR='
-                        + (
-                            meson.project_build_root() / 'dynamic_libraries' / get_option('bindir')
-                        ),
+                        + (meson.project_build_root() / 'dynamic_libraries' / get_option('bindir')),
                         nsis_script,
                     ],
                     depends: [oopetris_exe, oopetris_recordings_utility_exe],

src/executables/platforms/3ds/meson.build

@@ -6,26 +6,9 @@ _3ds_deps = _3ds_options[2]
 
 # libraries
 
-_3ds_dependencies = [
-    'flac',
-    'freetype2',
-    'ogg',
-    'ogg',
-    'opus',
-    'opusfile',
-    'vorbisidec',
-    'zlib',
-]
-
-_3ds_dependencies_native = [
-    'bz2',
-    'ctru',
-    'mad',
-    'mikmod',
-    'modplug',
-    'png16',
-    'SDL2main',
-]
+_3ds_dependencies = ['flac', 'freetype2', 'ogg', 'ogg', 'opus', 'opusfile', 'vorbisidec', 'zlib']
+
+_3ds_dependencies_native = ['bz2', 'ctru', 'mad', 'mikmod', 'modplug', 'png16', 'SDL2main']
 
 _3ds_library_dirs = meson.get_external_property('library_dirs', [''])
 if _3ds_library_dirs.length() == 0
@@ -64,9 +47,7 @@ _3ds_elf_file = build_target(
     target_type: 'executable',
 )
 
-use_smdh = ['true', 'True', '1', true].contains(
-    meson.get_external_property('USE_SMDH', ''),
-)
+use_smdh = ['true', 'True', '1', true].contains(meson.get_external_property('USE_SMDH', ''))
 
 _3dsxtool = find_program('3dsxtool')
 
@@ -125,11 +106,8 @@ if use_smdh
         endif
 
         if not fs.exists(APP_SMALL_ICON)
-            error(
-                'APP_SMALL_ICON should exist, but doesn\'t: \''
-                + APP_SMALL_ICON
-                + '\'',
-            )
+            error('APP_SMALL_ICON should exist, but doesn\'t: \''
+                + APP_SMALL_ICON + '\'')
         endif
 
         SMDH_FLAGS += APP_SMALL_ICON

src/executables/platforms/switch/meson.build

@@ -21,14 +21,7 @@ switch_dependencies = [
     'zlib',
 ]
 
-switch_dependencies_native = [
-    'bz2',
-    'drm_nouveau',
-    'modplug',
-    'nx',
-    'png16',
-    'SDL2main',
-]
+switch_dependencies_native = ['bz2', 'drm_nouveau', 'modplug', 'nx', 'png16', 'SDL2main']
 
 foreach dep : switch_dependencies
     switch_deps += dependency(
@@ -67,9 +60,7 @@ switch_elf_file = build_target(
     target_type: 'executable',
 )
 
-use_nacp = ['true', 'True', '1', true].contains(
-    meson.get_external_property('USE_NACP', ''),
-)
+use_nacp = ['true', 'True', '1', true].contains(meson.get_external_property('USE_NACP', ''))
 
 elf2nro = find_program('elf2nro')
 # executable input elf file, output nro file

src/executables/platforms/windows/meson.build

@@ -6,21 +6,21 @@ minor_version = version_arr[1].to_int()
 patch_version = version_arr[2].to_int()
 
 rc_conf = configuration_data(
-  {
-    'OOPETRIS_VERSION': meson.project_version(),
-    'OOPETRIS_NAME': oopetris_name,
-    'OOPETRIS_AUTHOR': oopetris_author,
-    'OOPETRIS_MAJOR_VERSION': major_version,
-    'OOPETRIS_MINOR_VERSION': minor_version,
-    'OOPETRIS_PATCH_VERSION': patch_version,
-    'PROJECT_SOURCE_DIR': meson.project_source_root().replace('\\', '/'),
-  },
+    {
+        'OOPETRIS_VERSION': meson.project_version(),
+        'OOPETRIS_NAME': oopetris_name,
+        'OOPETRIS_AUTHOR': oopetris_author,
+        'OOPETRIS_MAJOR_VERSION': major_version,
+        'OOPETRIS_MINOR_VERSION': minor_version,
+        'OOPETRIS_PATCH_VERSION': patch_version,
+        'PROJECT_SOURCE_DIR': meson.project_source_root().replace('\\', '/'),
+    }
 )
 
 oopetris_win_rc = configure_file(
-  input: 'oopetris.rc.in',
-  output: 'oopetris.rc',
-  configuration: rc_conf,
+    input: 'oopetris.rc.in',
+    output: 'oopetris.rc',
+    configuration: rc_conf,
 )
 
 oopetris_resource_windows = windows.compile_resources(oopetris_win_rc)

src/executables/utility/meson.build

@@ -1,4 +1 @@
-recordings_main_files += files(
-    'command_line_arguments.hpp',
-    'main.cpp',
-)
+recordings_main_files += files('command_line_arguments.hpp', 'main.cpp')

src/libs/core/game/meson.build

@@ -1,15 +1,6 @@
-core_src_files += files(
-    'mino.cpp',
-    'mino_stack.cpp',
-    'tetromino_type.cpp',
-)
+core_src_files += files('mino.cpp', 'mino_stack.cpp', 'tetromino_type.cpp')
 
-_header_files = files(
-    'grid_properties.hpp',
-    'mino.hpp',
-    'mino_stack.hpp',
-    'tetromino_type.hpp',
-)
+_header_files = files('grid_properties.hpp', 'mino.hpp', 'mino_stack.hpp', 'tetromino_type.hpp')
 
 core_header_files += _header_files
 

src/libs/core/hash-library/meson.build

@@ -1,10 +1,6 @@
-core_src_files += files(
-    'sha256.cpp',
-)
+core_src_files += files('sha256.cpp')
 
-_header_files = files(
-    'sha256.h',
-)
+_header_files = files('sha256.h')
 
 core_header_files += _header_files