OpenLP

Merge lp:~tomasgroth/openlp/packaging-win-ver-fix into lp:openlp/packaging

  1. packaging-win-ver-fix
  2. Merge into packaging
Proposed by Tomas Groth
Status: Merged
Merged at revision: 44
Proposed branch: lp:~tomasgroth/openlp/packaging-win-ver-fix
Merge into: lp:openlp/packaging
Diff against target: 55 lines (+6/-3)
3 files modified
builders/windows-builder.py (+1/-1)
windows/OpenLP.iss.default (+2/-1)
windows/appinfo.ini.default (+3/-1)
To merge this branch: bzr merge lp:~tomasgroth/openlp/packaging-win-ver-fix
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+364402@code.launchpad.net

Commit message

Fix some issues in windows packaging related to portable setup.

To post a comment you must log in.
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'builders/windows-builder.py'
2--- builders/windows-builder.py 2019-03-08 21:20:20 +0000
3+++ builders/windows-builder.py 2019-03-13 21:01:59 +0000
4@@ -216,7 +216,7 @@
5 self._print_verbose('... Building PortableApps Installer')
6 self._run_command([self.portableinstaller_exe, self.portable_dest_path],
7 'Error running PortableApps Installer')
8- portable_exe_name = 'OpenLPPortable_%s.paf.exe' % self.portable_version
9+ portable_exe_name = 'OpenLPPortable_{ver}-{arch}.paf.exe'.format(ver=self.portable_version, arch=self.arch)
10 portable_exe_path = os.path.abspath(os.path.join(self.portable_dest_path, '..', portable_exe_name))
11 self._print_verbose('... Portable Build: {}'.format(portable_exe_path))
12 if os.path.exists(portable_exe_path):
13
14=== modified file 'windows/OpenLP.iss.default'
15--- windows/OpenLP.iss.default 2019-03-08 21:20:20 +0000
16+++ windows/OpenLP.iss.default 2019-03-13 21:01:59 +0000
17@@ -7,7 +7,7 @@
18 #define AppPublisher "OpenLP Developers"
19 #define AppURL "http://openlp.org/"
20 #define AppExeName "OpenLP.exe"
21-#define Arch "%(arch)"
22+#define Arch "%(arch)s"
23
24 #define FileHandle FileOpen("%(branch)s\dist\OpenLP\.version")
25 #define FileLine FileRead(FileHandle)
26@@ -87,6 +87,7 @@
27
28 [Registry]
29 Root: HKCR; Subkey: .osz; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
30+Root: HKCR; Subkey: .oszl; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
31 Root: HKCR; Subkey: OpenLP; ValueType: string; ValueName: ; ValueData: OpenLP Service; Flags: uninsdeletekey
32 Root: HKCR; Subkey: OpenLP\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\OpenLP.exe,0
33 Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1"""
34
35=== modified file 'windows/appinfo.ini.default'
36--- windows/appinfo.ini.default 2019-03-08 21:20:20 +0000
37+++ windows/appinfo.ini.default 2019-03-13 21:01:59 +0000
38@@ -19,7 +19,7 @@
39
40 [Version]
41 DisplayVersion=%(display_version)s-%(arch)s
42-PackageVersion=%(package_version)s-%(arch)s
43+PackageVersion=%(package_version)s
44
45 [Control]
46 Icons=1
47@@ -27,6 +27,8 @@
48
49 [Associations]
50 FileType=osz
51+FileType=oszl
52
53 [FileTypeIcons]
54 osz=app
55+oszl=app

Subscribers

People subscribed via source and target branches