Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZIM Fuse Filesystem #400

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,14 @@ find_library_in_compiler = meson.version().version_compare('>=0.31.0')
rt_dep = dependency('rt', required:false)
docopt_dep = dependency('docopt', static:static_linkage)

with_writer = host_machine.system() != 'windows'
with_writer_and_mount = host_machine.system() != 'windows'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to have a on_windows, or split this in two variables with_writer and with_mount.

We should not link writer and mount compilation together (at least not explicitly in one variable)


if with_writer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be renamed also.

thread_dep = dependency('threads')
zlib_dep = dependency('zlib', static:static_linkage)
gumbo_dep = dependency('gumbo', static:static_linkage)
magic_dep = dependency('libmagic', static:static_linkage, required:false)
libfuse_dep = dependency('fuse3', version : '>=3.1')

# libmagic.pc has been introduced in version 5.39 of
# File. Unfortunately Ubuntu 20.04 (Focal) still uses version
Expand Down
3 changes: 2 additions & 1 deletion src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ executable('zimrecreate', ['zimrecreate.cpp', 'tools.cpp'],

subdir('zimcheck')

if with_writer
if with_writer_and_mount
subdir('zimwriterfs')
subdir('zimfuse')
endif
Empty file added src/zimfuse/main.cpp
Empty file.
10 changes: 10 additions & 0 deletions src/zimfuse/meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
sources = [
'main.cpp'
]

deps = [libzim_dep, libfuse_dep]

executable('zimfuse',
sources,
dependencies : deps,
install : true)