openlp-core team mailing list archive

[Stevan Pettit <ElderP@xxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~elderp/openlp/packaging2-version into lp:openlp/packaging-2.0.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~elderp/openlp/packaging2-version/+merge/144041

Added code so current version info is displayed to user during the Inno setup.
-- 
https://code.launchpad.net/~elderp/openlp/packaging2-version/+merge/144041
Your team OpenLP Core is requested to review the proposed merge of lp:~elderp/openlp/packaging2-version into lp:openlp/packaging-2.0.

=== modified file 'windows/OpenLP-2.0.iss.default'
--- windows/OpenLP-2.0.iss.default	2012-06-09 19:02:47 +0000
+++ windows/OpenLP-2.0.iss.default	2013-01-20 23:26:22 +0000
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define AppName "OpenLP"
-#define AppVerName "OpenLP 2.0"
+#define AppVerName "OpenLP %(display_version)s"
 #define AppPublisher "OpenLP Developers"
 #define AppURL "http://openlp.org/";
 #define AppExeName "OpenLP.exe"

=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2012-06-25 16:38:21 +0000
+++ windows/windows-builder.py	2013-01-20 23:26:22 +0000
@@ -510,6 +510,7 @@
         input = open(os.path.join(self.script_path,
             u'OpenLP-2.0.iss.default'), u'r').read()
         output = input.replace(u'%(branch)s', self.branch_path)
+        output = output.replace(u'%(display_version)s', self.version)
         outfile = open(os.path.join(self.script_path,
             u'OpenLP-2.0.iss'), u'w')
         outfile.write(output)