Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2024-10-27 20:44:10 +00:00
Code Issues Releases Wiki Activity

remove dependency to jansson (own json implementation use due to performance issues)

Browse Source
This commit is contained in:
Falk Werner 2020-07-12 13:11:24 +02:00
parent 7d4f6a3d55
commit 2506873805
5 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.md
View File

@ -2,6 +2,7 @@
## 0.2.0 _(unknown)_ ## 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 * *Feature*: reduce required libwebsockets version to 4.0.0
## 0.1.0 _(Sat Jun 26 2020)_ ## 0.1.0 _(Sat Jun 26 2020)_

1
lib/webfuse_provider/impl/request.h
View File

@ -1,7 +1,6 @@
#ifndef WFP_IMPL_REQUEST_H #ifndef WFP_IMPL_REQUEST_H
#define WFP_IMPL_REQUEST_H #define WFP_IMPL_REQUEST_H
#include <jansson.h>
#include "webfuse_provider/impl/provider.h" #include "webfuse_provider/impl/provider.h"
#include "webfuse_provider/status.h" #include "webfuse_provider/status.h"

14
meson.build
View File

@ -10,8 +10,6 @@ if not libwebsockets_dep.found()
libwebsockets_dep = libwebsockets.dependency('websockets_shared') libwebsockets_dep = libwebsockets.dependency('websockets_shared')
endif endif
jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep'])
pkg_config = import('pkgconfig') pkg_config = import('pkgconfig')
# Webfuse provider # Webfuse provider
@ -53,31 +51,31 @@ webfuse_provider_static = static_library('webfuse_provider',
'lib/webfuse_provider/impl/operation/read.c', 'lib/webfuse_provider/impl/operation/read.c',
c_args: ['-fvisibility=hidden'], c_args: ['-fvisibility=hidden'],
include_directories: ['include', 'lib'], include_directories: ['include', 'lib'],
dependencies: [libwebsockets_dep, jansson_dep]) dependencies: [libwebsockets_dep])
webfuse_provider_static_dep = declare_dependency( webfuse_provider_static_dep = declare_dependency(
include_directories: ['include'], include_directories: ['include'],
link_with: webfuse_provider_static, link_with: webfuse_provider_static,
dependencies: [libwebsockets_dep, jansson_dep]) dependencies: [libwebsockets_dep])
webfuse_provider = shared_library('webfuse_provider', webfuse_provider = shared_library('webfuse_provider',
'lib/webfuse_provider/api.c', 'lib/webfuse_provider/api.c',
version: meson.project_version(), version: meson.project_version(),
c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'], c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'],
include_directories: ['include', 'lib'], include_directories: ['include', 'lib'],
dependencies: [webfuse_provider_static_dep, libwebsockets_dep, jansson_dep], dependencies: [webfuse_provider_static_dep, libwebsockets_dep],
install: true) install: true)
webfuse_provider_dep = declare_dependency( webfuse_provider_dep = declare_dependency(
include_directories: ['include'], include_directories: ['include'],
link_with: [webfuse_provider], link_with: [webfuse_provider],
dependencies: [libwebsockets_dep, jansson_dep]) dependencies: [libwebsockets_dep])
install_subdir('include/webfuse_provider', install_dir: 'include') install_subdir('include/webfuse_provider', install_dir: 'include')
pkg_config.generate( pkg_config.generate(
libraries: [webfuse_provider], libraries: [webfuse_provider],
requires: ['libwebsockets', 'jansson'], requires: ['libwebsockets'],
subdirs: '.', subdirs: '.',
version: meson.project_version(), version: meson.project_version(),
name: 'libwebfuse_provider', name: 'libwebfuse_provider',
@ -108,7 +106,6 @@ alltests = executable('alltests',
'test/webfuse_provider/test_util/ws_server.cc', 'test/webfuse_provider/test_util/ws_server.cc',
'test/webfuse_provider/test_util/webfuse_server.cc', 'test/webfuse_provider/test_util/webfuse_server.cc',
'test/webfuse_provider/test_util/client.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/test_util/json_doc.cc',
'test/webfuse_provider/mocks/fake_invokation_context.cc', 'test/webfuse_provider/mocks/fake_invokation_context.cc',
'test/webfuse_provider/mocks/mock_request.cc', 'test/webfuse_provider/mocks/mock_request.cc',
@ -159,7 +156,6 @@ alltests = executable('alltests',
dependencies: [ dependencies: [
webfuse_provider_static_dep, webfuse_provider_static_dep,
libwebsockets_dep, libwebsockets_dep,
jansson_dep,
gtest_dep, gtest_dep,
gmock_main_dep, gmock_main_dep,
test_certs_dep test_certs_dep

10
subprojects/jansson.wrap
View File

@ -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

16
test/webfuse_provider/test_util/jansson_test_environment.cc
View File

@ -1,16 +0,0 @@
#include <gtest/gtest.h>
#include <jansson.h>
namespace webfuse_test
{
class JanssonTestEnvironment: public ::testing::Environment
{
public:
void SetUp()
{
json_object_seed(0);
}
};
#
}