openlp-core team mailing list archive

[TheBigBear <urs.rau@xxxxxxxxx>]

TheBigBear has proposed merging lp:~urs-rau-k/openlp/packaging_add-windows-ver-no into lp:openlp/packaging.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #1488081 in OpenLP: "has no "DisplayVersion" in uninstaller reg key "
  https://bugs.launchpad.net/openlp/+bug/1488081

For more details, see:
https://code.launchpad.net/~urs-rau-k/openlp/packaging_add-windows-ver-no/+merge/269028

This adds the openLP version number into the windows uninstaller registry keys. 
Inno setup does all the heavy lifting, all we had to do was tell the inno iss script the openLP version number.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~urs-rau-k/openlp/packaging_add-windows-ver-no into lp:openlp/packaging.

=== modified file 'windows/OpenLP-2.0.iss.default'
--- windows/OpenLP-2.0.iss.default	2014-10-27 00:08:27 +0000
+++ windows/OpenLP-2.0.iss.default	2015-08-25 09:59:13 +0000
@@ -3,6 +3,7 @@
 
 #define AppName "OpenLP"
 #define AppVerName "OpenLP %(display_version)s"
+#define AppVersion "%(display_version)s"
 #define AppPublisher "OpenLP Developers"
 #define AppURL "http://openlp.org/";
 #define AppExeName "OpenLP.exe"
@@ -18,7 +19,8 @@
 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
 AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
 AppName={#AppName}
-AppVerName={#AppVerName}
+AppVerName={cm:NameAndVersion,{#AppName},{#AppVersion}}
+AppVersion={#AppVersion}
 AppPublisher={#AppPublisher}
 AppPublisherURL={#AppURL}
 AppSupportURL={#AppURL}
@@ -32,6 +34,7 @@
 Compression=lzma/Max
 SolidCompression=true
 SetupIconFile=OpenLP.ico
+VersionInfoVersion={#AppVersion}
 WizardImageFile=WizImageBig.bmp
 WizardSmallImageFile=WizImageSmall.bmp
 ChangesAssociations=true