mirror of
https://github.com/systemd/systemd.git
synced 2024-12-22 17:35:35 +03:00
meson: rename target to update-dbus-docs
Very old versions of meson did not include the subdirectory name in the target name, so we started adding various "top-level" custom targets in subdirectories. This was nice because the main meson.build file wasn't as cluttered. But then meson started including the subdir name in the target name. So let's move the definition to the root so we can have all targets named uniformly.
This commit is contained in:
parent
e798ffef82
commit
4c890ad3cc
@ -10,7 +10,7 @@ layout: default
|
||||
2. Update the contributors list in NEWS (`meson compile -C build git-contrib`)
|
||||
3. Update the time and place in NEWS
|
||||
4. [RC1] Update version and library numbers in `meson.build`
|
||||
5. Check dbus docs with `meson compile -C build man/update-dbus-docs`
|
||||
5. Check dbus docs with `meson compile -C build update-dbus-docs`
|
||||
6. Tag the release: `version=vXXX-rcY && git tag -s "${version}" -m "systemd ${version}"`
|
||||
7. Do `meson compile -C build`
|
||||
8. Make sure that the version string and package string match: `build/systemctl --version`
|
||||
|
@ -198,25 +198,6 @@ run_target(
|
||||
|
||||
############################################################
|
||||
|
||||
if dbus_docs.length() > 0
|
||||
custom_target(
|
||||
'update-dbus-docs',
|
||||
output : 'update-dbus-docs',
|
||||
command : [update_dbus_docs_py,
|
||||
'--build-dir=@0@'.format(project_build_root),
|
||||
'@INPUT@'],
|
||||
input : dbus_docs)
|
||||
|
||||
if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
|
||||
test('dbus-docs-fresh',
|
||||
update_dbus_docs_py,
|
||||
args : ['--build-dir=@0@'.format(project_build_root),
|
||||
'--test'] + dbus_docs)
|
||||
endif
|
||||
endif
|
||||
|
||||
############################################################
|
||||
|
||||
custom_target(
|
||||
'update-man-rules',
|
||||
output : 'update-man-rules',
|
||||
|
19
meson.build
19
meson.build
@ -3605,6 +3605,25 @@ run_target(
|
||||
depends : [man, libsystemd, libudev],
|
||||
command : [check_api_docs_sh, libsystemd.full_path(), libudev.full_path()])
|
||||
|
||||
############################################################
|
||||
|
||||
if dbus_docs.length() > 0
|
||||
custom_target(
|
||||
'update-dbus-docs',
|
||||
output : 'update-dbus-docs',
|
||||
command : [update_dbus_docs_py,
|
||||
'--build-dir=@0@'.format(project_build_root),
|
||||
'@INPUT@'],
|
||||
input : dbus_docs)
|
||||
|
||||
if conf.get('BUILD_MODE') == 'BUILD_MODE_DEVELOPER'
|
||||
test('dbus-docs-fresh',
|
||||
update_dbus_docs_py,
|
||||
args : ['--build-dir=@0@'.format(project_build_root),
|
||||
'--test'] + dbus_docs)
|
||||
endif
|
||||
endif
|
||||
|
||||
############################################################
|
||||
watchdog_opt = service_watchdog == '' ? 'disabled' : service_watchdog
|
||||
|
||||
|
@ -322,4 +322,4 @@ if __name__ == '__main__':
|
||||
|
||||
if opts.test and outdated:
|
||||
exit(f'Outdated pages: {", ".join(outdated)}\n'
|
||||
f'Hint: ninja -C {opts.build_dir} man/update-dbus-docs')
|
||||
f'Hint: ninja -C {opts.build_dir} update-dbus-docs')
|
||||
|
Loading…
Reference in New Issue
Block a user