From d583f9a3cb65fdfcea95887211180c82ac396c60 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 11 Mar 2019 14:11:56 +0100 Subject: [PATCH 1/5] Try to fix portable apps version. Also added oszl as file type. --- windows/OpenLP.iss.default | 1 + windows/appinfo.ini.default | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/windows/OpenLP.iss.default b/windows/OpenLP.iss.default index 688fc34..fe5ac87 100644 --- a/windows/OpenLP.iss.default +++ b/windows/OpenLP.iss.default @@ -87,6 +87,7 @@ Filename: {app}\{#AppExeName}; Description: {cm:LaunchProgram,{#AppName}}; Flags [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""" diff --git a/windows/appinfo.ini.default b/windows/appinfo.ini.default index 8bb12c3..238e6ac 100644 --- a/windows/appinfo.ini.default +++ b/windows/appinfo.ini.default @@ -19,7 +19,7 @@ CommercialUse=true [Version] DisplayVersion=%(display_version)s-%(arch)s -PackageVersion=%(package_version)s-%(arch)s +PackageVersion=%(package_version)s [Control] Icons=1 @@ -27,6 +27,8 @@ Start=OpenLPPortable.exe [Associations] FileType=osz +FileType=oszl [FileTypeIcons] osz=app +oszl=app From 9381311d7de44b40fb4d138a254779e2ed142893 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Mon, 11 Mar 2019 14:46:12 +0100 Subject: [PATCH 2/5] Add a missing s --- windows/OpenLP.iss.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/OpenLP.iss.default b/windows/OpenLP.iss.default index fe5ac87..0543626 100644 --- a/windows/OpenLP.iss.default +++ b/windows/OpenLP.iss.default @@ -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) From 933325e9d1269a82ce06a74974476671dd35db59 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 13 Mar 2019 21:21:15 +0100 Subject: [PATCH 3/5] Try to fix appveyor build of portable installer --- builders/windows-builder.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index fbc658c..7fc4a07 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -216,8 +216,9 @@ class WindowsBuilder(Builder): 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(self._run_command(['dir', os.path.abspath(os.path.join(self.portable_dest_path, '..'))])) self._print_verbose('... Portable Build: {}'.format(portable_exe_path)) if os.path.exists(portable_exe_path): move(portable_exe_path, os.path.join(self.dist_path, '..', portable_exe_name)) From 293571a69a8f98f211d8334b239e3969fee724ae Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 13 Mar 2019 21:39:11 +0100 Subject: [PATCH 4/5] Add missing param --- builders/windows-builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 7fc4a07..94ebdcc 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -218,12 +218,12 @@ class WindowsBuilder(Builder): 'Error running PortableApps Installer') 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(self._run_command(['dir', os.path.abspath(os.path.join(self.portable_dest_path, '..'))])) self._print_verbose('... Portable Build: {}'.format(portable_exe_path)) if os.path.exists(portable_exe_path): move(portable_exe_path, os.path.join(self.dist_path, '..', portable_exe_name)) self._print('PortableApp build complete') else: + self._print(self._run_command(['dir', os.path.abspath(os.path.join(self.portable_dest_path, '..'))], 'Could not dir')) raise Exception('PortableApp failed to build') def get_platform(self): From 215fbc23ccfe305142e2d2aee40b2a8e67eeeb1b Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Wed, 13 Mar 2019 22:00:05 +0100 Subject: [PATCH 5/5] remove debug print --- builders/windows-builder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 94ebdcc..4defe06 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -223,7 +223,6 @@ class WindowsBuilder(Builder): move(portable_exe_path, os.path.join(self.dist_path, '..', portable_exe_name)) self._print('PortableApp build complete') else: - self._print(self._run_command(['dir', os.path.abspath(os.path.join(self.portable_dest_path, '..'))], 'Could not dir')) raise Exception('PortableApp failed to build') def get_platform(self):