Iterate over the external plugin system once again ##core

Author: radare

libr/core/core.c

@@ -2691,6 +2691,7 @@ R_API bool r_core_init(RCore *core) {
 	core->autocomplete = R_NEW0 (RCoreAutocomplete);
 	r_core_plugins_init (core->rcmd);
 	r_core_config_init (core);
+	r_core_plugins_load (core->rcmd);
 	core->print->reg = core->anal->reg;
 	core->print->get_register = r_reg_get;
 	core->print->get_register_value = r_reg_get_value;

libr/core/cplugin.c

@@ -67,7 +67,15 @@ R_API bool r_core_plugin_remove(RCmd *cmd, RCorePlugin *plugin) {
 
 R_IPI void r_core_plugins_init(RCmd *cmd) {
 	R_RETURN_IF_FAIL (cmd);
-	r_libstore_new (&cmd->libstore, cmd, cmd_static_plugins, (RListFree)core_plugin_session_free, NULL, (RLibPluginAddCb)r_core_plugin_add, (RLibPluginAddCb)r_core_plugin_remove);
+	r_libstore_new (&cmd->libstore, cmd, NULL, (RListFree)core_plugin_session_free, NULL, (RLibPluginAddCb)r_core_plugin_add, (RLibPluginAddCb)r_core_plugin_remove);
+	if (cmd->libstore) {
+		cmd->libstore->static_plugins = cmd_static_plugins;
+	}
+}
+
+R_IPI void r_core_plugins_load(RCmd *cmd) {
+	R_RETURN_IF_FAIL (cmd && cmd->libstore);
+	r_libstore_load (cmd->libstore);
 }
 
 R_API bool r_core_plugin_check(RCmd *cmd, const char *a0) {

libr/include/r_core.h

@@ -1065,6 +1065,7 @@ extern RCorePlugin r_core_plugin_writedwarf;
 extern RCorePlugin r_core_plugin_agD;
 
 R_IPI void r_core_plugins_init(RCmd *cmd);
+R_IPI void r_core_plugins_load(RCmd *cmd);
 R_IPI void r_core_plugins_fini(RCmd *cmd);
 R_API bool r_core_plugin_add(RCmd *cmd, RCorePlugin *plugin);
 R_API bool r_core_plugin_remove(RCmd *cmd, RCorePlugin *plugin);

libr/xps/meson.build

@@ -1,13 +1,28 @@
 fs = import('fs')
 
-#if not fs.is_file('r2plugins.h')
-  deps_h = configure_file(
-    input: 'r2plugins.h.in',
-    output: 'r2plugins.h',
-    configuration: configuration_data()
-  )
-#endif
-
+# External plugins drop their sources under libr/xps/p/<name>/r2plugin/, and
+# p/meson.build does `subdir('<name>/r2plugin')` for each entry. Plugin meson
+# files should append to core_plugins (plus r_core_additional_sources /
+# r_core_additional_inc) so the static plugin gets linked into libr_core.
 if fs.is_file('p/meson.build')
   subdir('p')
 endif
+
+# Auto-generate r2plugins.h from the final plugin lists. Runs after all
+# subdir() calls have had a chance to register plugins so that external
+# plugins don't need to manually append extern declarations.
+r2plugins_decls = '// Auto-generated by libr/xps/meson.build. Do not edit.\n'
+
+_builtin_core = ['prj', 'writedwarf', 'agD', 'java']
+
+foreach p : core_plugins
+  if not _builtin_core.contains(p)
+    r2plugins_decls += '#ifdef R2_CORE_H\nextern RCorePlugin r_core_plugin_' + p + ';\n#endif\n'
+  endif
+endforeach
+
+configure_file(
+  output: 'r2plugins.h',
+  input: 'r2plugins.h.in',
+  configuration: {'R2_XPS_EXTERN_DECLS': r2plugins_decls},
+)

libr/xps/r2plugins.h.in

@@ -1 +1 @@
-// nothing or yesthing
+@R2_XPS_EXTERN_DECLS@