Commit Graph

151 Commits

Author SHA1 Message Date
8d13ef673a Update the list of android packages to install. 2019-02-05 16:22:09 +01:00
f73187f7c9 Update gradle dependency 2019-02-05 16:22:09 +01:00
4ca0a43325 Increase dependency version number 2019-02-05 16:22:09 +01:00
0ad24e9656 Do not use system's static zlib.
The system's static zlib is compiled without `-fPIC` but we need it
to build the mixed libzim.
2019-02-04 17:01:28 +01:00
4eb95fd4cc Pass correct option -Dstatic_linkage to libzim in native_mixed platform.
In native_mixed, we want to build a shared lib but we need to compile
with the static lib of the dependencies.
2019-02-04 17:01:28 +01:00
466dc8b64a Fix -fPIC CXXFLAGS. 2019-02-04 17:01:28 +01:00
c9210bb0e0 Allow kiwix-build to build shared libs linked statically with deps.
We need to be able to build libzim as shared lib while using all
other dependencies statically (to not have libxapian.so, ... to distribute)

This add a new platform (static=False) that make all dependencies being
build in a static platform.
2019-02-04 17:01:28 +01:00
1b2b3efb54 Allow the platform itself to set on which platform we need to build the dep
For some complex build, we may want to build a dependency on another
platform that the target platform.
2019-02-04 17:01:28 +01:00
90460e8100 Update Gradle Version 2019-02-03 23:46:55 +00:00
b985becf4b Update versions 2019-01-29 14:18:15 +01:00
c61570fc08 [flatpak] Add the exact commit sha in the manifest.
As requested here
https://github.com/flathub/flathub/pull/768#discussion_r245727043

See flathub/flathub#768
2019-01-23 18:25:22 +01:00
50167460dc Move the version of org.kde in the versions.py file. 2019-01-23 16:04:02 +01:00
b2d2e489bf [iOS] Use the correct option b_bitcode for libzim and kiwix-lib. 2019-01-17 16:50:49 +01:00
681c5b4ec2 [Travis] Use python3.5 instead of default python3.4
Python3.5 add functionnality we need in kiwix-build.
And recent versions of meson need python3.5.
2019-01-17 15:36:32 +01:00
4160673c3a Correctly raise StopBuild in case of error when building flatpak. 2019-01-15 14:50:06 +01:00
c4a3da03c3 Correctly install mustache in flatpak.
We need a simple buildsystem to "build" mustache" as we simply need to
copy the header.
2019-01-15 14:44:02 +01:00
961076bb87 [ANDROID] Build only the apk, not everything.
It seems that build everything on android side is a bit too expensive.
Let's do as is done on android CI, build only the apk.
2019-01-15 11:26:11 +01:00
4f2786a031 Add missing import of pj in i586 platform 2019-01-10 16:50:47 +01:00
1d881d0612 Add the include dir in the meson_cross_file.
This is needed to have kiwix-lib find the `mustache.hpp` include when
cross compiling.
2019-01-09 18:29:58 +01:00
879a7294b9 Create the directory containing the skip_file if needed. 2019-01-09 11:46:16 +01:00
1a0e0ad717 Update to last version of libmagic (5.35) 2019-01-09 11:17:41 +01:00
8005aff6c0 Remove ctpp2 dependency.
kiwix-lib doesn't use ctpp2 anymore but mustache.
So remove ctpp2 dependency and add mustache.
2019-01-09 11:17:41 +01:00
b6833eddac Force rebuild of kiwix-desktop release to have the appimage. 2018-12-21 14:32:33 +01:00
c776ca9a80 Udpate versions. 2018-12-14 17:00:39 +01:00
2980075ce0 Update flatpak_builder to new version of kiwix-desktop
- app-id is now ork.kiwix.desktop
- No need to rename the desktop-file
- `--filesystem=xdg-data` is useless.
2018-12-14 17:00:39 +01:00
f9610ce3b3 Move the sources at the end of the modules.
It is the usage to have `sources` attribute at the end of the module
definition in flatpak manifest. Let's follow it.
2018-12-12 11:31:50 +01:00
ac0685877b Do not keep "empty" modules (without sources).
`org.kde` dependency has no source. It used by kiwix-build to install the
correct sdk/platform.
2018-12-12 11:30:04 +01:00
abf0e639e1 The manifest file must be named as the app-id. 2018-12-12 11:28:08 +01:00
e11247c18a builddir is already default to True for meson. 2018-12-12 11:25:02 +01:00
6b5df23b03 no-autogen is already default to false.
We don't need to add it by default.
2018-12-12 11:24:40 +01:00
17a786092a Do not set unused configure options in flatpak. 2018-12-12 11:19:07 +01:00
71e31c54e5 update version of kiwix-lib and kiwix-desktop 2018-12-03 11:23:37 +01:00
9679c01254 Run docker with all privileges. 2018-11-30 11:37:23 +01:00
92d637ad99 Better flatpak build.
- Print the name of the module instead of the builder.
- Do not try to build the kiwix-desktop dependencies in the flatpak.
- Correct the path of the created flatpak.
2018-11-30 11:37:23 +01:00
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
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
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
054f7802d0 Update version of kiwix-lib and kiwix-tools. 2018-11-12 16:54:44 +01:00
500e2c1e02 update version of kiwix-lib and kiwix-desktop 2018-11-03 12:35:12 +01:00
85f0d4ccb1 Update version of kiwix-lib and kiwix-desktop. 2018-11-02 17:37:02 +01:00
1440dd8b25 Update version of kiwix-lib, kiwix-tools and kiwix-desktop. 2018-10-31 17:20: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