openlp
/
packaging
mirror of https://gitlab.com/openlp/packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge trunk

This commit is contained in:
Jonathan Springer 2015-10-17 08:28:04 -04:00
parent 44c92cd89a fe32bfd7fe
commit 1dbacbb634
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osx/macosx-builder.py
View File

@ -330,6 +330,7 @@ class MacosxBuilder(object):
'--noupx', '--noupx',
'--additional-hooks-dir', self.hooks_path, '--additional-hooks-dir', self.hooks_path,
'--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'), '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'),
'--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'),
'-i', self.mac_icon, '-i', self.mac_icon,
'-p', self.work_path, '-p', self.work_path,
'-n', 'OpenLP', '-n', 'OpenLP',

5
windows/OpenLP-2.0.iss.default
View File

@ -3,6 +3,7 @@
#define AppName "OpenLP" #define AppName "OpenLP"
#define AppVerName "OpenLP %(display_version)s" #define AppVerName "OpenLP %(display_version)s"
#define AppVersion "%(display_version)s"
#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"
@ -18,7 +19,8 @@
; (To generate a new GUID, click Tools | Generate GUID inside the IDE.) ; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485} AppID={{AA7699FA-B2D2-43F4-8A70-D497D03C9485}
AppName={#AppName} AppName={#AppName}
AppVerName={#AppVerName} AppVerName={cm:NameAndVersion,{#AppName},{#AppVersion}}
AppVersion={#AppVersion}
AppPublisher={#AppPublisher} AppPublisher={#AppPublisher}
AppPublisherURL={#AppURL} AppPublisherURL={#AppURL}
AppSupportURL={#AppURL} AppSupportURL={#AppURL}
@ -32,6 +34,7 @@ OutputBaseFilename=OpenLP-{#RealVersion}-setup
Compression=lzma/Max Compression=lzma/Max
SolidCompression=true SolidCompression=true
SetupIconFile=OpenLP.ico SetupIconFile=OpenLP.ico
VersionInfoVersion={#AppVersion}
WizardImageFile=WizImageBig.bmp WizardImageFile=WizImageBig.bmp
WizardSmallImageFile=WizImageSmall.bmp WizardSmallImageFile=WizImageSmall.bmp
ChangesAssociations=true ChangesAssociations=true