[WIP] Build and publish a dev version of kiwix-desktop.

appveyor.yml

@@ -12,7 +12,6 @@ environment:
   KIWIX_DESKTOP_VERSION: '2.0.1-1'
   KIWIX_DESKTOP_RELEASE: 0
 
-
 init:
   - cmd: |
      echo %TEST_VAR%
@@ -21,6 +20,7 @@ init:
      mkdir C:\extra\bin
 
 install:
+  - set QTDIR=C:\Qt\5.14.1
   - cmd: |
      cd C:\projects
      REM Install meson

appveyor/deploy.sh

@@ -12,6 +12,13 @@ then
     ci@download.kiwix.org:/data/download/nightly
 fi
 
+if [[ "$APPVEYOR_REPO_BRANCH" != "master" ]]
+then
+  scp -vrp -i ${SSH_KEY} -o StrictHostKeyChecking=no \
+    ${NIGHTLY_KIWIX_ARCHIVES_DIR} \
+    ci@download.kiwix.org:/data/tmp/ci/${APPVEYOR_REPO_BRANCH}
+fi
+
 if [[ "$APPVEYOR_REPO_TAG" = "true" ]]
 then
   RELEASE_ARCHIVES=$(find $RELEASE_KIWIX_ARCHIVES_DIR -type f)

appveyor/install_kiwix-desktop.cmd

@@ -2,8 +2,11 @@ REM ========================================================
 REM Install kiwix-desktop
 git clone https://github.com/kiwix/kiwix-desktop || exit /b 1
 cd kiwix-desktop
+git checkout fullscreen-menu-windows
+echo "Getting fix_desktop"
+curl -fsSL -O http://public.kymeria.fr/KIWIX/windows/fix_desktop_makefile.py_ || exit /b 1
 echo "Running qmake"
-C:\Qt\5.12\msvc2017_64\bin\qmake.exe "CONFIG+=static" || exit /b 1
+C:\Qt\5.12\msvc2017_64\bin\qmake.exe "CONFIG+=static console" || exit /b 1
 echo "Running fix_desktop"
 C:\Python36\Python ..\appveyor\fix_desktop_makefile.py Makefile.Release || exit /b 1
 echo "Running nmake"

kiwixbuild/dependencies/kiwix_desktop.py

@@ -10,6 +10,7 @@ class KiwixDesktop(Dependency):
     class Source(GitClone):
         git_remote = "https://github.com/kiwix/kiwix-desktop.git"
         git_dir = "kiwix-desktop"
+        # git_ref = "menu-icon"
 
     class Builder(QMakeBuilder):
         dependencies = ["qt", "qtwebengine", "kiwix-lib", "aria2", "kiwix-tools"]

scripts/create_kiwix-desktop_appImage.sh

@@ -20,7 +20,7 @@ mkdir -p $APPDIR/usr/{bin,lib,share} $APPDIR/usr/share/applications $APPDIR/usr/
 cp $INSTALLDIR/bin/kiwix-desktop $APPDIR/usr/bin/
 cp $INSTALLDIR/$SYSTEMLIBDIR/*.so* $APPDIR/usr/lib
 # Remove it as it break with linuxdeployqt (should we compile without it) ?
-rm $APPDIR/usr/lib/libmagic.so*
+# rm $APPDIR/usr/lib/libmagic.so*
 # Copy nss lib (to not conflict with host's ones)
 cp -a /usr/$SYSTEMLIBDIR/nss $APPDIR/usr/lib
 cp -a /usr/$SYSTEMLIBDIR/libstdc++.so* $APPDIR/usr/lib