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

[Tomas Groth]

Fix some issues in windows packaging related to portable setup.

[Raoul Snyman (raoul-snyman)]

review: Approve

[Tim Bentley (trb143)]

review: Approve

=== modified file 'builders/windows-builder.py'
--- builders/windows-builder.py	2019-03-08 21:20:20 +0000
+++ builders/windows-builder.py	2019-03-13 21:01:59 +0000
@@ -216,7 +216,7 @@
         self._print_verbose('... Building PortableApps Installer')
         self._run_command([self.portableinstaller_exe, self.portable_dest_path],
                           'Error running PortableApps Installer')
-        portable_exe_name = 'OpenLPPortable_%s.paf.exe' % self.portable_version
+        portable_exe_name = 'OpenLPPortable_{ver}-{arch}.paf.exe'.format(ver=self.portable_version, arch=self.arch)
         portable_exe_path = os.path.abspath(os.path.join(self.portable_dest_path, '..', portable_exe_name))
         self._print_verbose('... Portable Build: {}'.format(portable_exe_path))
         if os.path.exists(portable_exe_path):
 
=== modified file 'windows/OpenLP.iss.default'
--- windows/OpenLP.iss.default	2019-03-08 21:20:20 +0000
+++ windows/OpenLP.iss.default	2019-03-13 21:01:59 +0000
@@ -7,7 +7,7 @@
 #define AppPublisher "OpenLP Developers"
 #define AppURL "http://openlp.org/"
 #define AppExeName "OpenLP.exe"
-#define Arch "%(arch)"
+#define Arch "%(arch)s"
 
 #define FileHandle FileOpen("%(branch)s\dist\OpenLP\.version")
 #define FileLine FileRead(FileHandle)
@@ -87,6 +87,7 @@
 
 [Registry]
 Root: HKCR; Subkey: .osz; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
+Root: HKCR; Subkey: .oszl; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue
 Root: HKCR; Subkey: OpenLP; ValueType: string; ValueName: ; ValueData: OpenLP Service; Flags: uninsdeletekey
 Root: HKCR; Subkey: OpenLP\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\OpenLP.exe,0
 Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1"""
 
=== modified file 'windows/appinfo.ini.default'
--- windows/appinfo.ini.default	2019-03-08 21:20:20 +0000
+++ windows/appinfo.ini.default	2019-03-13 21:01:59 +0000
@@ -19,7 +19,7 @@
 
 [Version]
 DisplayVersion=%(display_version)s-%(arch)s
-PackageVersion=%(package_version)s-%(arch)s
+PackageVersion=%(package_version)s
 
 [Control]
 Icons=1
@@ -27,6 +27,8 @@
 
 [Associations]
 FileType=osz
+FileType=oszl
 
 [FileTypeIcons]
 osz=app
+oszl=app