openlp/packaging
1
0
Fork 0
mirror of https://gitlab.com/openlp/packaging.git synced 2024-12-22 13:02:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix some issues in windows packaging related to portable setup.

Browse Source 
bzr-revno: 44
This commit is contained in:
Tomas Groth 2019-03-14 21:44:37 +01:00
commit d55d1209fd
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builders/windows-builder.py
View File

@ -216,7 +216,7 @@ class WindowsBuilder(Builder):
self._print_verbose('... Building PortableApps Installer') self._print_verbose('... Building PortableApps Installer')
self._run_command([self.portableinstaller_exe, self.portable_dest_path], self._run_command([self.portableinstaller_exe, self.portable_dest_path],
'Error running PortableApps Installer') '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)) 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)) self._print_verbose('... Portable Build: {}'.format(portable_exe_path))
if os.path.exists(portable_exe_path): if os.path.exists(portable_exe_path):

3
windows/OpenLP.iss.default
View File

@ -7,7 +7,7 @@
#define AppPublisher "OpenLP Developers" #define AppPublisher "OpenLP Developers"
#define AppURL "http://openlp.org/" #define AppURL "http://openlp.org/"
#define AppExeName "OpenLP.exe" #define AppExeName "OpenLP.exe"
#define Arch "%(arch)" #define Arch "%(arch)s"
#define FileHandle FileOpen("%(branch)s\dist\OpenLP\.version") #define FileHandle FileOpen("%(branch)s\dist\OpenLP\.version")
#define FileLine FileRead(FileHandle) #define FileLine FileRead(FileHandle)
@ -87,6 +87,7 @@ Filename: {app}\{#AppExeName}; Description: {cm:LaunchProgram,{#AppName}}; Flags
[Registry] [Registry]
Root: HKCR; Subkey: .osz; ValueType: string; ValueName: ; ValueData: OpenLP; Flags: uninsdeletevalue 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; 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\DefaultIcon; ValueType: string; ValueName: ; ValueData: {app}\OpenLP.exe,0
Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1""" Root: HKCR; Subkey: OpenLP\shell\open\command; ValueType: string; ValueName: ; ValueData: """{app}\OpenLP.exe"" ""%1"""

4
windows/appinfo.ini.default
View File

@ -19,7 +19,7 @@ CommercialUse=true
[Version] [Version]
DisplayVersion=%(display_version)s-%(arch)s DisplayVersion=%(display_version)s-%(arch)s
PackageVersion=%(package_version)s-%(arch)s PackageVersion=%(package_version)s
[Control] [Control]
Icons=1 Icons=1
@ -27,6 +27,8 @@ Start=OpenLPPortable.exe
[Associations] [Associations]
FileType=osz FileType=osz
FileType=oszl
[FileTypeIcons] [FileTypeIcons]
osz=app osz=app
oszl=app