github-mirrors/kiwix-build
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-build.git synced 2025-04-22 05:37:06 -04:00
Code Issues Projects Releases Packages Wiki Activity

libmicrohttpd is now a dependency of kiwix-lib, not kiwix-tools.

Browse source 
And we have to install libmicrohttpd on windows.
This commit is contained in:
Matthieu Gautier 2019-08-10 18:04:09 +02:00
parent 2e653428d3
commit 0dcaa28e35
7 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
appveyor.yml
View file

@ -51,6 +51,7 @@ build_script:
- IF "%USE_CACHE%" NEQ "1" appveyor\install_pugixml.cmd
- IF "%USE_CACHE%" NEQ "1" appveyor\install_aria2.cmd
- IF "%USE_CACHE%" NEQ "1" appveyor\install_mustache.cmd
- IF "%USE_CACHE%" NEQ "1" appveyor\install_libmicrohttpd.cmd
- IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh"
- appveyor\install_libzim.cmd
- appveyor\install_kiwix-lib.cmd

10
appveyor/install_libmicrohttpd.cmd Normal file
View file

@ -0,0 +1,10 @@
REM ========================================================
REM Install libmicrohttpd
curl -fsSL -O https://ftpmirror.gnu.org/libmicrohttpd/libmicrohttpd-latest-w32-bin.zip || exit /b 1
7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/include libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/microhttpd.h || exit /b 1
7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib libmicrohttpd-*-w32-bin/x86_64/VS2019/Release-static/libmicrohttpd.lib || exit /b 1
7z e libmicrohttpd-latest-w32-bin.zip -o%EXTRA_DIR%/lib/pkgconfig libmicrohttpd-*-w32-bin/x86_64/MinGW/static/mingw64/lib/pkgconfig/* || exit /b 1
dir %EXTRA_DIR%
dir %EXTRA_DIR%\lib
dir %EXTRA_DIR%\lib\pkgconfig

6
kiwixbuild/dependencies/all_dependencies.py
View file

@ -12,13 +12,9 @@ class AllBaseDependencies(Dependency):
class Builder(NoopBuilder):
@classmethod
def get_dependencies(cls, platformInfo, allDeps):
base_deps = ['zlib', 'lzma', 'xapian-core', 'pugixml', 'libcurl', 'icu4c', 'mustache']
base_deps = ['zlib', 'lzma', 'xapian-core', 'pugixml', 'libcurl', 'icu4c', 'mustache', 'libmicrohttpd']
# zimwriterfs
if platformInfo.build not in ('android', 'win32'):
base_deps += ['libmagic', 'gumbo']
# kiwix-tools
if (platformInfo.build != 'android' and
neutralEnv('distname') != 'Darwin'):
base_deps += ['libmicrohttpd']
return base_deps

2
kiwixbuild/dependencies/kiwix_lib.py
View file

@ -16,7 +16,7 @@ class Kiwixlib(Dependency):
git_dir = "kiwix-lib"
class Builder(MesonBuilder):
dependencies = ["pugixml", "libzim", "zlib", "lzma", "libcurl", "icu4c", "mustache"]
dependencies = ["pugixml", "libzim", "zlib", "lzma", "libcurl", "libmicrohttpd", "icu4c", "mustache"]
strip_option = ''
@property

2
kiwixbuild/dependencies/kiwix_tools.py
View file

@ -11,7 +11,7 @@ class KiwixTools(Dependency):
git_dir = "kiwix-tools"
class Builder(MesonBuilder):
dependencies = ["kiwix-lib", "libmicrohttpd", "zlib"]
dependencies = ["kiwix-lib"]
@property
def configure_option(self):

8
kiwixbuild/dependencies/libmicrohttpd.py
View file

@ -9,9 +9,9 @@ class MicroHttpd(Dependency):
name = "libmicrohttpd"
class Source(ReleaseDownload):
archive = Remotefile('libmicrohttpd-0.9.65.tar.gz',
'f2467959c5dd5f7fdf8da8d260286e7be914d18c99b898e22a70dafd2237b3c9',
'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.65.tar.gz')
archive = Remotefile('libmicrohttpd-0.9.46.tar.gz',
'06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979',
'http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-0.9.46.tar.gz')
class Builder(MakeBuilder):
configure_option = "--disable-https --without-libgcrypt --without-libcurl"
configure_option = "--disable-https --without-libgcrypt --without-libcurl --disable-doc --disable-examples"

4
kiwixbuild/versions.py
View file

@ -28,14 +28,14 @@ release_versions = {
'kiwix-lib': None, # Depends of libzim (was 0)
'kiwix-tools': None, # Depends of kiwix-lib and libzim (was 0)
'zim-tools': 0, # Depends of libzim (was 0)
'zimwriterfs': None, # Depends of libzim (was 2)
'zimwriterfs': None, # Depends of libzim (was 0)
'kiwix-desktop': None # Depends of kiwix-lib and libzim (was 0)
}
# This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions.
base_deps_meta_version = '51'
base_deps_meta_version = '52'
base_deps_versions = {
'zlib' : '1.2.8',