Commit Graph

547 Commits

Author SHA1 Message Date
54458ccb0a Merge pull request #238 from kiwix/fix_src_path
Fix the src path of kiwix-desktop when doing release.
0.0.7
2018-08-06 11:31:03 +02:00
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
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
cad38f8a53 Use the correct source path of kiwix-desktop when doing release. 2018-08-06 09:24:29 +02:00
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
d91f40b467 Export TRAVIS_TAG env var in docker 2018-08-05 20:00:14 +02:00
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
f51204d424 [Travis] Also build kiwix-desktop when building for release. 2018-08-04 09:06:38 +02:00
0a6adf762b Merge pull request #233 from kiwix/new_version
New version
2018-08-03 23:44:33 +02:00
a64fd8cd20 New versions. 2018-08-03 19:34:50 +02:00
b910a7b720 [AppVeyor] No more windows branch for kiwix-lib. 2018-08-03 19:34:50 +02:00
05290ec859 Merge pull request #232 from kiwix/fix_appimage
Fix appimage
2018-08-03 16:34:57 +02:00
05c0a691ec Insert lowlevel libraries in the appimage.
May fix kiwix/kiwix-desktop#14
2018-08-03 15:53:13 +02:00
c256857e01 Create the app image using the ".appimage" extension.
Fix kiwix/kiwix-desktop#19
2018-08-03 15:53:13 +02:00
afc6bf0907 Add svg icon support into the appimage
- Add missing packages in Dockerfile to support svg icons.
- Include needed plugins in the appimage.
2018-08-03 15:53:13 +02:00
0d3ea8eaa5 Use the kiwix.desktop file and the icon in the kiwix-desktop sources.
No need anymore to generate one or take a random image.
2018-08-03 15:52:50 +02:00
2024dae4c8 Merge pull request #231 from kiwix/android_no_header_mmap
Do not use buffered header on android.
2018-08-01 19:33:03 +02:00
e22ceab92a Do not use buffered header on android.
Android devices are low memory devices, use last libzim compilation option
to avoid copy/mmap index header in memory.
2018-08-01 18:07:13 +02:00
66c79e2aac Merge pull request #229 from kiwix/no_libzim_windows_branch
`libzim`'s branch window has been merged in master.
2018-07-31 09:10:51 +02:00
9d7e1af17f libzim's branch window has been merged in master. 2018-07-30 20:54:06 +02:00
b9479e8506 Merge pull request #228 from kiwix/appveyor_xapian_1.4.7
xapian 1.4.7
2018-07-27 14:09:05 +02:00
de6ae772d4 Update to last vresion of xapian. 2018-07-27 10:46:00 +02:00
b2bd19f484 Use last version of xapian instead of prerelease 2018-07-27 10:22:53 +02:00
ec273f7b0e Merge pull request #227 from kiwix/fix_sign
Sign the application after windeployqt.
2018-07-27 09:29:36 +02:00
6e396360a8 Sign the application after windeployqt.
windeployqt modify the executable, so we must sign it after.
2018-07-26 19:37:38 +02:00
013c3bd3ec Merge pull request #226 from kiwix/sign_windows_app
Sign windows application in AppVeyor
2018-07-26 16:01:02 +02:00
a4bdec74b4 Sign windows application in AppVeyor 2018-07-26 15:10:25 +02:00
81d9a96229 Merge pull request #225 from kiwix/fix_qt_version
Fix the path of AppVeyor Qt to be minor version independent.
2018-07-26 11:18:32 +02:00
968c6ecc44 Fix the path of AppVeyor Qt to be minor version independent.
AppVeyor may update minor version of Qt and change `5.11.0` to `5.11.1`.
If we use the path with the full version, it will break in the futur.

AppVeyor install a link `5.11` pointing to the last version, so let's use
it.
2018-07-26 10:28:21 +02:00
5876adbb69 Merge pull request #224 from kiwix/kiwix-custom-app
Fix compilation of kiwix-custom-app.
2018-07-19 17:02:58 +02:00
5c83ba9d10 Fix compilation of kiwix-custom-app.
This is forgotten dependency. Not updated when we moved to multi-arch
build.
Now, it is fixed.
2018-07-19 16:19:55 +02:00
3283bbe565 Merge pull request #222 from kiwix/no_window_branch_desktop
[AppVeyor] No windows branch for kiwix-desktop.
2018-07-17 17:35:28 +02:00
3e3513731e [AppVeyor] No windows branch for kiwix-desktop.
The `windows` branch has been merge. We should directly use `master` now.
2018-07-17 16:50:49 +02:00
1693a542ed Merge pull request #221 from kiwix/app_veyor
Add basic kiwix-desktop build on AppVeyor.
2018-07-17 13:11:25 +02:00
2743f64ef8 Add basic kiwix-desktop build on AppVeyor.
This is somehow a side build system base on cmd scripts.
We should merge it in kiwix-build but... no time for now :/
2018-07-17 11:23:09 +02:00
a17cdeba49 Merge pull request #220 from kiwix/travis_no_dep_archive_android
[TRAVIS] Do not make a deps archive when PLATFORM is android.
2018-07-16 19:27:49 +02:00
25af2cfa6c [TRAVIS] Do not make a deps archive when PLATFORM is android.
We never use the android platform in other project. We always an arch
specific android platform (android_arm).

So, do not try to do any dependencies archives there.
Especially if travis kill the job because it takes too long to create
the archive.
2018-07-16 18:31:50 +02:00
eed1ddce4e Merge pull request #219 from kiwix/readme_android_typos
[README] Fix typos in android section in the readme.
2018-07-16 18:23:35 +02:00
20994fa048 [README] Fix typos in android section in the readme. 2018-07-16 11:46:34 +02:00
c4bd748d2c Merge pull request #201 from kiwix/svn_export
Use faster svn export instead of svn checkout
2018-07-16 11:45:38 +02:00
79a08e001b Use faster svn export instead of svn checkout 2018-07-16 10:15:28 +02:00
87ef2b99f4 Merge pull request #218 from kiwix/archive_home_root
[TRAVIS] Allways use $HOME as relative path in dependencies archives.
2018-07-16 10:11:31 +02:00
56d897d8d8 [TRAVIS] Allways use $HOME as relative path in dependencies archives.
As we now move to multi-arch build, we may have things compiled natively
or "neutral" (as toolchains). So we cannot use the BASE_DIR as
relative_path because BASE_DIR is arch dependent.
2018-07-16 09:42:46 +02:00
9ab64220a3 Merge pull request #215 from kiwix/android_cache
[TRAVIS] Try to use arch specific base_deps when build android multi arch.
2018-07-13 14:43:12 +02:00
bae484f7ae [TRAVIS] Print a '.' every 50 files added to an archive.
It will avoid travis-ci to kill the job because of the absence of output.
2018-07-13 11:51:00 +02:00
1a4267a887 Print a '.' every 30 seconds when running a command.
It will avoid travis-ci to kill the job because of the absence of output.
2018-07-13 10:39:18 +02:00
7391b54edf [TRAVIS] Try to use arch specific base_deps when build android multi arch.
Compiling all dependencies for all archs takes a too long time for travis.
By downloading the cache of specific android arch, we avoid to recompile
them.

Android will need kiwix-lib builder to build, so we cannot make the
target_only.
2018-07-13 10:39:18 +02:00
e577efd612 Merge pull request #216 from kiwix/correct_decrypt_key
[TRAVIS] Correctly decrypt the ssh key
2018-07-11 17:15:15 +02:00
cd0d075def Do not try to decrypt the ssh_key if we cannot.
If we are building a PR comming from a fork, the secret key will not
be available and we cannot decrypt the ssh key.

And if the ssh key cannot be decrypted, we should not try to use it to
upload base dependencies.

`cron` and deployement are made only on "secured environment" so we don't
need to test for existance of the key because we are sure that we have
been able to decrypt it.
2018-07-11 15:55:11 +02:00
f5fdc70e84 Revert "Try to decrypt the secret key only if we will do a deployement."
`travis/compile_all.py` may need the secret key to upload dependencies
cache to our server.

So, just decrypt the key before the upload is not good enough (and breaks
PR building new version of base dependencies)

This reverts commit 74efad49e2.
2018-07-11 15:19:23 +02:00