OpenLP

Merge lp:~raoul-snyman/openlp/windows-start-menu-name into lp:openlp/packaging

  1. windows-start-menu-name
  2. Merge into packaging
Proposed by Raoul Snyman
Status: Merged
Merged at revision: 27
Proposed branch: lp:~raoul-snyman/openlp/windows-start-menu-name
Merge into: lp:openlp/packaging
Diff against target: 38 lines (+4/-4)
2 files modified
windows/OpenLP.iss.default (+1/-1)
windows/windows-builder.py (+3/-3)
To merge this branch: bzr merge lp:~raoul-snyman/openlp/windows-start-menu-name
Reviewer Review Type Date Requested Status
Stevan Pettit (community) Approve
Tim Bentley Approve
Review via email: mp+274320@code.launchpad.net

Description of the change

[Windows] Rename OpenLP-2.0.iss.default to OpenLP.iss.default and update all references to it.

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) :
review: Approve
Revision history for this message
Stevan Pettit (elderp-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'windows/OpenLP-2.0.iss.default' => 'windows/OpenLP.iss.default'
2--- windows/OpenLP-2.0.iss.default 2015-08-25 08:45:08 +0000
3+++ windows/OpenLP.iss.default 2015-10-13 20:47:22 +0000
4@@ -26,7 +26,7 @@
5 AppSupportURL={#AppURL}
6 AppUpdatesURL={#AppURL}
7 DefaultDirName={pf}\{#AppName}
8-DefaultGroupName={#AppVerName}
9+DefaultGroupName={#AppName}
10 AllowNoIcons=true
11 LicenseFile=LICENSE.txt
12 OutputDir=%(branch)s\dist\
13
14=== modified file 'windows/windows-builder.py'
15--- windows/windows-builder.py 2015-09-28 17:33:21 +0000
16+++ windows/windows-builder.py 2015-10-13 20:47:22 +0000
17@@ -493,10 +493,10 @@
18 Create an InnoSetup file pointing to the branch being built.
19 """
20 self._print('Creating Inno Setup file...')
21- input = open(os.path.join(self.script_path, 'OpenLP-2.0.iss.default'), 'r').read()
22+ input = open(os.path.join(self.script_path, 'OpenLP.iss.default'), 'r').read()
23 output = input.replace('%(branch)s', self.branch_path)
24 output = output.replace('%(display_version)s', self.version)
25- outfile = open(os.path.join(self.script_path, 'OpenLP-2.0.iss'), 'w')
26+ outfile = open(os.path.join(self.script_path, 'OpenLP.iss'), 'w')
27 outfile.write(output)
28 outfile.close()
29
30@@ -532,7 +532,7 @@
31 """
32 self._print('Running Inno Setup...')
33 os.chdir(self.script_path)
34- innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP-2.0.iss'), '/q'))
35+ innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP.iss'), '/q'))
36 code = innosetup.wait()
37 if code != 0:
38 raise Exception('Error running Inno Setup')

Subscribers

People subscribed via source and target branches