From d63684975fcce72d1bad3349df32514ef2cae1f5 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Mon, 2 Sep 2019 18:13:08 +0200
Subject: [PATCH] Use a build version to publish the windows release of
 kiwix-desktop.

---
 appveyor.yml                      |  2 ++
 appveyor/package_kiwix-desktop.sh | 29 +++++++++++++++++------------
 kiwixbuild/versions.py            |  7 +++++++
 3 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 7a783d9..1423ab4 100644
--- a/appveyor.yml
+++ b/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: |
diff --git a/appveyor/package_kiwix-desktop.sh b/appveyor/package_kiwix-desktop.sh
index 7b0efa6..749f64c 100644
--- a/appveyor/package_kiwix-desktop.sh
+++ b/appveyor/package_kiwix-desktop.sh
@@ -7,23 +7,28 @@ 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
-  KIWIX_ARCHIVES_DIR=/c/projects/RELEASE_KIWIX_ARCHIVES
-  KIWIX_DIR=kiwix-desktop_windows_x64_${KIWIX_DESKTOP_VERSION}
+  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
 
-KIWIX_ARCH_NAME=${KIWIX_DIR}.zip
+if [[ "$KIWIX_DIR" ]]
+then
+  KIWIX_ARCH_NAME=${KIWIX_DIR}.zip
 
-mkdir $KIWIX_DIR
-mkdir -p KIWIX_ARCHIVES_DIR
+  mkdir $KIWIX_DIR
+  mkdir -p KIWIX_ARCHIVES_DIR
 
-cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR
+  cp /c/projects/kiwix-build/kiwix-desktop/Release/kiwix-desktop.exe $KIWIX_DIR
 /c/Qt/5.11/msvc2017_64/bin/windeployqt --compiler-runtime $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
+  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
+  /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
+  7z a -tzip $KIWIX_ARCHIVES_DIR/$KIWIX_ARCH_NAME $KIWIX_DIR
+fi
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index 735ad58..6dad48a 100644
--- a/kiwixbuild/versions.py
+++ b/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)