Merge lp:~urs-rau-k/openlp/packaging_add-windows-ver-no into lp:openlp/packaging

Proposed by TheBigBear
Status: Merged
Merged at revision: 23
Proposed branch: lp:~urs-rau-k/openlp/packaging_add-windows-ver-no
Merge into: lp:openlp/packaging
Diff against target: 29 lines (+4/-1)
1 file modified
windows/OpenLP-2.0.iss.default (+4/-1)
To merge this branch: bzr merge lp:~urs-rau-k/openlp/packaging_add-windows-ver-no
Reviewer Review Type Date Requested Status
Stevan Pettit (community) Approve
Raoul Snyman Approve
Tim Bentley Approve
TheBigBear (community) Approve
Review via email: mp+269028@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
Revision history for this message
TheBigBear (urs-rau-k) wrote :

3rd time lucky, I guess. ;-)

Revision history for this message
TheBigBear (urs-rau-k) wrote :

ElderP on freenode IRC said, he would build this using this changed inno iss setup file. So testing is underway, or may have already happened. BTW what is ElderP's reviewer name?
Blessings all

Revision history for this message
TheBigBear (urs-rau-k) wrote :

OK, ElderP on IRC (Stevan Pettit) left my a msg via iTwinkle that this change worked, and it correctly added the version number into the windows registry.

Revision history for this message
TheBigBear (urs-rau-k) wrote :

OK, ElderP on IRC (Stevan Pettit) left my a msg via iTwinkle that this change worked, and it correctly added the version number into the windows registry.
So this can be approved for merging.

review: Approve
Revision history for this message
Tim Bentley (trb143) wrote :

Looks OK but would like ElderP to approve as well

review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Stevan Pettit (elderp-deactivatedaccount) wrote :

Patch worked fine. Current version number was added to the registry.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'windows/OpenLP-2.0.iss.default'
2--- windows/OpenLP-2.0.iss.default 2014-10-27 00:08:27 +0000
3+++ windows/OpenLP-2.0.iss.default 2015-08-25 09:59:13 +0000
4@@ -3,6 +3,7 @@
5
6 #define AppName "OpenLP"
7 #define AppVerName "OpenLP %(display_version)s"
8+#define AppVersion "%(display_version)s"
9 #define AppPublisher "OpenLP Developers"
10 #define AppURL "http://openlp.org/"
11 #define AppExeName "OpenLP.exe"
12@@ -18,7 +19,8 @@
13 ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
14 AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
15 AppName={#AppName}
16-AppVerName={#AppVerName}
17+AppVerName={cm:NameAndVersion,{#AppName},{#AppVersion}}
18+AppVersion={#AppVersion}
19 AppPublisher={#AppPublisher}
20 AppPublisherURL={#AppURL}
21 AppSupportURL={#AppURL}
22@@ -32,6 +34,7 @@
23 Compression=lzma/Max
24 SolidCompression=true
25 SetupIconFile=OpenLP.ico
26+VersionInfoVersion={#AppVersion}
27 WizardImageFile=WizImageBig.bmp
28 WizardSmallImageFile=WizImageSmall.bmp
29 ChangesAssociations=true

Subscribers

People subscribed via source and target branches