From 7d659baa3739306bc2ed46e8db30789c7fd96d00 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 24 Jul 2019 10:33:40 +0200
Subject: [PATCH] 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).
---
 appveyor.yml                             | 1 +
 appveyor/install_kiwix-tools.cmd         | 4 ++++
 appveyor/package_kiwix-desktop.sh        | 1 +
 kiwixbuild/dependencies/kiwix_desktop.py | 2 +-
 kiwixbuild/flatpak_builder.py            | 3 +++
 scripts/create_kiwix-desktop_appImage.sh | 3 +++
 6 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 appveyor/install_kiwix-tools.cmd

diff --git a/appveyor.yml b/appveyor.yml
index d7f4290..06d3cf0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -54,6 +54,7 @@ build_script:
   - IF "%USE_CACHE%" NEQ "1" %MINGW64_RUN% "cd /c/projects/kiwix-build && appveyor/create_cache.sh"
   - appveyor\install_libzim.cmd
   - appveyor\install_kiwix-lib.cmd
+  - appveyor\install_kiwix-tools.cmd
   - appveyor\install_kiwix-desktop.cmd
 
 before_deploy:
diff --git a/appveyor/install_kiwix-tools.cmd b/appveyor/install_kiwix-tools.cmd
new file mode 100644
index 0000000..aa9fd7c
--- /dev/null
+++ b/appveyor/install_kiwix-tools.cmd
@@ -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
diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh
index f47a747..d182dd0 100644
--- a/appveyor/package_kiwix-desktop.sh
+++ b/appveyor/package_kiwix-desktop.sh
@@ -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/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
 
diff --git a/kiwixbuild/dependencies/kiwix_desktop.py b/kiwixbuild/dependencies/kiwix_desktop.py
index bbe33d2..08ac4b4 100644
--- a/kiwixbuild/dependencies/kiwix_desktop.py
+++ b/kiwixbuild/dependencies/kiwix_desktop.py
@@ -11,7 +11,7 @@ class KiwixDesktop(Dependency):
         git_dir = "kiwix-desktop"
 
     class Builder(QMakeBuilder):
-        dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2"]
+        dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"]
         make_install_target = 'install'
 
         @property
diff --git a/kiwixbuild/flatpak_builder.py b/kiwixbuild/flatpak_builder.py
index 8ce1811..d8c1f93 100644
--- a/kiwixbuild/flatpak_builder.py
+++ b/kiwixbuild/flatpak_builder.py
@@ -52,6 +52,9 @@ MANIFEST = {
         '/bin/curl',
         '/bin/copydatabase',
         '/bin/kiwix-compile-resources',
+        '/bin/kiwix-manage',
+        '/bin/kiwix-read',
+        '/bin/kiwix-search',
         '/bin/quest',
         '/bin/simple*',
         '/bin/xapian-*',
diff --git a/scripts/create_kiwix-desktop_appImage.sh b/scripts/create_kiwix-desktop_appImage.sh
index 32c2483..7738fe5 100755
--- a/scripts/create_kiwix-desktop_appImage.sh
+++ b/scripts/create_kiwix-desktop_appImage.sh
@@ -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/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
 wget https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
 chmod a+x linuxdeployqt-continuous-x86_64.AppImage