meson: exclude rst files from being installed with the scripts
and add them nicely to the sphinx_files without referencing '..' paths
This commit is contained in:
@@ -69,6 +69,7 @@ if build_doc
|
|||||||
meson.current_source_dir()/'..'/'README.rst',
|
meson.current_source_dir()/'..'/'README.rst',
|
||||||
meson.current_source_dir()/'..'/'NEWS.rst',
|
meson.current_source_dir()/'..'/'NEWS.rst',
|
||||||
)
|
)
|
||||||
|
sphinx_files += scripts_doc_files
|
||||||
subdir('rst')
|
subdir('rst')
|
||||||
|
|
||||||
sphinx_conf_data = configuration_data()
|
sphinx_conf_data = configuration_data()
|
||||||
|
@@ -2,9 +2,6 @@
|
|||||||
sphinx_files += files(
|
sphinx_files += files(
|
||||||
'existing_scripts.rst',
|
'existing_scripts.rst',
|
||||||
'default_nodes.rst',
|
'default_nodes.rst',
|
||||||
meson.current_source_dir()/'..'/'..'/'..'/'src'/'scripts'/'default-nodes'/'README.rst',
|
|
||||||
'device.rst',
|
'device.rst',
|
||||||
meson.current_source_dir()/'..'/'..'/'..'/'src'/'scripts'/'device'/'README.rst',
|
|
||||||
'linking.rst',
|
'linking.rst',
|
||||||
meson.current_source_dir()/'..'/'..'/'..'/'src'/'scripts'/'linking'/'README.rst',
|
|
||||||
)
|
)
|
||||||
|
@@ -136,12 +136,12 @@ common_flags = [
|
|||||||
add_project_arguments(cc.get_supported_arguments(common_flags), language: 'c')
|
add_project_arguments(cc.get_supported_arguments(common_flags), language: 'c')
|
||||||
|
|
||||||
subdir('lib')
|
subdir('lib')
|
||||||
subdir('docs')
|
|
||||||
if build_modules
|
if build_modules
|
||||||
subdir('modules')
|
subdir('modules')
|
||||||
endif
|
endif
|
||||||
subdir('src')
|
subdir('src')
|
||||||
subdir('po')
|
subdir('po')
|
||||||
|
subdir('docs')
|
||||||
|
|
||||||
if get_option('tests')
|
if get_option('tests')
|
||||||
subdir('tests')
|
subdir('tests')
|
||||||
|
@@ -1,3 +1,14 @@
|
|||||||
|
scripts_doc_files_relative = [
|
||||||
|
'default-nodes'/'README.rst',
|
||||||
|
'device'/'README.rst',
|
||||||
|
'linking'/'README.rst',
|
||||||
|
]
|
||||||
|
|
||||||
|
scripts_doc_files = []
|
||||||
|
foreach f : scripts_doc_files_relative
|
||||||
|
scripts_doc_files += files('scripts'/f)
|
||||||
|
endforeach
|
||||||
|
|
||||||
if build_tools
|
if build_tools
|
||||||
subdir('tools')
|
subdir('tools')
|
||||||
endif
|
endif
|
||||||
@@ -8,6 +19,7 @@ if build_daemon
|
|||||||
|
|
||||||
install_subdir('scripts',
|
install_subdir('scripts',
|
||||||
install_dir: wireplumber_data_dir,
|
install_dir: wireplumber_data_dir,
|
||||||
|
exclude_files: scripts_doc_files_relative,
|
||||||
strip_directory : false
|
strip_directory : false
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user