Commit Graph

965 Commits

Author SHA1 Message Date
99226e0c6a Build zstd in flatpak.
Revert 10c767e8ce
2020-04-20 15:14:31 +02:00
161c018702 [WINDOWS CI] Fix version of kiwix-tools 0.0.66 2020-04-20 13:23:24 +02:00
4b080dd975 New version of kiwix-desktop. 2020-04-20 10:10:45 +02:00
60e3e755e1 New build of libzim, kiwix-lib and zim-tools.
Do not build kiwix-desktop yet as we will do a new release just after.
0.0.65
2020-04-17 17:46:28 +02:00
069aab9a35 Do not fail if there is nothing to commit of flathub repository. 0.0.64 2020-04-10 11:35:21 +02:00
af55ffed6d Fix patch of kiwix-desktop makefile for zstd.
- Copy the python script in kiwix-build repository instead of getting i
  from kymeria.fr
- Patch the makefile to change the lib for zstd.
2020-04-10 11:35:00 +02:00
39771c6481 [CI] Build on windows for all branches/tags.
- We need to build for tags to build the releases.
- Build on other branches is useful to build test version of kiwix-desktop.
2020-04-10 09:42:16 +02:00
ffdee634f4 Do not force a reconfigure of meson projects.
If meson.build changes, the ninja command will rebuild it.
And its avoid us to delete the build directory.
2020-04-10 00:38:47 +02:00
384b7d6a00 [CI] Export dist archive before building other project.
With the commit fb07b58 we are not skiping the compile/build process
of meson project. As meson projects first remove the build directory
before configuring, we remove dist archives that could have been generated
before.

Copy the dist archive in the export so we are ok.
2020-04-10 00:38:47 +02:00
62f48f2836 Better log of what is deployed. 2020-04-10 00:38:47 +02:00
3d08278a85 New version of kiwix-desktop. 2020-04-08 20:42:11 +02:00
bd546fe33e New version of libzim, zim-tools, zimwriterfs, kiwix-lib and kiwix-tools. 2020-04-08 18:12:01 +02:00
10c767e8ce Do not compile zstd on flatpak.
The meson.build file of meson is not in the main directory.
We have to update kiwix-build to handle this.

For now, compile flatpak without zstd.
We will need to do a new build on flatpak with zstd soon.
2020-04-08 18:09:39 +02:00
3c8a9ffbfe Use standard name for CI (#433) 2020-04-07 18:17:38 +02:00
c4931925a3 Merge pull request #423 from kiwix/zstd
Added zstd dependency (fixes #422)
2020-04-07 15:16:09 +02:00
3cbcac2e30 Applying xapian_remote.patch in appveyor build
Failing to do so in PR#384 secretly broke the appveyor build (no real
failures were observed since the appveyor builds ran in USE_CACHE=1
mode, without rebuilding the base dependencies to which xapian belongs).
2020-04-07 16:41:31 +04:00
25d9e18e3d Temporary fix for facebook/zstd#2073 2020-04-07 14:12:17 +04:00
a2aac46da9 Moved C:\Python36\Scripts to the begging of PATH
Otherwise in the appveyor Windows build meson installed under
"C:\Program Files" is used.
2020-04-06 23:54:00 +04:00
3a03e9a8aa Added appveyor/install_zstd.cmd 2020-04-06 23:03:39 +04:00
ece4df3721 Added zstd dependency 2020-04-06 20:17:09 +02:00
9be35a4dc0 Fix qt-everywhere-src-5.10.1.tar.xz URL (#431) 2020-04-06 20:16:01 +02:00
d073c6d1dc Merge pull request #432 from kiwix/donot_recompile
Fix recompilation of the CI of meson project.
2020-04-06 19:31:37 +02:00
fb07b58812 Fix recompilation of the CI of meson project.
We were assuming that meson project correspond to our projects and so we
were always building them, even if they were already compiled.
(This way, a simple `kiwix-build` is enough to recompile the WIP code of
our project).

However, on the CI, we do not archive the source code/build directory in
the base deps archive. So when we try to compile, the compile step of
meson projects fails because the source are not here.
We have a small workaround for pugixml but as zstd is also meson, it is
time to do something correct.

By default, all projects now try to skip if a build is already present.
Our projects are marked as `force_build` and so, they do not try to skip.
2020-04-06 19:15:40 +02:00
3ea1bfd38e Proper Github Actions CI badge 2020-04-06 16:29:46 +02:00
20394d341f Merge pull request #420 from kiwix/O3_compilation
Build all make based dependency using -O3 option.
2020-03-24 17:21:11 +01:00
4fa5f34125 Build all make based dependency using -O3 option.
This will build all Make, CMake, QMake dependency being build with -O3.
So all our dependencies will be build with -O3.

Our project (meson) are already build in release when needed.
kiwix-desktop should be build optimized in case of release but we need
to handle it correctly. At least not build in O3 per default as it may
break debug.
2020-03-24 16:50:38 +01:00
aa277a925a Merge pull request #417 from kiwix/lzma_asm
Use correct base version
2020-03-18 22:27:16 +01:00
b910803fbe Use correct base version 2020-03-18 21:47:09 +01:00
b932dbd35e Merge pull request #416 from kiwix/lzma_asm
Build lzma with assembler optimization.
2020-03-18 21:42:08 +01:00
71c46d984a Build lzma with assembler optimization. 2020-03-18 21:03:48 +01:00
d8707d8ad1 Release kiwix-tools 3.0.3 0.0.62 2020-03-01 15:52:50 +01:00
56cbf4985c fix typos in compile_all.py (build of android app) 2020-02-27 15:41:10 +01:00
8cecb1c759 Rebuild kiwix-lib (for android) 2020-02-26 18:32:00 +01:00
bf405d105c Revert 82617f6b94 2020-02-26 18:30:24 +01:00
ad24eaab4b Merge pull request #414 from kiwix/fix_cross_file
Always write the cross_file using the same name.
2020-02-25 17:17:19 +01:00
6093c011ab Always write the cross_file using the same name.
Even if we use different template for different platform, we must
always use the same cross_file name.
2020-02-25 16:36:56 +01:00
d30ec7219e Merge pull request #413 from kiwix/no_git_update
No git update
2020-02-25 16:34:53 +01:00
08ed650c78 [CI] Clone git repository with a depth of 1 in the CI. 2020-02-25 15:53:23 +01:00
40b5013279 Add some colors in the terminal. 2020-02-25 15:48:20 +01:00
f504cf54e1 Do not reset the source directory if there is modification.
We simply do a `git merge --ff-only` instead of a `git reset`. This way:

- No change on the local repository
    => update to `remote/master`
- If you switch branch and local branch is behind `remote/master`
    => fast forward to `remote/master`
- If you switch branch and branches diverge
    => No update of the directory
- On branch master (or a branch behind `origin/master`) with compatible
  change in the working tree.
    =>  update of the directory
- On branch master (or a branch behind `origin/master`) but incompatible
  change in the working tree.
    =>  No update.

This way, sources are keep up-to-date as far as possible.
2020-02-25 15:46:09 +01:00
3f50b1b069 Merge pull request #412 from kiwix/fix_android_ci
Fix android ci
2020-02-24 20:51:09 +01:00
94c98261c7 Fix compilation on different platform in the same time.
If we modify the dependency's configure_env, we may change
the dictionary with value of the first platform. Then, when
we use it for the second platform, the previous values are used.

Do not modify the dep_conf_env dictionary and then we are good.
2020-02-24 18:24:07 +01:00
32e3b5b5c4 Fix compilation of kiwix-lib-app.
- We should not try to set the cross compilation flags when we use
  gradle.
- Fix anyway the setting of tho cross compilation flags for android sdk
  platform (the default implementation use the `static` attributes that
  doesn't exist for android)
2020-02-24 15:30:31 +01:00
8bca6ea8dc Merge pull request #411 from kiwix/action_ios2
Action ios2
2020-02-21 18:48:20 +01:00
661eb95df0 Use a specific cross_file on iOS cross compilation.
We need to set the property `needs_exe_wrapper` to true for
x86_64 cross compilation.

Else, meson will try to detect if we could run the cross
compiled executable, and because it is the same arch, it will
assume we can. So it will try to sanity check and execute the
cross compiled binary. Then fails.
2020-02-21 16:29:23 +01:00
7b6c79482a Make the dependency responsible to set the compilation env.
Instead of having the run_command function setting the
env from the buildEnv, this is the dependency that create the
env and then pass it to the run_command function.

This way, each dependency will be able to set a specific env.
2020-02-21 16:29:23 +01:00
e27ede80cc Use correct arch_full name. 2020-02-21 15:12:17 +01:00
36366b2dd3 Better define of value in ios platform.
No real change, just better code to define it.
2020-02-21 15:12:17 +01:00
7d742f807f Fix setting of environment using env from dependency.
If `self.configure_env` is a (computed) property, the previous code
never format the value of the env.
2020-02-21 15:12:17 +01:00
2c14c1a705 Build base for all iOS architectures. 2020-02-21 15:12:17 +01:00