Commit Graph

589 Commits

Author SHA1 Message Date
Matthieu Gautier 95ffc8c3b3 TOREVERT use branch win_relpath 2018-11-03 10:39:14 +01:00
Matthieu Gautier 1b7a40ea97 Fix create appimage 2018-11-02 17:58:18 +01:00
Matthieu Gautier 85f0d4ccb1 Update version of kiwix-lib and kiwix-desktop. 2018-11-02 17:37:02 +01:00
Matthieu Gautier e0de6e90d0
Merge pull request #265 from kiwix/package_aria2_linux
Add aria2 in the appimage.
2018-11-02 17:11:02 +01:00
Matthieu Gautier f4ff820eda Add aria2 in the appimage. 2018-11-02 11:56:00 +01:00
Matthieu Gautier 1440dd8b25 Update version of kiwix-lib, kiwix-tools and kiwix-desktop. 2018-10-31 17:20:24 +01:00
Matthieu Gautier 237e4d860d
Merge pull request #262 from kiwix/build_libcurl
Force the build of libcurl instead of using system one.
2018-10-31 17:19:50 +01:00
Matthieu Gautier c47bad8c74 Try to cache appveyor dependencies. 2018-10-31 15:42:15 +01:00
Matthieu Gautier 00b7e0f1f8 [AppVeyor] Add Aria2. 2018-10-31 15:40:53 +01:00
Matthieu Gautier 845cdffdba [AppVeyor] Compile kiwix-desktop using static lib when possible. 2018-10-31 15:38:32 +01:00
Matthieu Gautier 97f6c076c4 [AppVeyor] Build curl in appveyor. 2018-10-31 15:37:24 +01:00
Matthieu Gautier 0600be96ac Force the build of libcurl instead of using system one.
On ubuntu, the libcurl package is compiled with libkrb (kerberos).
However, no libkrb5.a is provided and so, we cannot link statically.

As we are not using kerberos, we can (and must) compile ourselves libcurl.
2018-10-31 15:33:12 +01:00
Matthieu Gautier 5a97ec28ca
Merge pull request #253 from kiwix/libcurl
Add libcurl dependency.
2018-10-23 15:41:19 +02:00
Matthieu Gautier 7963fd464a [AppVeyor] Update to last version of meson
Last version of meson (0.48.0) install meson a differently on Windows.
Now, a `meson.exe` is installed, so, we must launch `meson` instead of `meson.py`.
2018-10-23 14:30:24 +02:00
Matthieu Gautier 1e67a6b50f Add libcurl dependency.
This is needed for new kiwix-lib version.
We also remove libaria as kiwix-lib use aria2 binary directly.
2018-10-23 11:57:58 +02:00
Matthieu Gautier b3a3d0399f Last version of travis osx already have a python 3.6 installed. 2018-10-23 11:57:58 +02:00
Kelson 3a05f8e35b
Merge pull request #255 from kiwix/xapian_1.4.7
Move to Xapian 1.4.7
2018-09-22 10:52:23 +02:00
Kelson e9ae0da048 Move to Xapian 1.4.7 2018-09-20 18:27:30 +02:00
Kelson 401e01b953
Merge pull request #256 from SzymonPajzert/patch-1
Update README.md to use HTTPS in git clone
2018-09-17 12:25:22 +02:00
Szymon Pajzert 44b8ebdfde
Update README.md to use HTTPS in git clone 2018-09-17 09:38:40 +02:00
Matthieu Gautier 683582b5e4
Merge pull request #252 from kiwix/version_no_release
Do not set version for main project if we are not making release.
2018-09-06 20:33:38 +02:00
Matthieu Gautier 1569068332 Do not set version for main project if we are not making release. 2018-09-06 16:10:43 +02:00
Matthieu Gautier 691dab52be
Merge pull request #251 from kiwix/fix_deploy
Fix deploy
2018-09-05 20:44:58 +02:00
Matthieu Gautier ecc6927de8 Use git archive to create dist source archive.
qmake seems to generate wrong "dist" rules for "make".
It try to copy the translation files as if it was in current directory
instead of looking the source dir.

dist archive is usefull with autotools where we want to run autogen before.
Or with meson when meson run tests before making the archive.

With qmake, it seems useless, let's simply archive what is git.
2018-09-05 19:38:58 +02:00
Matthieu Gautier df0b684869 Correctly find the version of a dependency.
We have separated the version in two separated dicts since a long time :/
2018-09-05 19:31:38 +02:00
Matthieu Gautier a91d85fa41
Merge pull request #250 from kiwix/new_version
Update version of libzim and kiwix-desktop.
2018-09-05 18:06:54 +02:00
Matthieu Gautier e988165282 Update version of libzim and kiwix-desktop. 2018-09-05 16:56:46 +02:00
Matthieu Gautier 2686d74a78
Merge pull request #248 from kiwix/extra_build_version
Do not overwrite release build archives.
2018-09-04 18:34:39 +02:00
Matthieu Gautier 07e8b36efb Do not overwrite release build archives.
We new release of a project is made, projects dependending of it are
rebuild and republish to keep the binaries up-to-date.

To avoid overwrite the already build archives and silent the fact that
new archives are available, we need to have a extra build version.

`release_versions[project]` has to be set each time a dependency of
`project` is bump but the project version has not changed.

If the `project` version changes, the `release_versions[project]`
has to be cleared.

If we don't want to release this version again, remove project from
`release_versions`.

See kiwix/kiwix-tools#222
2018-09-04 17:56:01 +02:00
Matthieu Gautier d4b393727e
Merge pull request #247 from kiwix/update_versions
Update version of kiwix-tools to 0.6.1.
2018-08-30 16:56:24 +02:00
Matthieu Gautier aed1194570 Update version of kiwix-tools to 0.6.1. 2018-08-30 16:04:28 +02:00
Matthieu Gautier 67033ae060
Merge pull request #246 from kiwix/msvcr100
Use the more recent msvcr100 instead of msvcr90.
2018-08-28 18:33:18 +02:00
Matthieu Gautier 095eec303a Use the more recent msvcr100 instead of msvcr90. 2018-08-28 16:42:06 +02:00
Matthieu Gautier e77747a564
Merge pull request #245 from kiwix/win_zip_deflated
Use the ZIP_DEFLATED compression when creating zip archive.
2018-08-28 16:28:44 +02:00
Matthieu Gautier b16213b1c0 Use the ZIP_DEFLATED compression when creating zip archive.
The building Windows zip decompressor handles only DEFLATED.
2018-08-28 14:56:56 +02:00
Matthieu Gautier c75fd9b85c
Merge pull request #242 from kiwix/new_version
Update versions of libzim and kiwix-desktop.
2018-08-24 16:11:11 +02:00
Matthieu Gautier 91f282d8f2 Update versions of libzim and kiwix-desktop. 2018-08-24 15:35:01 +02:00
Matthieu Gautier b00429b701
Merge pull request #243 from kiwix/no_mips
Do not build for mips and mips64 by default.
2018-08-22 17:18:55 +02:00
Matthieu Gautier 3b483f9011 Do not build for mips and mips64 by default. 2018-08-22 16:44:53 +02:00
Matthieu Gautier bd33238d60
Merge pull request #241 from kiwix/default_platform_custom_app
Default platform custom app
2018-08-20 17:53:48 +02:00
Matthieu Gautier 6f291b1c86 Set the default platform to `android` for `kiwix-android-custom` project.
Fix #206
2018-08-20 11:18:01 +02:00
Matthieu Gautier 81612c2f2c Set the default option in the method parsing arguments, not in the builder. 2018-08-20 11:16:33 +02:00
Matthieu Gautier 54458ccb0a
Merge pull request #238 from kiwix/fix_src_path
Fix the src path of kiwix-desktop when doing release.
2018-08-06 11:31:03 +02:00
Matthieu Gautier 22a580d070 Fix the src path of kiwix-desktop when doing release.
kiwix-build add `_release` postfix, not the version number.
2018-08-06 10:49:53 +02:00
Matthieu Gautier 1948b109e2
Merge pull request #236 from kiwix/correct_src_path
Use the correct source path of kiwix-desktop when doing release.
2018-08-06 10:04:00 +02:00
Matthieu Gautier cad38f8a53 Use the correct source path of kiwix-desktop when doing release. 2018-08-06 09:24:29 +02:00
Matthieu Gautier 58ca125d32
Merge pull request #235 from kiwix/export_env_in_docker
Export TRAVIS_TAG env var in docker
2018-08-05 22:55:18 +02:00
Matthieu Gautier d91f40b467 Export TRAVIS_TAG env var in docker 2018-08-05 20:00:14 +02:00
Matthieu Gautier 02712cc9e4
Merge pull request #234 from kiwix/release_desktop
[Travis] Also build kiwix-desktop when building for release.
2018-08-05 19:08:34 +02:00
Matthieu Gautier f51204d424 [Travis] Also build kiwix-desktop when building for release. 2018-08-04 09:06:38 +02:00