Update dependency of kiwix-desktop.

Now that kiwix-desktop use kiwix-lib to start the server, we don't need
kiwix-tools dependency.

appveyor.yml

@@ -59,7 +59,6 @@ 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:

appveyor/install_kiwix-tools.cmd

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

appveyor/package_kiwix-desktop.sh

@@ -26,7 +26,6 @@ then
 
   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
 
   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
 

kiwixbuild/dependencies/kiwix_desktop.py

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

kiwixbuild/versions.py

@@ -3,10 +3,9 @@
 main_project_versions = {
     'libzim': '6.2.2',
     'kiwix-lib': '9.4.0',
-    'kiwix-tools': '3.1.2', # Also need to change this in appveyor/install_kiwix-tools.cmd
+    'kiwix-tools': '3.1.2',
     'zim-tools': '2.0.0',
     'kiwix-desktop': '2.0.4' # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml
-                               # You need to do the release process of kiwix-tools and kiwix-desktop in two separated process.
 }
 
 # This dictionnary specify what we need to build at each release process.

scripts/create_kiwix-desktop_appImage.sh

@@ -35,9 +35,6 @@ 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/6/linuxdeployqt-6-x86_64.AppImage
 chmod a+x linuxdeployqt-6-x86_64.AppImage
@@ -46,6 +43,5 @@ chmod a+x linuxdeployqt-6-x86_64.AppImage
 ./linuxdeployqt-6-x86_64.AppImage $APPDIR/usr/bin/kiwix-desktop -unsupported-allow-new-glibc -bundle-non-qt-libs -extra-plugins=imageformats,iconengines
 # Fix the RPATH of QtWebEngineProcess [TODO] Fill a issue ?
 patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/libexec/QtWebEngineProcess
-patchelf --set-rpath '$ORIGIN/../lib' $APPDIR/usr/bin/kiwix-serve
 # Build the image.
 ./linuxdeployqt-6-x86_64.AppImage $APPDIR/usr/share/applications/kiwix-desktop.desktop -unsupported-allow-new-glibc -bundle-non-qt-libs -extra-plugins=imageformats,iconengines -appimage