f96ae19c88
Disable websocket support in aria2.
...
We don't need it. It could speed up a bit the compilation.
2018-11-30 11:37:23 +01:00
703cac1f70
Do not compile libcurl in flatpak.
2018-11-30 11:37:23 +01:00
5d7972f037
Merge pull request #271 from kiwix/new_server
...
Update upload script to new server user "ci".
2018-11-30 11:36:55 +01:00
827c963895
Update upload script to new server user "ci".
...
On new server, the user `nightlybot` as been renamed to `ci`.
The path of the data used by the download server has also changed.
2018-11-30 11:08:33 +01:00
b2a6ca7950
Merge pull request #269 from kiwix/flatpak
...
Flatpak
2018-11-27 18:03:20 +01:00
f41a0dccdb
Get base dependencies only if we are not building a flatpak.
2018-11-27 17:22:47 +01:00
ce540ca280
Update creation of appImage to the new location of kiwix-desktop.desktop.
2018-11-27 17:22:47 +01:00
ecf3b8b1ff
Add an option `--asume-packages-installed` to not try to install packages.
...
This is different than `--dont-install-packages` that will try to
compile the dependencies.
`--asumme-packages-installed` will no try to install packages, but will
not try either to compile dependencies.
2018-11-27 17:22:47 +01:00
086361b432
Build the flatpak in travis.
...
Use docker to have the last version of ubuntu (and flatpak)
2018-11-27 17:22:47 +01:00
a3ce2e0126
Fix the flatpak manifest.
...
- Rename the .desktop file and the icons for desktop integration.
- Fix finish-args for the right permissions
- Remove curl binary, not aria2c.
2018-11-27 17:22:47 +01:00
a18c28b168
Build the flatpak as user, not system.
2018-11-27 17:22:47 +01:00
feec272d1f
Use the correct key `app-id` instead of `id`.
2018-11-27 17:22:47 +01:00
833c5844a1
Use the right option to build kiwix_desktop and pugixml on flatpak.
2018-11-27 17:22:47 +01:00
ed63ffe24c
Add aria2 dependency.
...
kiwix-desktop needs the aria2 binary to download content.
kiwix-desktop will use aria2 throw lib-kiwix so it is somehow a kiwix-lib
dependency, but it is used only by kiwix-desktop.
And we know to install it only on platforms where we are supporting
kiwix-destkop.
2018-11-27 17:22:47 +01:00
d375cc06bc
Do not try to compiled dependencies already in the org.kde.Platform.
2018-11-27 10:11:08 +01:00
8d58d8d7cb
First version of a flatpak builder.
...
This commit add a first version code to build a flatpak of kiwix-desktop.
It is mainly based on the PR #254 of @birros (hence he is the author of this commit)
However there is some differences :
- I (@mgautier) create a new builder to run the flatpak build instead of using a new
dependency.
- Use the flatpak platform to install org.kde.Platform and org.kde.Sdk
This code version doesn't correctly work but I wanted to commit the birros' code
without too many modification (even if there is a lot).
2018-11-27 09:43:52 +01:00
0b9f13a2f0
Create a property in the remotefile to get the correct url.
2018-11-14 11:08:44 +01:00
22f1693335
Merge remote-tracking branch 'origin/master'
...
I forget to fetch before pushing the 0.0.14 tag :/
2018-11-14 10:59:11 +01:00
054f7802d0
Update version of kiwix-lib and kiwix-tools.
2018-11-12 16:54:44 +01:00
f080c750b6
Merge pull request #268 from kiwix/new_tmp_server
...
New tmp.kiwix.org server
2018-11-07 16:16:37 +01:00
70301d4723
New tmp.kiwix.org server
2018-11-07 03:51:13 +01:00
e5be404697
Merge pull request #266 from kiwix/new_download_zim_server
...
New Travis config for new openzim download server
2018-11-03 17:23:04 +01:00
d9ef792172
Update Travis for new download server
2018-11-03 14:38:46 +01:00
500e2c1e02
update version of kiwix-lib and kiwix-desktop
2018-11-03 12:35:12 +01:00
1b7a40ea97
Fix create appimage
2018-11-02 17:58:18 +01:00
85f0d4ccb1
Update version of kiwix-lib and kiwix-desktop.
2018-11-02 17:37:02 +01:00
e0de6e90d0
Merge pull request #265 from kiwix/package_aria2_linux
...
Add aria2 in the appimage.
2018-11-02 17:11:02 +01:00
f4ff820eda
Add aria2 in the appimage.
2018-11-02 11:56:00 +01:00
1440dd8b25
Update version of kiwix-lib, kiwix-tools and kiwix-desktop.
2018-10-31 17:20:24 +01:00
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
c47bad8c74
Try to cache appveyor dependencies.
2018-10-31 15:42:15 +01:00
00b7e0f1f8
[AppVeyor] Add Aria2.
2018-10-31 15:40:53 +01:00
845cdffdba
[AppVeyor] Compile kiwix-desktop using static lib when possible.
2018-10-31 15:38:32 +01:00
97f6c076c4
[AppVeyor] Build curl in appveyor.
2018-10-31 15:37:24 +01:00
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
5a97ec28ca
Merge pull request #253 from kiwix/libcurl
...
Add libcurl dependency.
2018-10-23 15:41:19 +02:00
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
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
b3a3d0399f
Last version of travis osx already have a python 3.6 installed.
2018-10-23 11:57:58 +02:00
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
e9ae0da048
Move to Xapian 1.4.7
2018-09-20 18:27:30 +02:00
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
44b8ebdfde
Update README.md to use HTTPS in git clone
2018-09-17 09:38:40 +02:00
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
1569068332
Do not set version for main project if we are not making release.
2018-09-06 16:10:43 +02:00
691dab52be
Merge pull request #251 from kiwix/fix_deploy
...
Fix deploy
2018-09-05 20:44:58 +02:00
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
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
a91d85fa41
Merge pull request #250 from kiwix/new_version
...
Update version of libzim and kiwix-desktop.
2018-09-05 18:06:54 +02:00
e988165282
Update version of libzim and kiwix-desktop.
2018-09-05 16:56:46 +02:00
Matthieu Gautier
Matthieu Gautier
birros
Kelson
Szymon Pajzert