From 31a98c241396bebc71278cccd0c52272292caec3 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Fri, 23 Jun 2023 10:02:02 +0200 Subject: [PATCH] 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 --- doc/meson.build | 10 ++++++---- doc/rst/meson.build | 6 ++++-- meson.build | 2 +- {doc => scripts}/kernel-doc | 0 {doc => scripts}/kernel-doc-check | 0 {doc => scripts}/list-man-pages.sh | 0 {doc => scripts}/list-pre-compiled.sh | 0 meson-vcs-tag.sh => scripts/meson-vcs-tag.sh | 0 release.sh => scripts/release.sh | 0 {doc => scripts}/update-docs.sh | 0 10 files changed, 11 insertions(+), 7 deletions(-) rename {doc => scripts}/kernel-doc (100%) rename {doc => scripts}/kernel-doc-check (100%) mode change 100644 => 100755 rename {doc => scripts}/list-man-pages.sh (100%) rename {doc => scripts}/list-pre-compiled.sh (100%) rename meson-vcs-tag.sh => scripts/meson-vcs-tag.sh (100%) rename release.sh => scripts/release.sh (100%) rename {doc => scripts}/update-docs.sh (100%) diff --git a/doc/meson.build b/doc/meson.build index 480db170..f12f3b98 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -45,10 +45,12 @@ endforeach subdir('rst') +top_source_dir = meson.current_source_dir() + '/../' + want_docs = get_option('docs') want_docs_build = get_option('docs-build') -kernel_doc = find_program('kernel-doc') -kernel_doc_check = find_program('kernel-doc-check') +kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc') +kernel_doc_check = find_program(top_source_dir +'scripts/kernel-doc-check') test('kdoc', kernel_doc_check, args: api_paths) @@ -56,7 +58,7 @@ if want_docs != 'false' if want_docs == 'all' or want_docs == 'man' mandir = join_paths(get_option('mandir'), 'man2') - list_man_pages = find_program('list-man-pages.sh') + list_man_pages = find_program(top_source_dir + 'scripts/list-man-pages.sh') if want_docs_build foreach apif : api_paths c = run_command(list_man_pages, apif, check: true) @@ -79,7 +81,7 @@ if want_docs != 'false' endforeach else if want_docs == 'all' or want_docs == 'man' - list_pre_compiled = find_program('list-pre-compiled.sh') + list_pre_compiled = find_program(top_source_dir + 'scripts/list-pre-compiled.sh') m = run_command(list_pre_compiled, check: true) man_pages = m.stdout().strip().split('\n') install_data(man_pages, install_dir: mandir) diff --git a/doc/rst/meson.build b/doc/rst/meson.build index ea791155..e54c381b 100644 --- a/doc/rst/meson.build +++ b/doc/rst/meson.build @@ -1,17 +1,19 @@ +top_source_dir = meson.current_source_dir() + '/../../' + want_docs = get_option('docs') if want_docs != 'false' want_docs_build = get_option('docs-build') rstdir = get_option('rstdir') if want_docs_build - kernel_doc = find_program('../kernel-doc') + kernel_doc = find_program(top_source_dir + 'scripts/kernel-doc') conf = configuration_data() conf.set('SYSCONFDIR', sysconfdir) if want_docs == 'all' or want_docs == 'rst' or want_docs == 'html' foreach apif : api_files - afile = files('../../src/nvme/' + apif) + afile = files(top_source_dir + 'src/nvme/' + apif) subst = configure_file( input: afile, output: '@BASENAME@.subst', diff --git a/meson.build b/meson.build index 7cb1049f..5ee8a3f1 100644 --- a/meson.build +++ b/meson.build @@ -42,7 +42,7 @@ version_tag = get_option('version-tag') if version_tag != '' conf.set('GIT_VERSION', '"@0@"'.format(version_tag)) else - r = run_command('meson-vcs-tag.sh', + r = run_command('scripts/meson-vcs-tag.sh', meson.current_source_dir(), meson.project_version(), check: true) diff --git a/doc/kernel-doc b/scripts/kernel-doc similarity index 100% rename from doc/kernel-doc rename to scripts/kernel-doc diff --git a/doc/kernel-doc-check b/scripts/kernel-doc-check old mode 100644 new mode 100755 similarity index 100% rename from doc/kernel-doc-check rename to scripts/kernel-doc-check diff --git a/doc/list-man-pages.sh b/scripts/list-man-pages.sh similarity index 100% rename from doc/list-man-pages.sh rename to scripts/list-man-pages.sh diff --git a/doc/list-pre-compiled.sh b/scripts/list-pre-compiled.sh similarity index 100% rename from doc/list-pre-compiled.sh rename to scripts/list-pre-compiled.sh diff --git a/meson-vcs-tag.sh b/scripts/meson-vcs-tag.sh similarity index 100% rename from meson-vcs-tag.sh rename to scripts/meson-vcs-tag.sh diff --git a/release.sh b/scripts/release.sh similarity index 100% rename from release.sh rename to scripts/release.sh diff --git a/doc/update-docs.sh b/scripts/update-docs.sh similarity index 100% rename from doc/update-docs.sh rename to scripts/update-docs.sh -- 2.50.1