From a311f5b51755fb1a5a7f12613720e5a863fa9625 Mon Sep 17 00:00:00 2001 From: Falk Werner Date: Sat, 23 May 2020 18:45:34 +0200 Subject: [PATCH] added adapter and unit test to meson build --- doc/build.md | 10 +++ meson.build | 191 ++++++++++++++++++++++++++++++++++++++++- subprojects/fuse3.wrap | 7 ++ subprojects/gtest.wrap | 10 +++ 4 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 subprojects/fuse3.wrap create mode 100644 subprojects/gtest.wrap diff --git a/doc/build.md b/doc/build.md index 6adb6f2..a82b31b 100644 --- a/doc/build.md +++ b/doc/build.md @@ -25,6 +25,16 @@ in order to reduce build dependencies. - **WIHTOU_PROVIDER**: omit provider library `cmake -DWITHOUT_PROVIDER=ON` +## Build using Meson (experimental) + +_Note: Meson build support is experimental. Do not rely on it._ + + meson .build + cd .build + ninja build + +_Note: Build options are not supported yet._ + ## Create API documentation To create API documentation, you must install doxygen and dot first. diff --git a/meson.build b/meson.build index 1b467e6..f2b8c01 100644 --- a/meson.build +++ b/meson.build @@ -2,9 +2,14 @@ project('webfuse', 'c', 'cpp', version: '0.3.0', license: 'LGPL-3.0+') libwebsockets_dep = dependency('libwebsockets', version: '>=4.0.1') jansson_dep = dependency('jansson', version: '>=2.11', fallback: ['jansson', 'jansson_dep']) +libfuse_dep = dependency('fuse3', version: '>=3.8.0', fallback: ['fuse3', 'libfuse_dep']) +gtest_dep = dependency('gtest', version: '>=1.10.0', fallback: ['gtest', 'gtest_dep']) +gmock_main_dep = dependency('gmock_main', version: '>=1.10.0', fallback: ['gtest', 'gmock_main_main_dep']) pkg_config = import('pkgconfig') +# Webfuse core + inc_dir = include_directories('include') private_inc_dir = include_directories('include', 'lib') @@ -33,7 +38,12 @@ webfuse_core = static_library('webfuse_core', webfuse_core_dep = declare_dependency( include_directories: inc_dir, - link_with: webfuse_core) + link_with: webfuse_core, + dependencies: [jansson_dep, libwebsockets_dep]) + +install_subdir('include/webfuse/core', install_dir: 'include/webfuse') + +# Webfuse provider webfuse_provider_static = static_library('webfuse_provider', 'lib/webfuse/provider/api.c', @@ -64,7 +74,16 @@ webfuse_provider = shared_library('webfuse_provider', version: meson.project_version(), c_args: ['-fvisibility=hidden', '-DWFP_API=WFP_EXPORT'], include_directories: private_inc_dir, - dependencies: [webfuse_provider_static_dep]) + dependencies: [webfuse_provider_static_dep], + install: true) + +webfuse_provider_dep = declare_dependency( + include_directories: inc_dir, + link_with: [webfuse_provider], + dependencies: [libwebsockets_dep, jansson_dep]) + +install_headers('include/webfuse_provider.h', subdir: 'webfuse') +install_subdir('include/webfuse/provider', install_dir: 'include/webfuse') pkg_config.generate( libraries: [webfuse_provider, jansson_dep, libwebsockets_dep], @@ -72,4 +91,170 @@ pkg_config.generate( version: meson.project_version(), name: 'libwebfuse_provider', filebase: 'webfuse_provider', - description: 'Provider library for websockets filesystem') \ No newline at end of file + description: 'Provider library for websockets filesystem') + +# Webfuse adapter + +webfuse_adapter_static = static_library('webfuse_adapter', + 'lib/webfuse/adapter/api.c', + 'lib/webfuse/adapter/impl/filesystem.c', + 'lib/webfuse/adapter/impl/server.c', + 'lib/webfuse/adapter/impl/server_config.c', + 'lib/webfuse/adapter/impl/server_protocol.c', + 'lib/webfuse/adapter/impl/session.c', + 'lib/webfuse/adapter/impl/session_manager.c', + 'lib/webfuse/adapter/impl/authenticator.c', + 'lib/webfuse/adapter/impl/authenticators.c', + 'lib/webfuse/adapter/impl/credentials.c', + 'lib/webfuse/adapter/impl/mountpoint.c', + 'lib/webfuse/adapter/impl/mountpoint_factory.c', + 'lib/webfuse/adapter/impl/operation/context.c', + 'lib/webfuse/adapter/impl/operation/lookup.c', + 'lib/webfuse/adapter/impl/operation/getattr.c', + 'lib/webfuse/adapter/impl/operation/readdir.c', + 'lib/webfuse/adapter/impl/operation/open.c', + 'lib/webfuse/adapter/impl/operation/close.c', + 'lib/webfuse/adapter/impl/operation/read.c', + c_args: ['-fvisibility=hidden'], + include_directories: private_inc_dir, + dependencies: [webfuse_core_dep, libfuse_dep]) + +webfuse_adapter_static_dep = declare_dependency( + include_directories: inc_dir, + link_with: [webfuse_adapter_static], + dependencies: [libfuse_dep]) + +webfuse_adapter = shared_library('webfuse_adapter', + 'lib/webfuse/adapter/api.c', + version: meson.project_version(), + c_args: ['-fvisibility=hidden', '-DWF_API=WF_EXPORT'], + include_directories: private_inc_dir, + dependencies: [webfuse_adapter_static_dep, libfuse_dep], + install: true) + +webfuse_adapter_dep = declare_dependency( + include_directories: inc_dir, + link_with: [webfuse_adapter], + dependencies: [libfuse_dep, libwebsockets_dep, jansson_dep]) + +install_headers('include/webfuse_adapter.h', subdir: 'webfuse') +install_subdir('include/webfuse/adapter', install_dir: 'include/webfuse') + +pkg_config.generate( + libraries: [webfuse_adapter, jansson_dep, libwebsockets_dep, libfuse_dep], + subdirs: '.', + version: meson.project_version(), + name: 'libwebfuse_adapter', + filebase: 'webfuse_adapter', + description: 'Websockets filesystem server library') + +# Unit Tests + +fscheck = executable('fs_check', + 'test/webfuse/tests/integration/fs_check.c') + +openssl = find_program('openssl') +test_server_certs = custom_target('test_server_certs', + output: ['server-key.pem', 'server-cert.pem'], + command: [openssl, 'req', '-x509', '-newkey', 'rsa:4096', '-keyout', 'server-key.pem', '-out', 'server-cert.pem', '-days', '365', '-nodes', '-batch', '-subj', '/CN=localhost']) +test_client_certs = custom_target('test_client_certs', + output: ['client-key.pem', 'client-cert.pem'], + command: [openssl, 'req', '-x509', '-newkey', 'rsa:4096', '-keyout', 'client-key.pem', '-out', 'client-cert.pem', '-days', '365', '-nodes', '-batch', '-subj', '/CN=localhost']) + +test_certs_dep = declare_dependency( + sources: [test_server_certs, test_client_certs]) + +alltests = executable('alltests', + 'test/webfuse/tests/core/jsonrpc/mock_timer_callback.cc', + 'test/webfuse/tests/core/jsonrpc/mock_timer.cc', + 'test/webfuse/tests/core/jsonrpc/test_is_request.cc', + 'test/webfuse/tests/core/jsonrpc/test_request.cc', + 'test/webfuse/tests/core/jsonrpc/test_is_response.cc', + 'test/webfuse/tests/core/jsonrpc/test_response.cc', + 'test/webfuse/tests/core/jsonrpc/test_server.cc', + 'test/webfuse/tests/core/jsonrpc/test_proxy.cc', + 'test/webfuse/tests/core/jsonrpc/test_response_parser.cc', + 'test/webfuse/tests/core/timer/test_timepoint.cc', + 'test/webfuse/tests/core/timer/test_timer.cc', + 'test/webfuse/utils/tempdir.cc', + 'test/webfuse/utils/file_utils.cc', + 'test/webfuse/utils/timeout_watcher.cc', + 'test/webfuse/utils/path.c', + 'test/webfuse/utils/static_filesystem.c', + 'test/webfuse/utils/ws_server.cc', + 'test/webfuse/mocks/fake_invokation_context.cc', + 'test/webfuse/mocks/mock_authenticator.cc', + 'test/webfuse/mocks/mock_request.cc', + 'test/webfuse/mocks/mock_provider_client.cc', + 'test/webfuse/mocks/mock_provider.cc', + 'test/webfuse/mocks/mock_fuse.cc', + 'test/webfuse/mocks/mock_operation_context.cc', + 'test/webfuse/mocks/mock_jsonrpc_proxy.cc', + 'test/webfuse//tests/core/test_util.cc', + 'test/webfuse/tests/core/test_container_of.cc', + 'test/webfuse/tests/core/test_string.cc', + 'test/webfuse/tests/core/test_slist.cc', + 'test/webfuse/tests/core/test_base64.cc', + 'test/webfuse/tests/core/test_status.cc', + 'test/webfuse/tests/core/test_message.cc', + 'test/webfuse/tests/core/test_message_queue.cc', + 'test/webfuse/tests/adapter/test_server.cc', + 'test/webfuse/tests/adapter/test_server_config.cc', + 'test/webfuse/tests/adapter/test_credentials.cc', + 'test/webfuse/tests/adapter/test_authenticator.cc', + 'test/webfuse/tests/adapter/test_authenticators.cc', + 'test/webfuse/tests/adapter/test_mountpoint.cc', + 'test/webfuse/tests/adapter/test_fuse_req.cc', + 'test/webfuse/tests/adapter/operation/test_context.cc', + 'test/webfuse/tests/adapter/operation/test_open.cc', + 'test/webfuse/tests/adapter/operation/test_close.cc', + 'test/webfuse/tests/adapter/operation/test_read.cc', + 'test/webfuse/tests/adapter/operation/test_readdir.cc', + 'test/webfuse/tests/adapter/operation/test_getattr.cc', + 'test/webfuse/tests/adapter/operation/test_lookup.cc', + 'test/webfuse/tests/provider/test_url.cc', + 'test/webfuse/tests/provider/test_client_protocol.cc', + 'test/webfuse/tests/provider/operation/test_close.cc', + 'test/webfuse/tests/provider/operation/test_getattr.cc', + 'test/webfuse/tests/provider/operation/test_lookup.cc', + 'test/webfuse/tests/provider/operation/test_open.cc', + 'test/webfuse/tests/provider/operation/test_read.cc', + 'test/webfuse/tests/provider/operation/test_readdir.cc', + 'test/webfuse/tests/integration/test_lowlevel.cc', + 'test/webfuse/tests/integration/test_integration.cc', + 'test/webfuse/tests/integration/file.cc', + 'test/webfuse/tests/integration/server.cc', + 'test/webfuse/tests/integration/provider.cc', + link_args: [ + '-Wl,--wrap=wf_timer_manager_create', + '-Wl,--wrap=wf_timer_manager_dispose', + '-Wl,--wrap=wf_timer_manager_check', + '-Wl,--wrap=wf_timer_create', + '-Wl,--wrap=wf_timer_dispose', + '-Wl,--wrap=wf_timer_start', + '-Wl,--wrap=wf_timer_cancel', + '-Wl,--wrap=wf_impl_operation_context_get_proxy', + '-Wl,--wrap=wf_jsonrpc_proxy_vinvoke', + '-Wl,--wrap=wf_jsonrpc_proxy_vnotify', + '-Wl,--wrap=fuse_req_userdata', + '-Wl,--wrap=fuse_reply_open', + '-Wl,--wrap=fuse_reply_err', + '-Wl,--wrap=fuse_reply_buf', + '-Wl,--wrap=fuse_reply_attr', + '-Wl,--wrap=fuse_reply_entry', + '-Wl,--wrap=fuse_req_ctx' + ], + include_directories: [private_inc_dir, 'test'], + dependencies: [ + webfuse_adapter_static_dep, + webfuse_provider_static_dep, + webfuse_core_dep, + libwebsockets_dep, + libfuse_dep, + jansson_dep, + gtest_dep, + gmock_main_dep, + test_certs_dep + ]) + +test('alltests', alltests) diff --git a/subprojects/fuse3.wrap b/subprojects/fuse3.wrap new file mode 100644 index 0000000..ccb34f5 --- /dev/null +++ b/subprojects/fuse3.wrap @@ -0,0 +1,7 @@ +[wrap-file] +directory = libfuse-fuse-3.8.0 + +source_url = https://github.com/libfuse/libfuse/archive/fuse-3.8.0.tar.gz +source_filename = fuse-3.8.0.tar.gz +source_hash = 1781225ba4d11d76eb105e02e54976939974547eb40bab4b4e91167854224024 + diff --git a/subprojects/gtest.wrap b/subprojects/gtest.wrap new file mode 100644 index 0000000..d52b0b3 --- /dev/null +++ b/subprojects/gtest.wrap @@ -0,0 +1,10 @@ +[wrap-file] +directory = googletest-release-1.10.0 + +source_url = https://github.com/google/googletest/archive/release-1.10.0.zip +source_filename = gtest-1.10.0.zip +source_hash = 94c634d499558a76fa649edb13721dce6e98fb1e7018dfaeba3cd7a083945e91 + +patch_url = https://wrapdb.mesonbuild.com/v1/projects/gtest/1.10.0/1/get_zip +patch_filename = gtest-1.10.0-1-wrap.zip +patch_hash = 04ff14e8880e4e465f6260221e9dfd56fea6bc7cce4c4aff0dc528e4a2c8f514 \ No newline at end of file