diff --git a/changelog.md b/changelog.md index dc3a4bf..0fd9976 100644 --- a/changelog.md +++ b/changelog.md @@ -2,6 +2,7 @@ ## 0.2.0 _(unknown)_ +* *Chore*: removed dependency to jansson (use own json implementation due to performace issues) * *Feature*: reduce required libwebsockets version to 4.0.0 ## 0.1.0 _(Sat Jun 26 2020)_ diff --git a/lib/webfuse_provider/impl/request.h b/lib/webfuse_provider/impl/request.h index d647f27..337bfac 100644 --- a/lib/webfuse_provider/impl/request.h +++ b/lib/webfuse_provider/impl/request.h @@ -1,7 +1,6 @@ #ifndef WFP_IMPL_REQUEST_H #define WFP_IMPL_REQUEST_H -#include #include "webfuse_provider/impl/provider.h" #include "webfuse_provider/status.h" diff --git a/meson.build b/meson.build index 8ae3933..a8496af 100644 --- a/meson.build +++ b/meson.build @@ -10,8 +10,6 @@ if not libwebsockets_dep.found() libwebsockets_dep = libwebsockets.dependency('websockets_shared') endif -jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep']) - pkg_config = import('pkgconfig') # Webfuse provider @@ -53,31 +51,31 @@ webfuse_provider_static = static_library('webfuse_provider', 'lib/webfuse_provider/impl/operation/read.c', c_args: ['-fvisibility=hidden'], include_directories: ['include', 'lib'], - dependencies: [libwebsockets_dep, jansson_dep]) + dependencies: [libwebsockets_dep]) webfuse_provider_static_dep = declare_dependency( include_directories: ['include'], link_with: webfuse_provider_static, - dependencies: [libwebsockets_dep, jansson_dep]) + dependencies: [libwebsockets_dep]) webfuse_provider = shared_library('webfuse_provider', 'lib/webfuse_provider/api.c', version: meson.project_version(), c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'], include_directories: ['include', 'lib'], - dependencies: [webfuse_provider_static_dep, libwebsockets_dep, jansson_dep], + dependencies: [webfuse_provider_static_dep, libwebsockets_dep], install: true) webfuse_provider_dep = declare_dependency( include_directories: ['include'], link_with: [webfuse_provider], - dependencies: [libwebsockets_dep, jansson_dep]) + dependencies: [libwebsockets_dep]) install_subdir('include/webfuse_provider', install_dir: 'include') pkg_config.generate( libraries: [webfuse_provider], - requires: ['libwebsockets', 'jansson'], + requires: ['libwebsockets'], subdirs: '.', version: meson.project_version(), name: 'libwebfuse_provider', @@ -108,7 +106,6 @@ alltests = executable('alltests', 'test/webfuse_provider/test_util/ws_server.cc', 'test/webfuse_provider/test_util/webfuse_server.cc', 'test/webfuse_provider/test_util/client.cc', - 'test/webfuse_provider/test_util/jansson_test_environment.cc', 'test/webfuse_provider/test_util/json_doc.cc', 'test/webfuse_provider/mocks/fake_invokation_context.cc', 'test/webfuse_provider/mocks/mock_request.cc', @@ -159,7 +156,6 @@ alltests = executable('alltests', dependencies: [ webfuse_provider_static_dep, libwebsockets_dep, - jansson_dep, gtest_dep, gmock_main_dep, test_certs_dep diff --git a/subprojects/jansson.wrap b/subprojects/jansson.wrap deleted file mode 100644 index 6282afd..0000000 --- a/subprojects/jansson.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory = jansson-2.11 - -source_url = http://www.digip.org/jansson/releases/jansson-2.11.tar.bz2 -source_filename = jansson-2.11.tar.bz2 -source_hash = 783132e2fc970feefc2fa54199ef65ee020bd8e0e991a78ea44b8586353a0947 - -patch_url = https://wrapdb.mesonbuild.com/v1/projects/jansson/2.11/3/get_zip -patch_filename = jansson-2.11-3-wrap.zip -patch_hash = 0bcac510994890048d42658c674e33dd7d88715fc1e3bf49d10012f57b0e0020 \ No newline at end of file diff --git a/test/webfuse_provider/test_util/jansson_test_environment.cc b/test/webfuse_provider/test_util/jansson_test_environment.cc deleted file mode 100644 index 24d091f..0000000 --- a/test/webfuse_provider/test_util/jansson_test_environment.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include -#include - -namespace webfuse_test -{ - -class JanssonTestEnvironment: public ::testing::Environment -{ -public: - void SetUp() - { - json_object_seed(0); - } -}; -# -} \ No newline at end of file