Added docopt cpp dependency to zimtools. It will be needed to the new version of zimdump

Do not build docopt on android and iOS.
This commit is contained in:
MiguelRocha 2020-04-21 18:35:11 +01:00 committed by Matthieu Gautier
parent ce329b6a79
commit 3e2df9a8e8
5 changed files with 28 additions and 2 deletions

View File

@ -6,6 +6,7 @@ from . import (
android_sdk, android_sdk,
aria2, aria2,
armhf, armhf,
docoptcpp,
flatpak, flatpak,
gumbo, gumbo,
icu4c, icu4c,

View File

@ -17,4 +17,8 @@ class AllBaseDependencies(Dependency):
if platformInfo.build not in ('android', 'win32'): if platformInfo.build not in ('android', 'win32'):
base_deps += ['libmagic', 'gumbo'] base_deps += ['libmagic', 'gumbo']
# zimtools
if platformInfo.build not in ('android','iOS'):
base_deps += ['docoptcpp']
return base_deps return base_deps

View File

@ -0,0 +1,20 @@
from .base import (
Dependency,
ReleaseDownload,
CMakeBuilder)
from kiwixbuild.utils import Remotefile
class docoptcpp(Dependency):
name = 'docoptcpp'
class Source(ReleaseDownload):
archive = Remotefile('v0.6.2.tar.gz',
'c05542245232420d735c7699098b1ea130e3a92bade473b64baf876cdf098a17',
'https://github.com/docopt/docopt.cpp/archive/v0.6.2.tar.gz')
class Builder(CMakeBuilder):
make_install_target = 'install'

View File

@ -12,7 +12,7 @@ class ZimTools(Dependency):
git_dir = "zim-tools" git_dir = "zim-tools"
class Builder(MesonBuilder): class Builder(MesonBuilder):
dependencies = ['libzim'] dependencies = ['libzim', 'docoptcpp']
@property @property
def configure_option(self): def configure_option(self):

View File

@ -42,12 +42,13 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '66' base_deps_meta_version = '67'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',
'lzma' : '5.2.4', 'lzma' : '5.2.4',
'zstd' : '1.4.4', 'zstd' : '1.4.4',
'docoptcpp' : '0.6.2',
'uuid' : '1.43.4', 'uuid' : '1.43.4',
'xapian-core' : '1.4.14', 'xapian-core' : '1.4.14',
'mustache' : '4.1', 'mustache' : '4.1',