From cbab0486afc656652a5a7f57fe040bfc4e2e34e0 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Wed, 12 Jun 2019 08:06:33 +0200
Subject: [PATCH] fix windows build scripts

---
 .appveyor.yml                                     | 13 ++-----------
 resources/desktop/com.github.rssguard.appdata.xml |  2 +-
 resources/scripts/.appveyor-build-win.ps1         | 13 +++++++++++++
 resources/scripts/.appveyor-install-win.ps1       | 10 +++-------
 4 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 resources/scripts/.appveyor-build-win.ps1

diff --git a/.appveyor.yml b/.appveyor.yml
index 5947a3d3b..03a8585ea 100755
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -34,17 +34,8 @@ deploy:
 
 build_script:
   - git submodule update --init --recursive
-  - set "QT_PLUGIN_PATH=%QTDIR%\plugins"
-  - set "PATH=%QTDIR%\bin;%PATH%"
-  - '%COMPILERBAT%'
-  - dir
-  - mkdir rssguard-build
-  - cd rssguard-build
-  - lrelease.exe -compress C:\rssguard\rssguard.pro
-  - qmake.exe C:\rssguard "%qmake_args%"
-  - nmake
-  - cd src\rssguard
-  - nmake windows_all
+  - '"C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat"'
+  - ps: C:\textosaurus\resources\scripts\.appveyor-build-win.ps1
 
 on_success:
   - ps: .\..\resources\scripts\.appveyor-install-win.ps1
\ No newline at end of file
diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 2884e6c0b..f1819f91e 100755
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.5.9" date="2019-06-11"/>
+    <release version="3.5.9" date="2019-06-12"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/resources/scripts/.appveyor-build-win.ps1 b/resources/scripts/.appveyor-build-win.ps1
new file mode 100644
index 000000000..4cdc97003
--- /dev/null
+++ b/resources/scripts/.appveyor-build-win.ps1
@@ -0,0 +1,13 @@
+# List startup folder.
+$old_pwd=$pwd.Path
+ls
+echo "Qmake args are: '$env:qmake_args'."
+
+mkdir "rssguard-build"
+cd "rssguard-build"
+qmake.exe ..\build.pro "$env:qmake_args"
+nmake.exe
+
+cd "src\rssguard"
+nmake.exe windows_all
+cd "$old_pwd"
\ No newline at end of file
diff --git a/resources/scripts/.appveyor-install-win.ps1 b/resources/scripts/.appveyor-install-win.ps1
index 84388df98..16d291e03 100755
--- a/resources/scripts/.appveyor-install-win.ps1
+++ b/resources/scripts/.appveyor-install-win.ps1
@@ -1,13 +1,9 @@
 ls
-curl -v
-
-cd rssguard-build\src\rssguard
+cd "rssguard-build\src\rssguard"
 
 $OutputEncoding = New-Object -typename System.Text.UTF8Encoding
-chcp 65001
-$OutputEncoding
 
-git clone -q --depth=1 https://github.com/martinrotter/rssguard.wiki.git C:\rssguard-wiki
+git clone -q --depth=1 https://github.com/martinrotter/rssguard.wiki.git "C:\rssguard-wiki"
 git config --global credential.helper store
 Add-Content "$env:USERPROFILE\.git-credentials" "https://$($env:access_token):x-oauth-basic@github.com`n"
 git config --global user.email "rotter.martinos@gmail.com"
@@ -42,7 +38,7 @@ $wikiline = "| Windows | $date | [$git_revision](https://github.com/martinrotter
 (Get-Content $wikifile) -replace $regex, $wikiline | Set-Content -Encoding "utf8" $wikifile
 
 
-cd C:\rssguard-wiki
+cd "C:\rssguard-wiki"
 git add *.*
 git commit -m "New files."
 git pull origin master