From 8c3a8be65d1eb363c6aab48fbbbb598eb29f6cfd Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Mon, 4 Jun 2018 19:16:55 +0200 Subject: [PATCH] Build kiwix-desktop in travis. --- Dockerfile | 5 +++++ travis/compile_all.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ed82f4..70f8218 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,11 @@ RUN \ ctpp2-utils \ libctpp2-dev \ libmicrohttpd-dev \ +# Qt packages + libqt5gui5 \ + qtbase5-dev \ + qtwebengine5-dev \ + qt5-default \ # Some helper tools vim \ less \ diff --git a/travis/compile_all.py b/travis/compile_all.py index f73af5d..a84c6eb 100755 --- a/travis/compile_all.py +++ b/travis/compile_all.py @@ -211,6 +211,8 @@ if environ['TRAVIS_EVENT_TYPE'] != 'cron' and not make_release: elif PLATFORM.startswith('native_'): if TRAVIS_OS_NAME == "osx": TARGETS = ('kiwix-lib', 'zim-tools', 'zimwriterfs') + elif PLATFORM == 'native_dyn': + TARGETS = ('kiwix-tools', 'kiwix-desktop', 'zim-tools', 'zimwriterfs') else: TARGETS = ('kiwix-tools', 'zim-tools', 'zimwriterfs') else: @@ -235,7 +237,10 @@ elif PLATFORM.startswith('native_'): if TRAVIS_OS_NAME == "osx": TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib') else: - TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools') + if make_release: + TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools') + else: + TARGETS = ('libzim', 'kiwix-lib', 'kiwix-desktop', 'zimwriterfs', 'zim-tools', 'kiwix-tools') else: TARGETS = ('libzim', 'zim-tools', 'kiwix-lib', 'kiwix-tools')