Mercurial > irccd
changeset 761:f25c878d823b
Irccd: re-enable javascript in irccd, irccd-test
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sat, 11 Aug 2018 21:49:09 +0200 |
| parents | 35c1517d705d |
| children | 28f493661157 |
| files | irccd-test/main.cpp irccd/main.cpp |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/irccd-test/main.cpp Fri Aug 10 12:29:00 2018 +0200 +++ b/irccd-test/main.cpp Sat Aug 11 21:49:09 2018 +0200 @@ -43,6 +43,7 @@ #include <irccd/test/debug_server.hpp> #if defined(IRCCD_HAVE_JS) +# include <irccd/js/js_api.hpp> # include <irccd/js/js_plugin.hpp> #endif @@ -633,11 +634,11 @@ daemon = std::make_unique<irccd>(io); daemon->plugins().add_loader(std::make_unique<dynlib_plugin_loader>()); -#if defined(HAVE_JS) - auto loader = std::make_unique<js_plugin_loader>(); +#if defined(IRCCD_HAVE_JS) + auto loader = std::make_unique<js::js_plugin_loader>(*daemon); - for (const auto& f : jsapi::registry) - daemon->get_modules().push_back(f()); + for (const auto& f : js::js_api::registry) + loader->get_modules().push_back(f()); daemon->plugins().add_loader(std::move(loader)); #endif
--- a/irccd/main.cpp Fri Aug 10 12:29:00 2018 +0200 +++ b/irccd/main.cpp Sat Aug 11 21:49:09 2018 +0200 @@ -34,9 +34,9 @@ #include <irccd/daemon/plugin_service.hpp> #include <irccd/daemon/transport_service.hpp> -#if defined(HAVE_JS) +#if defined(IRCCD_HAVE_JS) +# include <irccd/js/js_api.hpp> # include <irccd/js/js_plugin.hpp> -# include <irccd/js/jsapi.hpp> #endif namespace irccd { @@ -183,10 +183,10 @@ // 2. Load plugin loaders. instance->plugins().add_loader(std::make_unique<dynlib_plugin_loader>()); -#if defined(HAVE_JS) - auto loader = std::make_unique<js_plugin_loader>(); +#if defined(IRCCD_HAVE_JS) + auto loader = std::make_unique<js::js_plugin_loader>(*instance); - for (const auto& f : jsapi::registry) + for (const auto& f : js::js_api::registry) loader->get_modules().push_back(f()); instance->plugins().add_loader(std::move(loader));