smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update libmicrohttpd to 0.9.66 (#365) 

* Update libmicrohttpd to 0.9.66

* Proper Bash syntax highlighting
This commit is contained in:
Kelson 2019-09-06 15:54:44 +02:00 committed by GitHub
parent deff7fe50e
commit 6b43f5ad48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
README.md
View File

@ -18,32 +18,30 @@ instructions otherwise.
Before anything else you need to install Python3 related tools. On Debian Before anything else you need to install Python3 related tools. On Debian
based systems: based systems:
```bash
``` sudo apt-get install python3-pip virtualenv
$ sudo apt-get install python3-pip virtualenv
``` ```
Create a virtual environment to install python module in it instead Create a virtual environment to install python module in it instead
of modifying the system. of modifying the system.
``` ```bash
$ virtualenv -p python3 ./ # Create virtualenv virtualenv -p python3 ./ # Create virtualenv
$ source bin/activate # Activate the virtualenv source bin/activate # Activate the virtualenv
``` ```
Then, download and install kiwix-build and its dependencies: Then, download and install kiwix-build and its dependencies:
``` ```bash
$ git clone https://github.com/kiwix/kiwix-build.git git clone https://github.com/kiwix/kiwix-build.git
$ cd kiwix-build cd kiwix-build
$ pip install . pip install .
$ hash -r # Refresh bash paths hash -r # Refresh bash paths
``` ```
If your distribution doesn't provide ninja version > 1.6 you can get it If your distribution doesn't provide ninja version > 1.6 you can get it
this way : this way :
```bash
``` wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
$ wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip unzip ninja-linux.zip ninja -d $HOME/bin
$ unzip ninja-linux.zip ninja -d $HOME/bin
``` ```
# Compilation # Compilation
@ -52,19 +50,17 @@ The compilation is handled by the `kiwix-build` command. It will compile
everything. If you are using a supported platform (Redhat or Debian everything. If you are using a supported platform (Redhat or Debian
based) it will install missing packages using `sudo`. You can get based) it will install missing packages using `sudo`. You can get
`kiwix-build` usage like this: `kiwix-build` usage like this:
```bash
``` kiwix-build --help
$ kiwix-build --help
``` ```
## Target ## Target
You may want to compile a specific target so you will have to specify it on the You may want to compile a specific target so you will have to specify it on the
command line : command line :
```bash
``` kiwix-build kiwix-lib # will build kiwix-build and its dependencies
$ kiwix-build kiwix-lib # will build kiwix-build and its dependencies kiwix-build zim-tools # will build zim-tools and its dependencies
$ kiwix-build zim-tools # will build zim-tools and its dependencies
``` ```
By default, `kiwix-build` will build `kiwix-tools` . By default, `kiwix-build` will build `kiwix-tools` .
@ -91,9 +87,8 @@ platforms :
- android_x86_64 - android_x86_64
So, if you want to compile `kiwix-tools` for win32 using static linkage: So, if you want to compile `kiwix-tools` for win32 using static linkage:
```bash
``` kiwix-build --target-platform win32_dyn
$ kiwix-build --target-platform win32_dyn
``` ```
## Android ## Android
@ -104,27 +99,24 @@ java) but it use `kiwix-lib` who is architecture dependent.
When building `kiwix-lib`, you should directly use the When building `kiwix-lib`, you should directly use the
target-platform `android_<arch>`: target-platform `android_<arch>`:
```bash
``` kiwix-build kiwix-lib --target-platform android_arm
$ kiwix-build kiwix-lib --target-platform android_arm
``` ```
But, `kiwix-android` apk can also be multi arch (ie, it includes But, `kiwix-android` apk can also be multi arch (ie, it includes
`kiwix-lib` for several architectures). To do so, you must ask to build `kiwix-lib` for several architectures). To do so, you must ask to build
`kiwix-android` using the `android` platform: `kiwix-android` using the `android` platform:
```bash
``` kiwix-build --target-platform android kiwix-android
$ kiwix-build --target-platform android kiwix-android kiwix-build kiwix-android # because `android` platform is the default for `kiwix-android`
$ kiwix-build kiwix-android # because `android` platform is the default for `kiwix-android`
``` ```
By default, when using platform `android`, `kiwix-lib` will be build for By default, when using platform `android`, `kiwix-lib` will be build for
all architectures. This can be changed by using the option `--android-arch` : all architectures. This can be changed by using the option `--android-arch` :
```bash
``` kiwix-build kiwix-android # apk for all architectures
$ kiwix-build kiwix-android # apk for all architectures kiwix-build kiwix-android --android-arch arm # apk for arm architecture
$ kiwix-build kiwix-android --android-arch arm # apk for arm architecture kiwix-build kiwix-anrdoid --android-arch arm --android-arch arm64 # apk for arm and arm64 architectures
$ kiwix-build kiwix-anrdoid --android-arch arm --android-arch arm64 # apk for arm and arm64 architectures
``` ```
## IOS ## IOS
@ -135,16 +127,14 @@ for several architectures.
To do so, you should directly use the target-platfrom `ios_multi`. To do so, you should directly use the target-platfrom `ios_multi`.
As for `android`, `kiwix-build` will build the library several times As for `android`, `kiwix-build` will build the library several times
(once for each platform) and then create the fat library. (once for each platform) and then create the fat library.
```bash
``` kiwix-build --target-platform iOS_multi kiwix-lib
$ kiwix-build --target-platform iOS_multi kiwix-lib
``` ```
You can specify the supported architectures with the option `--ios-arch`: You can specify the supported architectures with the option `--ios-arch`:
```bash
``` kiwix-build --target-platform iOS_multi kiwix-lib # all architetures
$ kiwix-build --target-platform iOS_multi kiwix-lib # all architetures kiwix-build --target-platform iOS_multi --ios-arch arm --ios-arch arm64 # arm and arm64 arch only
$ kiwix-build --target-platform iOS_multi --ios-arch arm --ios-arch arm64 # arm and arm64 arch only
``` ```

6
kiwixbuild/dependencies/libmicrohttpd.py
View File

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

4
kiwixbuild/versions.py
View File

@ -42,7 +42,7 @@ 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 = '54' base_deps_meta_version = '55'
base_deps_versions = { base_deps_versions = {
'zlib' : '1.2.8', 'zlib' : '1.2.8',
@ -51,7 +51,7 @@ base_deps_versions = {
'xapian-core' : '1.4.10', 'xapian-core' : '1.4.10',
'mustache' : '3.2', 'mustache' : '3.2',
'pugixml' : '1.2', 'pugixml' : '1.2',
'libmicrohttpd' : '0.9.65', 'libmicrohttpd' : '0.9.66',
'gumbo' : '0.10.1', 'gumbo' : '0.10.1',
'icu4c' : '58.2', 'icu4c' : '58.2',
'gradle' : '5.2', 'gradle' : '5.2',