From 3d15f980bc47f639b68c0905378d30d0df9671d1 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 18 Feb 2019 14:47:57 +0100
Subject: [PATCH 1/2] PICARD-1474: Fix version information in Windows installer
 exe

---
 installer/picard-setup.nsi.in | 3 ++-
 setup.py                      | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/installer/picard-setup.nsi.in b/installer/picard-setup.nsi.in
index 44ade4727..ed12894bb 100644
--- a/installer/picard-setup.nsi.in
+++ b/installer/picard-setup.nsi.in
@@ -77,13 +77,14 @@ ReserveFile "${NSISDIR}\Plugins\x86-unicode\InstallOptions.dll"
 !insertmacro MUI_LANGUAGE "English"
 
 ; Adds info to installer
-VIProductVersion "0.12.0.0"
+VIProductVersion "%(file_version)s"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "${PRODUCT_NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "${PRODUCT_DESCRIPTION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "${PRODUCT_PUBLISHER}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "© ${PRODUCT_PUBLISHER} under the GNU GPLv2."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Installation for ${PRODUCT_NAME}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "%(version)s"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "%(version)s"
 
 ; Install
 Section !Required req
diff --git a/setup.py b/setup.py
index fb2ab6332..2d67b071a 100644
--- a/setup.py
+++ b/setup.py
@@ -216,11 +216,12 @@ class picard_build(build):
         if platform.system() == 'Windows':
             # Temporarily setting it to this value to generate a nice name for Windows app
             args['name'] = 'MusicBrainz Picard'
+            file_version = PICARD_VERSION[0:3] + PICARD_VERSION[4:]
+            args['file_version'] = '.'.join([str(v) for v in file_version])
             generate_file('installer/picard-setup.nsi.in', 'installer/picard-setup.nsi', args)
-            version = str(PICARD_VERSION[0:3] + PICARD_VERSION[4:])
             version_args = {
-                'filevers': version,
-                'prodvers': version,
+                'filevers': str(file_version),
+                'prodvers': str(file_version),
             }
             generate_file('win-version-info.txt.in', 'win-version-info.txt', {**args, **version_args})
             args['name'] = 'picard'

From 5b9f6ecfc4da1e82035980a86bcbcda7c21896f2 Mon Sep 17 00:00:00 2001
From: Philipp Wolfer <phil@parolu.io>
Date: Mon, 18 Feb 2019 15:03:10 +0100
Subject: [PATCH 2/2] Fix encoding issue of strings in Windows installer

Fixes the copyright sign to be shown correctly.
---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index b0e2f9ea2..2662743b8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -57,7 +57,7 @@ build_script:
 
     pyinstaller --noconfirm picard.spec
 
-    makensis.exe installer\picard-setup.nsi
+    makensis.exe /INPUTCHARSET UTF8 installer\picard-setup.nsi
 
 artifacts:
 - path: installer/*.exe