Commit Graph

281 Commits

Author SHA1 Message Date
Matthieu Gautier 220d434b88 `write_text` method exists only on python 3.5.
And travis is using python 3.4 :/
2018-02-03 19:56:00 +01:00
Matthieu Gautier cfb20517a1
Merge pull request #114 from kiwix/fix_typo
fix typo in compile_all.py
2018-02-03 05:21:48 +01:00
Matthieu Gautier 51ba7132a4 fix typo in compile_all.py 2018-02-02 23:46:47 +01:00
Matthieu Gautier 4ff307328f
Merge pull request #112 from kiwix/travis_deploy
We must deploy releases archive when a tag is set not on cron.
2018-02-02 14:46:51 +01:00
Matthieu Gautier cb468fc49f We must deploy releases archive when a tag is set not on cron. 2018-02-02 12:07:01 +01:00
Matthieu Gautier 524da9c4fe
Merge pull request #103 from kiwix/travis_update
New travis script written in python.
2018-02-02 11:41:50 +01:00
Matthieu Gautier 06cf4d44d0 New travis script written in python and handle release deployement.
`compile_all.sh` script starts to be very complex.
Let's rewrite it in python.

In the same time, update the travis scripts to handle deployement of
release versions.
2018-02-01 18:21:59 +01:00
Matthieu Gautier 47b00fe5dc Update subproject version. 2018-02-01 16:51:22 +01:00
Matthieu Gautier 170ba5e3b1
Merge pull request #111 from kiwix/icu4c_patch
Backport icu4c patch to not include `xlocale.h`
2018-01-29 15:07:57 +01:00
Matthieu Gautier b8f913ce69 Backport icu4c patch to not include `xlocale.h`
Last version of glibc 2.26 has removed the `xlocal.h` file.
(https://sourceware.org/glibc/wiki/Release/2.26#Removal_of_.27xlocale.h.27)

We cannot use last version of icu4c (60.1) because it used a feature not
yet exported in mingw32 releases.

So we need to backport a patch for this.

Fix #110
2018-01-29 11:15:50 +01:00
Kelson 6326fadde2
Merge pull request #105 from kiwix/mhutti1/android-build-fix
Fix Android APK output location
2018-01-03 08:39:46 +01:00
Isaac Hutt 14d4651504
Fix Android APK output location 2018-01-02 22:51:11 +00:00
Kelson 426e88b626
Merge pull request #102 from kiwix/archive_name_fix
Fix kiwix-tools archive name for linux64
2017-12-17 20:53:25 +01:00
kelson42 680c95b1fc Fix kiwix-tools archive name for linux64 2017-12-17 19:34:44 +01:00
Kelson 4e6ed8240c
Merge pull request #101 from kiwix/mhutti1/android-output
Change apk output directory to new location
2017-12-16 19:44:39 +01:00
mhutti1 38ba4dbcc2 Change apk output directory to new location 2017-12-15 11:06:49 +00:00
Matthieu Gautier afc32ff71e
Merge pull request #98 from kiwix/meson_test
Stop using the deprecated (and broken) `mesontest`.
2017-12-13 14:50:04 +00:00
Matthieu Gautier 6768631b25 Force installation of meson 0.43.0.
There are some problem in meson 0.44.0.

`meson` change the way it detects static libraries (to something that seems
better to me), but it breaks some of our build that we have to fix.

Until we have fixed our dependencies declaration, let's force meson to
be in 0.43.0.
2017-12-13 15:09:58 +01:00
Matthieu Gautier 1c8b8ef99b Stop using the deprecated (and broken) `mesontest`.
`mesontest` command is deprecated since meson 0.42.0 and broken with last
release (0.44.0) (see mesonbuild/meson#2761).

Fix #97.
2017-12-12 11:19:07 +00:00
Matthieu Gautier 29157c96eb
Merge pull request #96 from kiwix/make_release
Make release
2017-12-05 10:20:41 +00:00
Matthieu Gautier ba7028f0a8 Force the source_dir of ctpp2 source.
The `source_dir` is automatically infer from the name of the dependency.
As the ctpp2 source is use in two dependencies (ctpp2 and ctpp2c), if
we use the default source_dir, kiwix-build will use one name and the
other dependency will not find the source directory.

By forcing the `source_dir`, both dependencies will use the same directory.
2017-12-05 09:32:47 +00:00
Matthieu Gautier 43937caf6d Make travis create the dist archive.
TODO: Copy the archive at the right place.
2017-12-05 09:32:47 +00:00
Matthieu Gautier a9ce8ee8c1 Add a `--make-dist` command to kiwix-build.
If specified, kiwix-build will not "make/install" the target but make
the dist archive (source).

It will build dependencies, as the make dist will try to compile and test
the target.
2017-12-05 09:32:47 +00:00
Matthieu Gautier bb5b85da50 Make travisCI publish binaries as release versions when tag is pushed.
This publish the same this that nightly build except that :
- Use the `--make-release` option to force kiwix-build to use tagged
  version of subprojects.
- The archives are named using the tag name.
- The archives are pushed to "releases" directory in download.kiwix.org.
2017-12-05 09:32:47 +00:00
Matthieu Gautier e4f8b6c7a9 Add a option to kiwix-build.py to build release version of subproject.
With `--make-release` option, kiwix-build.py will build the tagged
version of the subproject.
2017-11-28 22:42:16 +00:00
Matthieu Gautier 9823f7ae48
Merge pull request #95 from kiwix/ci_zimwriterfr_zimtools
Also compile zim-tools and zimwriterfs in the CI.
2017-11-28 22:41:17 +00:00
Matthieu Gautier 603300c154 Allow android build to fails.
Recent changes on android side make the build fails.
While this is not fixed, do not block MR not related to kiwix-android.

This should be reverted as soon as kiwix-android build is fixed.
2017-11-28 21:41:17 +00:00
Matthieu Gautier 7c7471e01c Update version of gradle.
`kiwix-android` changes the minimum version of gradle to use
kiwix/kiwix-android#289

Let's adapt.
2017-11-28 15:18:37 +00:00
Matthieu Gautier d7ffc4bd34 Add gumbo dependency.
This is needed by zimwriterfs and the package doesn't exist on
ubuntu trusty (used by travis CI).
2017-11-28 14:30:31 +00:00
Matthieu Gautier 19730ed7c3 Compile zim-tools only on native platform.
There is no gcc-5 compiler available for cross-compiling.
2017-11-28 13:13:15 +00:00
Matthieu Gautier 53ecc65b9d Zimwriterfs need libmagic-dev.
Install the package `libmagic-dev`.

There is no precompiled libmagic package from cross-compilation and we
are mainly using zimwriterfs only on linux.
2017-11-28 13:11:39 +00:00
Matthieu Gautier 7fc557dd44 Use gcc-5 to compile everything.
Zimsplit use ofstream move `operator=()` or `swap()` method.
This has been implemented in gcc-5 only
(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316)

So install g++-5 and use it in travis CI.
2017-11-28 12:26:08 +00:00
Matthieu Gautier 89e6068572 Also compile zim-tools and zimwriterfs in the CI.
Nightly will also be publish alongside with other nightly's.

Fixes #89 and #90
2017-11-28 12:26:01 +00:00
Matthieu Gautier dcef39c28f
Merge pull request #86 from kiwix/zim-tools
Add support of `zim-tools` in kiwix-build.
2017-11-14 18:58:21 +01:00
Matthieu Gautier 00bc8238f0 Add support of `zim-tools` in kiwix-build. 2017-11-14 11:46:54 +01:00
Kelson a37aae0142
Merge pull request #91 from kiwix/xapian_1.4.5
Move to Xapian 1.4.5
2017-11-07 22:31:48 +01:00
kelson42 1d1dc3a5f5 Move to Xapian 1.4.5 2017-11-07 21:07:01 +01:00
Kelson e9f0ed6a26
Merge pull request #68 from kiwix/easy_cusotm_app
Small perl script to build custom app manually
2017-11-07 21:05:46 +01:00
Kelson ba48334e48 Add option --version 2017-11-07 20:09:14 +01:00
Kelson 76362a6caf Fix VERSION_CODE and CONTENT_VERSION_CODE 2017-11-07 20:08:15 +01:00
Kelson fb8d4cea7b Small perl script to build custom app manually 2017-11-07 20:08:15 +01:00
Matthieu Gautier 9fdc25a165 Merge pull request #87 from kiwix/android-license
Fix android sdk license change.
2017-10-17 16:24:54 +02:00
Matthieu Gautier d9be1808c7 Fix android sdk license change. 2017-10-17 15:25:18 +02:00
Matthieu Gautier 667af63e98 Merge pull request #84 from kiwix/xapian
Use the right patch for xapian.
2017-10-11 00:12:52 +02:00
Matthieu Gautier 0898e24145 Use the right patch for xapian.
The previous patch was overly complex and finally wrong.
We should simply use `@XAPIAN_LIBS` as `Libs.private`.

Next release of xapian will integrate this
(https://trac.xapian.org/ticket/751), but for now, we still a patch
on our side.
2017-10-10 22:57:11 +02:00
Matthieu Gautier 41f6c9b3aa Merge pull request #85 from kiwix/meson_android_file
Avoid rename the meson cross compilation file.
2017-10-10 12:14:32 +02:00
Matthieu Gautier dc00fcd297 Avoid rename the meson cross compilation file.
This file is exported in CI archive for other projects.
If we change its name, it will not be exported and other projects will
break.
2017-10-10 11:19:14 +02:00
Matthieu Gautier 47b5b55ed4 Merge pull request #83 from kiwix/google_test
Run meson test when possible.
2017-10-02 17:35:08 +02:00
Matthieu Gautier 4997017be2 Run meson test when possible.
To run unit-test (meson) on cross-compilation, we need a wrapper to run
the binary (wine, qemu, ...), but:

- We have no emulator for android (we have one for the system, but we can't
  simply run a binary)
- With dynamic compilation, it seems pretty complex to configure them
  correctly.
- For mingw32 compilation, `wine` need to be correctly configured to
  find dll from the system mingw32 installation.
2017-10-02 16:05:06 +02:00
Matthieu Gautier 9ab444521c Merge pull request #82 from kiwix/fix_travis_build
Fix installation of meson and pillow (pip3) in travis.
2017-09-11 15:15:37 +02:00