Use a build version to publish the windows release of kiwix-desk… (#364)

Use a build version to publish the windows release of kiwix-desktop.

appveyor.yml

@@ -9,6 +9,8 @@ environment:
   MSYS2_ARG_CONV_EXCL: '-Tp'
   MINGW64_RUN: 'C:\msys64\usr\bin\bash.exe --login -c'
   MSYSTEM: 'MINGW64'
+  KIWIX_DESKTOP_VERSION: '2.0-rc1-1'
+  KIWIX_DESKTOP_RELEASE: 0
 
 init:
  - cmd: |

appveyor/package_kiwix-desktop.sh

@@ -7,11 +7,15 @@ then
   KIWIX_ARCHIVES_DIR=/c/projects/NIGHTLY_KIWIX_ARCHIVES/${NIGHTLY_DATE}
   KIWIX_DIR=kiwix-desktop_windows_x64_$NIGHTLY_DATE
 else
-  KIWIX_DESKTOP_VERSION=2.0-rc1
+  if [ $KIWIX_DESKTOP_RELEASE  -eq 1 ]
+  then
     KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
     KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION}
   fi
+fi
 
+if [[ "$KIWIX_DIR" ]]
+then
   KIWIX_ARCH_NAME=${KIWIX_DIR}.zip
 
   mkdir $KIWIX_DIR
@@ -27,3 +31,4 @@ 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
 
   7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR
+fi

kiwixbuild/versions.py

@@ -7,6 +7,7 @@ main_project_versions = {
     'zim-tools': '1.0.4',
     'zimwriterfs': '1.3.5',
     'kiwix-desktop': '2.0-rc1' # Also need to be change in appveyor/package_kiwix-desktop.sh
+                               # Also change KIWIX_DESKTOP_VERSION and KIWIX_DESKTOP_RELEASE in appveyor.yml
 }
 
 # This dictionnary specify what we need to build at each release process.
@@ -23,6 +24,12 @@ main_project_versions = {
 #     `(was ...)`.
 #    - Else, increment the value. If no value was present, see `(was ...)`.
 
+# For kiwix-desktop, if this is not None:
+# - set KIWIX_DESKTOP_RELEASE to 1
+# - set KIWIX_DESKTOP_VERSION to the version of the release (including release_versions)
+# If this is None:
+# - set KIWIX_DESKTOP_RELEASE to 0
+
 release_versions = {
     'libzim': None, # Depends of base deps (was 0)
     'kiwix-lib': None, # Depends of libzim (was 0)