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

Package kiwix-serve within kiwix-desktop. 

Now that kiwix-desktop use kiwix-serve to serve the content, we need to
compile and package kiwix-serve (kiwix-tools).
This commit is contained in:
Matthieu Gautier 2019-07-24 10:33:40 +02:00
parent 2994384d3a
commit 7d659baa37
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
appveyor.yml
View File

@ -54,6 +54,7 @@ build_script:
- IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh" - IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh"
- appveyor\install_libzim.cmd - appveyor\install_libzim.cmd
- appveyor\install_kiwix-lib.cmd - appveyor\install_kiwix-lib.cmd
- appveyor\install_kiwix-tools.cmd
- appveyor\install_kiwix-desktop.cmd - appveyor\install_kiwix-desktop.cmd
before_deploy: before_deploy:

4
appveyor/install_kiwix-tools.cmd Normal file
View File

@ -0,0 +1,4 @@
REM ========================================================
REM Install kiwix-tools
curl -fsSL -O https://download.kiwix.org/release/kiwix-tools/kiwix-tools_win-i686-2.0.0.zip || exit /b 1
7z e kiwix-tools_win-i686-2.0.0.zip -o%EXTRA_DIR%\bin kiwix-serve.exe || exit /b 1

1
appveyor/package_kiwix-desktop.sh
View File

@ -22,6 +22,7 @@ cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR
cp $MINGW64_EXTRA_DIR/aria2c.exe $KIWIX_DIR cp $MINGW64_EXTRA_DIR/aria2c.exe $KIWIX_DIR
cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR cp $MINGW64_EXTRA_DIR/bin/*.dll $KIWIX_DIR
cp $MINGW64_EXTRA_DIR/bin/kiwix-serve.exe $KIWIX_DIR
/c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe /c/Program\ Files\ \(x86\)/Windows\ Kits/10/bin/x64/signtool.exe sign -f appveyor/kiwix.pfx -p $win_certificate_password -t http://timestamp.verisign.com/scripts/timestamp.dll -d "Kiwix-desktop application" $KIWIX_DIR/kiwix-desktop.exe

2
kiwixbuild/dependencies/kiwix_desktop.py
View File

@ -11,7 +11,7 @@ class KiwixDesktop(Dependency):
git_dir = "kiwix-desktop" git_dir = "kiwix-desktop"
class Builder(QMakeBuilder): class Builder(QMakeBuilder):
dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2"] dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"]
make_install_target = 'install' make_install_target = 'install'
@property @property

3
kiwixbuild/flatpak_builder.py
View File

@ -52,6 +52,9 @@ MANIFEST = {
'/bin/curl', '/bin/curl',
'/bin/copydatabase', '/bin/copydatabase',
'/bin/kiwix-compile-resources', '/bin/kiwix-compile-resources',
'/bin/kiwix-manage',
'/bin/kiwix-read',
'/bin/kiwix-search',
'/bin/quest', '/bin/quest',
'/bin/simple*', '/bin/simple*',
'/bin/xapian-*', '/bin/xapian-*',

3
scripts/create_kiwix-desktop_appImage.sh
View File

@ -31,6 +31,9 @@ wget https://github.com/q3aql/aria2-static-builds/releases/download/v1.34.0/aria
mkdir -p $APPDIR/usr/bin/ && tar -C $APPDIR/usr/bin/ -xf aria2-1.34.0-linux-gnu-64bit-build1.tar.bz2 aria2-1.34.0-linux-gnu-64bit-build1/aria2c --strip-components=1 mkdir -p $APPDIR/usr/bin/ && tar -C $APPDIR/usr/bin/ -xf aria2-1.34.0-linux-gnu-64bit-build1.tar.bz2 aria2-1.34.0-linux-gnu-64bit-build1/aria2c --strip-components=1
mkdir -p $APPDIR/etc/ssl/certs/ && tar -C $APPDIR/etc/ssl/certs/ -xf aria2-1.34.0-linux-gnu-64bit-build1.tar.bz2 aria2-1.34.0-linux-gnu-64bit-build1/ca-certificates.crt --strip-components=1 mkdir -p $APPDIR/etc/ssl/certs/ && tar -C $APPDIR/etc/ssl/certs/ -xf aria2-1.34.0-linux-gnu-64bit-build1.tar.bz2 aria2-1.34.0-linux-gnu-64bit-build1/ca-certificates.crt --strip-components=1
# copy kiwix-serve
cp $INSTALLDIR/bin/kiwix-serve $APPDIR/usr/bin
# Get linuxdeployqt # Get linuxdeployqt
wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
chmod a+x linuxdeployqt-continuous-x86_64.AppImage chmod a+x linuxdeployqt-continuous-x86_64.AppImage