Skip to content

Commit dd1e33c

Browse files
keszybzkeszybz
committed
meson: drop "meson-" prefix from various helper script filenames
In a few cases, the prefix was originally necessary because a different helper script was used for automake, and a different one for meson. But now we use meson exclusively, and the prefix isn't useful. This also synchronizes the target name, file name, and variable name in meson.build. The targets exposed by meson didn't have the prefix, so the user interface is unchanged. (The prefix is retained in the few tools that are used for meson itself, e.g. meosn-vcs-tag.sh, meson-make-symlink.sh, etc.)
1 parent 1f63c72 commit dd1e33c

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

‎meson.build‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ substs.set('BUILD_ROOT', project_build_root
299299

300300
cc = meson.get_compiler('c')
301301
pkgconfig = import('pkgconfig')
302-
check_compilation_sh = find_program('tools/meson-check-compilation.sh')
302+
check_compilation_sh = find_program('tools/check-compilation.sh')
303303
meson_build_sh = find_program('tools/meson-build.sh')
304304

305305
want_tests = get_option('tests')
@@ -3244,8 +3244,8 @@ run_target(
32443244
make_directive_index_py = find_program('tools/make-directive-index.py')
32453245
make_man_index_py = find_program('tools/make-man-index.py')
32463246
xml_helper_py = find_program('tools/xml_helper.py')
3247-
hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
3248-
autosuspend_update_sh = find_program('tools/meson-autosuspend-update.sh')
3247+
hwdb_update_sh = find_program('tools/hwdb-update.sh')
3248+
autosuspend_update_sh = find_program('tools/autosuspend-update.sh')
32493249

32503250
subdir('sysctl.d')
32513251
subdir('sysusers.d')
@@ -3286,13 +3286,13 @@ meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir))
32863286

32873287
############################################################
32883288

3289-
meson_check_help = find_program('tools/meson-check-help.sh')
3289+
check_help = find_program('tools/check-help.sh')
32903290

32913291
foreach exec : public_programs
32923292
name = exec.full_path().split('/')[-1]
32933293
if want_tests != 'false'
32943294
test('check-help-' + name,
3295-
meson_check_help,
3295+
check_help,
32963296
args : exec.full_path())
32973297
endif
32983298
endforeach
@@ -3371,10 +3371,10 @@ if git.found()
33713371
endif
33723372

33733373
if git.found()
3374-
meson_git_contrib_sh = find_program('tools/meson-git-contrib.sh')
3374+
git_contrib_sh = find_program('tools/git-contrib.sh')
33753375
run_target(
33763376
'git-contrib',
3377-
command : [meson_git_contrib_sh])
3377+
command : [git_contrib_sh])
33783378
endif
33793379

33803380
if git.found()
@@ -3398,11 +3398,11 @@ endif
33983398

33993399
############################################################
34003400

3401-
meson_check_api_docs_sh = find_program('tools/meson-check-api-docs.sh')
3401+
check_api_docs_sh = find_program('tools/check-api-docs.sh')
34023402
run_target(
34033403
'check-api-docs',
34043404
depends : [man, libsystemd, libudev],
3405-
command : [meson_check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
3405+
command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
34063406

34073407
############################################################
34083408
watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog

tools/meson-autosuspend-update.sh renamed to tools/autosuspend-update.sh

File renamed without changes.

tools/meson-check-api-docs.sh renamed to tools/check-api-docs.sh

File renamed without changes.

tools/meson-check-compilation.sh renamed to tools/check-compilation.sh

File renamed without changes.

tools/meson-check-help.sh renamed to tools/check-help.sh

File renamed without changes.

tools/meson-git-contrib.sh renamed to tools/git-contrib.sh

File renamed without changes.

tools/meson-hwdb-update.sh renamed to tools/hwdb-update.sh

File renamed without changes.

0 commit comments

Comments
 (0)