Skip to content

Commit e738de5

Browse files
andy5995claude
andcommitted
meson: formatting and trailing comma fixes
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent b8aed92 commit e738de5

File tree

4 files changed

+37
-35
lines changed

4 files changed

+37
-35
lines changed

packaging/Slackbuild/rmw/rmw.info

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PRGNAM="rmw"
22
VERSION="0.9.4"
33
HOMEPAGE="https://theimpossibleastronaut.github.io/rmw-website/"
44
DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.9.4/rmw-0.9.4.tar.xz"
5-
MD5SUM="0df2da3c1b6985cdd4022ff4b3d6fd13"
5+
MD5SUM="b7dfcd98a1aec89d6186cc27f6c37ab4"
66
DOWNLOAD_x86_64=""
77
MD5SUM_x86_64=""
88
REQUIRES=""

src/bsdutils/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ lib_bsdutilsrm = static_library(
1919
'bsdutilsrm',
2020
src_lib_bsdutilsrm,
2121
dependencies: [dep_fts],
22-
c_args: args_lib_bsdutilsrm
22+
c_args: args_lib_bsdutilsrm,
2323
)
2424

2525
if get_option('build_tests')

src/meson.build

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,21 @@ has_btrfs_header = false
4141
if host_sys == 'linux'
4242
if get_option('want_btrfs_clone')
4343
has_statfs = cc.has_function(
44-
'statfs',
45-
prefix: '#include <sys/statfs.h>',
46-
)
44+
'statfs',
45+
prefix: '#include <sys/statfs.h>',
46+
)
4747
has_btrfs_header = cc.has_header('linux/btrfs.h')
4848
if has_statfs and has_btrfs_header
4949
conf.set('HAVE_LINUX_BTRFS', 1)
5050
else
51-
error('''
51+
error(
52+
'''
5253
5354
: Requirements not met for btrfs clone support.
5455
: If missing linux/btrfs.h, you probably need to install the linux-headers package.
5556
: To build without btrfs clone support and skip this check, add
56-
: "-Dwant_btrfs_clone=false" to the meson setup options.''')
57+
: "-Dwant_btrfs_clone=false" to the meson setup options.''',
58+
)
5759
endif
5860
endif
5961
endif

test/meson.build

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2,48 +2,48 @@
22
# unless faketime has been built with sanitizer
33
faketime = find_program('faketime', required: false)
44
if faketime.found()
5-
add_test_setup(
6-
'epochalypse',
7-
exe_wrapper: [faketime, '-f', '+14y'],
8-
env: ['RMW_TEST_EPOCHALYPSE=true'],
9-
)
5+
add_test_setup(
6+
'epochalypse',
7+
exe_wrapper: [faketime, '-f', '+14y'],
8+
env: ['RMW_TEST_EPOCHALYPSE=true'],
9+
)
1010
endif
1111

1212
test_cases = ['strings_rmw', 'utils', 'restore']
1313

1414
scripts = [
15-
'test_basic.sh',
16-
'test_media_root.sh',
17-
'test_purging.sh',
18-
'test_restore.sh',
15+
'test_basic.sh',
16+
'test_media_root.sh',
17+
'test_purging.sh',
18+
'test_restore.sh',
1919
]
2020

2121
if has_statfs and has_btrfs_header
22-
scripts += ['test_btrfs_clone.sh']
22+
scripts += ['test_btrfs_clone.sh']
2323
endif
2424

2525
RMW_FAKE_HOME = join_paths(meson.current_build_dir(), 'rmw-tests-home')
2626

2727
foreach case : test_cases
28-
exe = executable(
29-
'test_' + case,
30-
'../src/' + case + '.c',
31-
c_args: ['-DTEST_LIB', '-DRMW_FAKE_HOME="@0@"'.format(RMW_FAKE_HOME)],
32-
dependencies: rmw_dep,
33-
override_options: ['b_lto=false'],
34-
)
35-
test('test_' + case, exe)
28+
exe = executable(
29+
'test_' + case,
30+
'../src/' + case + '.c',
31+
c_args: ['-DTEST_LIB', '-DRMW_FAKE_HOME="@0@"'.format(RMW_FAKE_HOME)],
32+
dependencies: rmw_dep,
33+
override_options: ['b_lto=false'],
34+
)
35+
test('test_' + case, exe)
3636
endforeach
3737

3838
foreach s : scripts
39-
test(
40-
s,
41-
files(s),
42-
env: [
43-
'MESON_SOURCE_ROOT=' + meson.project_source_root(),
44-
'RMW_FAKE_HOME=' + RMW_FAKE_HOME,
45-
'MESON_BUILD_ROOT=' + meson.project_build_root(),
46-
],
47-
depends: main_bin,
48-
)
39+
test(
40+
s,
41+
files(s),
42+
env: [
43+
'MESON_SOURCE_ROOT=' + meson.project_source_root(),
44+
'RMW_FAKE_HOME=' + RMW_FAKE_HOME,
45+
'MESON_BUILD_ROOT=' + meson.project_build_root(),
46+
],
47+
depends: main_bin,
48+
)
4949
endforeach

0 commit comments

Comments
 (0)