Fix subproject install, yajltcl bench dep

Author: cyanogilvie

claude/skills/rl_json/SKILL.md

@@ -248,8 +248,8 @@ set users {[]}
 db eval {SELECT name, email, active FROM users} {
     json set users end+1 [json template {
         {
-            "name": "~S:name",
-            "email": "~S:email",
+            "name":   "~S:name",
+            "email":  "~S:email",
             "active": "~B:active"
         }
     }]

generic/rl_json.c

@@ -4138,7 +4138,7 @@ static int jsonNRObj(ClientData cdata, Tcl_Interp* interp, int objc, Tcl_Obj *co
 				};
 				int idx;
 
-				enum {A_cmd, A_KEY, A_objc};
+				enum {A_cmd=1, A_KEY, A_objc};
 				CHECK_ARGS("key");
 
 				TEST_OK(Tcl_GetIndexFromObjStruct(interp, objv[A_KEY], tstr, sizeof(struct teststring), "key", TCL_EXACT, &idx));

meson.build

@@ -1,5 +1,5 @@
 project('rl_json', 'c',
-  version:            '0.17.1',
+  version:            '0.17.2',
   default_options:    ['c_std=c23,c2x,c17,c11','warning_level=3','werror=true'],
   meson_version:      '>=1.3.0',
 )
@@ -31,15 +31,16 @@ tea_want_shims = [
   'Tcl_GetBytesFromObj',
 ]
 
-# Optional dependency to compare our performance against yajl-tcl's in the benchmarks
-yajl_tcl_sub = subproject('yajl-tcl', required: false)
-tea_bench_deps = yajl_tcl_sub.found() ? [yajl_tcl_sub.get_variable('yajltcl_mod')] : []
-
 deps = []
 inc = []
 
 subdir('teabase/init')
 
+# Optional dependency to compare our performance against yajl-tcl's in the benchmarks
+yajl_tcl_sub = subproject('yajl-tcl', required: false)
+tea_bench_extra_depends = yajl_tcl_sub.found() ? [yajl_tcl_sub.get_variable('yajltcl_mod')] : []
+tea_bench_deps += yajl_tcl_sub.get_variable('yajl_tcl_dep')
+
 # Feature detection (must come after teabase/init which provides tcl_dep) <<<
 conf.set10('HAVE___BUILTIN_FFSLL',      cc.has_function('__builtin_ffsll'))
 conf.set10('HAVE_FFSLL',                cc.has_function('ffsll', prefix: '#include <strings.h>'))
@@ -76,8 +77,9 @@ deps += declare_dependency(
       meson.project_build_root(),
       meson.project_source_root() / 'generic/rl_json.decls',
     ],
-    install: true,
+    install:     true,
     install_dir: [false, pkg_dir],
+    install_tag: [false, meson.is_subproject() ? 'deps' : 'runtime'],
   ),
 )
 
@@ -116,6 +118,7 @@ inc += include_directories('.')
 install_data(
     'generic/rl_json.h',
     install_dir: pkg_dir,
+    install_tag: meson.is_subproject() ? 'deps' : 'runtime',
 )
 
 # teabase builds the shared module and generates config.h
@@ -128,6 +131,7 @@ stubs_lib = static_library(meson.project_name() + 'stub',
   include_directories:  inc,
   install:              true,
   install_dir:          pkg_dir,
+  install_tag:          meson.is_subproject() ? 'deps' : 'runtime',
 )
 
 # Generate relocatable pkg-config file for stub library
@@ -142,14 +146,14 @@ configure_file(
   configuration:  pc_conf,
   install_dir:    tcl_dep.get_variable('libdir') / 'pkgconfig',
   install:        true,
+  install_tag:    meson.is_subproject() ? 'deps' : 'runtime',
 )
 
 # Override-dependency for meson subproject consumers. Mirrors the
 # tcl_pkg_path variable shipped in the .pc file so that a downstream
 # `dependency('rl_json', fallback: ['rl_json', 'rl_json_dep']).get_variable('tcl_pkg_path')`
 # returns the right directory regardless of whether rl_json was found
 # via pkg-config or rebuilt from source as a subproject.
-fs = import('fs')
 rl_json_dep = declare_dependency(
   variables: {
     'tcl_pkg_path': fs.parent(pkg_so.full_path()),

subprojects/packagefiles/yajl-tcl/meson.build

@@ -1,6 +1,6 @@
 project('yajltcl', 'c',
   version:          '1.8.1',
-  meson_version:    '>=0.64.0',
+  meson_version:    '>=1.3.0',
   default_options:  ['warning_level=1', 'werror=false'],
 )
 
@@ -36,7 +36,13 @@ configure_file(input: 'pkgIndex.tcl.in',  output: 'pkgIndex.tcl', configuration:
 configure_file(input: 'yajl.tcl',         output: 'yajl.tcl',     copy: true)
 
 # Wrap fallback dependency
-yajl_tcl_dep = declare_dependency(dependencies: deps)
+yajl_tcl_dep = declare_dependency(
+  dependencies: deps,
+  variables: {
+    'tcl_pkg_path': fs.parent(yajltcl_mod.full_path()),
+    'version':      meson.project_version(),
+  },
+)
 meson.override_dependency('yajl-tcl', yajl_tcl_dep)
 
 # Extend devenv so 'package require yajltcl' works during build