Skip to content

Commit

Permalink
Remove the java wrapper.
Browse files Browse the repository at this point in the history
- The meson's `wrapper` option is removed.
- New meson's option `static-linkage` is added to tell meson to link
  with static library.
  • Loading branch information
mgautierfr committed Jun 9, 2022
1 parent 56167dc commit 01c384b
Show file tree
Hide file tree
Showing 39 changed files with 7 additions and 2,550 deletions.
17 changes: 4 additions & 13 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,13 @@ project('libkiwix', 'cpp',

compiler = meson.get_compiler('cpp')

wrapper = get_option('wrapper')

static_deps = wrapper.contains('android') or wrapper.contains('java') or get_option('default_library') == 'static'
if wrapper.contains('android')
extra_libs = ['-llog']
else
extra_libs = []
endif

if wrapper.contains('java')
add_languages('java')
endif
static_deps = get_option('static-linkage') or get_option('default_library') == 'static'

# See https://github.com/kiwix/libkiwix/issues/371
if ['arm', 'mips', 'm68k', 'ppc', 'sh4'].contains(host_machine.cpu_family())
extra_libs += '-latomic'
extra_libs = ['-latomic']
else
extra_libs = []
endif

if (compiler.get_id() == 'gcc' and build_machine.system() == 'linux') or host_machine.system() == 'freebsd'
Expand Down
4 changes: 2 additions & 2 deletions meson_options.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
option('wrapper', type:'array', choices:['java', 'android'], value:[],
description: 'The wrapper to generate.')
option('static-linkage', type : 'boolean', value : false,
description : 'Link statically with the dependencies.')
option('doc', type : 'boolean', value : false,
description : 'Build the documentations.')
10 changes: 1 addition & 9 deletions src/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,7 @@ else
kiwix_sources += 'subprocess_unix.cpp'
endif

if wrapper.contains('android')
install_dir = 'kiwix-lib/jniLibs/' + meson.get_cross_property('android_abi')
else
install_dir = get_option('libdir')
endif

if wrapper.contains('android') or wrapper.contains('java')
subdir('wrapper/java')
endif
install_dir = get_option('libdir')

config_h = configure_file(output : 'kiwix_config.h',
configuration : conf,
Expand Down
13 changes: 0 additions & 13 deletions src/wrapper/java/AndroidManifest.xml

This file was deleted.

88 changes: 0 additions & 88 deletions src/wrapper/java/book.cpp

This file was deleted.

63 changes: 0 additions & 63 deletions src/wrapper/java/filter.cpp

This file was deleted.

44 changes: 0 additions & 44 deletions src/wrapper/java/kiwixicu.cpp

This file was deleted.

Loading

0 comments on commit 01c384b

Please sign in to comment.