Skip to content

Commit 31a98c2

Browse files
dwsuseigaw
authored andcommitted
scripts: Move helper scripts to a central place
The helper scripts for maintaining are distributed over several directories. Let's move them to the scripts directory. Signed-off-by: Daniel Wagner <[email protected]>
1 parent 572189c commit 31a98c2

10 files changed

Lines changed: 11 additions & 7 deletions

File tree

doc/meson.build

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,20 @@ endforeach
4545

4646
subdir('rst')
4747

48+
top_source_dir = meson.current_source_dir() + '/../'
49+
4850
want_docs = get_option('docs')
4951
want_docs_build = get_option('docs-build')
50-
kernel_doc = find_program('kernel-doc')
51-
kernel_doc_check = find_program('kernel-doc-check')
52+
kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc')
53+
kernel_doc_check = find_program(top_source_dir +'scripts/kernel-doc-check')
5254

5355
test('kdoc', kernel_doc_check, args: api_paths)
5456

5557
if want_docs != 'false'
5658

5759
if want_docs == 'all' or want_docs == 'man'
5860
mandir = join_paths(get_option('mandir'), 'man2')
59-
list_man_pages = find_program('list-man-pages.sh')
61+
list_man_pages = find_program(top_source_dir + 'scripts/list-man-pages.sh')
6062
if want_docs_build
6163
foreach apif : api_paths
6264
c = run_command(list_man_pages, apif, check: true)
@@ -79,7 +81,7 @@ if want_docs != 'false'
7981
endforeach
8082
else
8183
if want_docs == 'all' or want_docs == 'man'
82-
list_pre_compiled = find_program('list-pre-compiled.sh')
84+
list_pre_compiled = find_program(top_source_dir + 'scripts/list-pre-compiled.sh')
8385
m = run_command(list_pre_compiled, check: true)
8486
man_pages = m.stdout().strip().split('\n')
8587
install_data(man_pages, install_dir: mandir)

doc/rst/meson.build

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1+
top_source_dir = meson.current_source_dir() + '/../../'
2+
13
want_docs = get_option('docs')
24

35
if want_docs != 'false'
46
want_docs_build = get_option('docs-build')
57
rstdir = get_option('rstdir')
68
if want_docs_build
7-
kernel_doc = find_program('../kernel-doc')
9+
kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc')
810

911
conf = configuration_data()
1012
conf.set('SYSCONFDIR', sysconfdir)
1113

1214
if want_docs == 'all' or want_docs == 'rst' or want_docs == 'html'
1315
foreach apif : api_files
14-
afile = files('../../src/nvme/' + apif)
16+
afile = files(top_source_dir + 'src/nvme/' + apif)
1517
subst = configure_file(
1618
input: afile,
1719
output: '@[email protected]',

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ version_tag = get_option('version-tag')
4242
if version_tag != ''
4343
conf.set('GIT_VERSION', '"@0@"'.format(version_tag))
4444
else
45-
r = run_command('meson-vcs-tag.sh',
45+
r = run_command('scripts/meson-vcs-tag.sh',
4646
meson.current_source_dir(),
4747
meson.project_version(),
4848
check: true)
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)