smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #234 from kiwix/release_desktop 

[Travis] Also build kiwix-desktop when building for release.
This commit is contained in:
Matthieu Gautier 2018-08-05 19:08:34 +02:00 committed by GitHub
parent 0a6adf762b f51204d424
commit 02712cc9e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
travis/compile_all.py
View File

@ -300,7 +300,6 @@ elif PLATFORM.startswith('native_'):
TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib') TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib')
else: else:
if PLATFORM == 'native_dyn' and KIWIX_DESKTOP_ONLY: if PLATFORM == 'native_dyn' and KIWIX_DESKTOP_ONLY:
if not make_release:
TARGETS = ('kiwix-desktop', ) TARGETS = ('kiwix-desktop', )
else: else:
TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools') TARGETS = ('libzim', 'zimwriterfs', 'zim-tools', 'kiwix-lib', 'kiwix-tools')
@ -330,7 +329,7 @@ for target in TARGETS:
# We have build everything. Now create archives for public deployement. # We have build everything. Now create archives for public deployement.
if make_release and PLATFORM == 'native_dyn': if make_release and PLATFORM == 'native_dyn':
for target in TARGETS: for target in TARGETS:
if target in ('kiwix-lib', 'kiwix-tools'): if target in ('kiwix-lib', 'kiwix-tools', 'kiwix-desktop'):
out_dir = DIST_KIWIX_ARCHIVES_DIR out_dir = DIST_KIWIX_ARCHIVES_DIR
else: else:
out_dir = DIST_ZIM_ARCHIVES_DIR out_dir = DIST_ZIM_ARCHIVES_DIR