libnvme: move accessor generator to tools/generator/

The code generator (generate-accessors.c, update-accessors.sh, and
supporting files) does not belong alongside the library source in
src/nvme/. Move it to tools/generator/ to make clear it is developer
tooling rather than library code.

While at it:
- Move accessors.ld from src/nvme/ to src/, alongside the other
  version scripts (libnvme.ld, libnvmf.ld). src/meson.build now
  picks it up directly via meson.current_source_dir(), so no
  cross-directory variable passing is needed.
- Eliminate src/nvme/meson.build; its generator build rules move
  to tools/generator/meson.build.
- Add a banner to the generated accessors.ld (SPDX, copyright,
  ASCII logo, and regeneration instructions) matching the banners
  already present in accessors.c and accessors.h.

The generated files (accessors.c, accessors.h) remain in src/nvme/
where the compiler expects them.

Signed-off-by: Martin Belanger <[email protected]>

Author: Martin Belanger

libnvme/meson.build

@@ -30,7 +30,9 @@ if want_libnvme
     )
 
     ############################################################################
-    subdir('src')       # declares: libnvme_dep
+    libnvme_srcroot = meson.current_source_dir() # needed by tools/generator
+    subdir('tools/generator')  # generate code needed by src below
+    subdir('src')              # declares: libnvme_dep
     subdir('libnvme')
     if get_option('tests')
         subdir('test')

libnvme/src/nvme/accessors.ld libnvme/src/accessors.ldlibnvme/src/nvme/accessors.ld renamed to libnvme/src/accessors.ld

@@ -1,3 +1,12 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+/**
+ * This file is part of libnvme.
+ *
+ * Copyright (c) 2025, Dell Technologies Inc. or its subsidiaries.
+ * Authors: Martin Belanger <[email protected]>
+ *
+ */
 
 LIBNVME_ACCESSORS_3 {
 	global:

libnvme/src/meson.build

@@ -56,8 +56,6 @@ else
     sources += 'nvme/no-json.c'
 endif
 
-subdir('nvme')  # declares: accessors_ld_full_path
-
 deps = [
     config_dep,
     ccan_dep,
@@ -70,10 +68,11 @@ deps = [
 
 nvme_ld = meson.current_source_dir() / 'libnvme.ld'
 nvmf_ld = meson.current_source_dir() / 'libnvmf.ld'
+accessors_ld = meson.current_source_dir() / 'accessors.ld'
 
 link_args = [
     '-Wl,--version-script=@0@'.format(nvme_ld),
-    '-Wl,--version-script=@0@'.format(accessors_ld_full_path),
+    '-Wl,--version-script=@0@'.format(accessors_ld),
 ]
 
 libconf = configuration_data()

libnvme/src/nvme/accessors.c

@@ -13,6 +13,9 @@
  *  \____|\___|_| |_|\___|_|  \__,_|\__\___|\__,_|  \____\___/ \__,_|\___|
  *
  * Auto-generated struct member accessors (setter/getter)
+ *
+ * To update run: meson compile -C [BUILD-DIR] update-accessors
+ * Or:            make update-accessors
  */
 #include <stdlib.h>
 #include <string.h>

libnvme/src/nvme/accessors.h

@@ -13,6 +13,9 @@
  *  \____|\___|_| |_|\___|_|  \__,_|\__\___|\__,_|  \____\___/ \__,_|\___|
  *
  * Auto-generated struct member accessors (setter/getter)
+ *
+ * To update run: meson compile -C [BUILD-DIR] update-accessors
+ * Or:            make update-accessors
  */
 #ifndef _ACCESSORS_H_
 #define _ACCESSORS_H_

…src/nvme/generate-accessors-exclude.list …enerator/generate-accessors-exclude.listlibnvme/src/nvme/generate-accessors-exclude.list renamed to libnvme/tools/generator/generate-accessors-exclude.list libnvme/src/nvme/generate-accessors-exclude.list renamed to libnvme/tools/generator/generate-accessors-exclude.list

@@ -70,6 +70,7 @@
 /* checkpatch requires C99 // SPDX in *.c and block-style SPDX in *.h */
 static const char *spdx_c = "// SPDX-License-Identifier: LGPL-2.1-or-later";
 static const char *spdx_h = "/* SPDX-License-Identifier: LGPL-2.1-or-later */";
+static const char *spdx_ld = "# SPDX-License-Identifier: LGPL-2.1-or-later";
 
 static const char *banner =
 	"/**\n"
@@ -85,6 +86,9 @@ static const char *banner =
 	" *  \\____|\\___|_| |_|\\___|_|  \\__,_|\\__\\___|\\__,_|  \\____\\___/ \\__,_|\\___|\n"
 	" *\n"
 	" * Auto-generated struct member accessors (setter/getter)\n"
+	" *\n"
+	" * To update run: meson compile -C [BUILD-DIR] update-accessors\n"
+	" * Or:            make update-accessors\n"
 	" */";
 
 /**
@@ -2095,9 +2099,13 @@ int main(int argc, char *argv[])
 	mkdir_fullpath(conf.l_fname, 0755); /* create output folder if needed */
 	generated_ld = fopen(conf.l_fname, "w");
 	fprintf(generated_ld,
+		"%s\n"
+		"\n"
+		"%s\n"
 		"\n"
 		"LIBNVME_ACCESSORS_3 {\n"
-		"	global:\n");
+		"	global:\n",
+		spdx_ld, banner);
 
 	/* Copy temporary file to output */
 	append_file(generated_ld, tmp_ld_map);

…src/nvme/generate-accessors-include.list …enerator/generate-accessors-include.listlibnvme/src/nvme/generate-accessors-include.list renamed to libnvme/tools/generator/generate-accessors-include.list libnvme/src/nvme/generate-accessors-include.list renamed to libnvme/tools/generator/generate-accessors-include.list

@@ -9,7 +9,7 @@
 # pre-generated and committed to the source tree.  They are NOT
 # regenerated during a normal build.
 #
-# To regenerate them after changing private.h or structs-to-include.txt:
+# To regenerate them after changing private.h or the include/exclude lists:
 #
 #   meson compile -C <build-dir> update-accessors
 
@@ -19,12 +19,19 @@
 # Usage: meson compile -C <build-dir> update-accessors
 # ---------------------------------------------------------------------------
 
-accessors_ld_full_path = meson.current_source_dir() / 'accessors.ld'
+# Generated source files go to src/nvme/ (alongside the library sources).
+# The generated version script goes to src/ (alongside the other .ld files).
+libnvme_src = libnvme_srcroot / 'src'
+libnvme_src_nvme = libnvme_src / 'nvme'
 
 generate_accessors = executable(
     'generate-accessors',
-    'generate-accessors.c',
-    c_args: ['-D_GNU_SOURCE'],
+    [
+        'generate-accessors.c',
+    ],
+    c_args: [
+        '-D_GNU_SOURCE',
+    ],
     dependencies: [
         config_dep,
     ],
@@ -35,12 +42,13 @@ generate_accessors = executable(
 run_target(
     'update-accessors',
     command: [
-        meson.current_source_dir() / 'update-accessors.sh',
+        'update-accessors.sh',
         generate_accessors,
-        meson.current_source_dir(),
+        libnvme_src_nvme,
+        libnvme_src,
         meson.current_source_dir() / 'generate-accessors-include.list',
         meson.current_source_dir() / 'generate-accessors-exclude.list',
-        meson.current_source_dir() / 'private.h',
+        libnvme_src_nvme / 'private.h',
     ],
     depends: generate_accessors,
 )