mirror of
https://gitlab.com/openlp/packaging.git
synced 2024-12-22 13:02:50 +00:00
merge trunk
This commit is contained in:
commit
27d9136229
@ -26,7 +26,7 @@ AppPublisherURL={#AppURL}
|
||||
AppSupportURL={#AppURL}
|
||||
AppUpdatesURL={#AppURL}
|
||||
DefaultDirName={pf}\{#AppName}
|
||||
DefaultGroupName={#AppVerName}
|
||||
DefaultGroupName={#AppName}
|
||||
AllowNoIcons=true
|
||||
LicenseFile=LICENSE.txt
|
||||
OutputDir=%(branch)s\dist\
|
@ -490,10 +490,10 @@ class WindowsBuilder(object):
|
||||
Create an InnoSetup file pointing to the branch being built.
|
||||
"""
|
||||
self._print('Creating Inno Setup file...')
|
||||
input = open(os.path.join(self.script_path, 'OpenLP-2.0.iss.default'), 'r').read()
|
||||
input = open(os.path.join(self.script_path, 'OpenLP.iss.default'), 'r').read()
|
||||
output = input.replace('%(branch)s', self.branch_path)
|
||||
output = output.replace('%(display_version)s', self.version)
|
||||
outfile = open(os.path.join(self.script_path, 'OpenLP-2.0.iss'), 'w')
|
||||
outfile = open(os.path.join(self.script_path, 'OpenLP.iss'), 'w')
|
||||
outfile.write(output)
|
||||
outfile.close()
|
||||
|
||||
@ -529,7 +529,7 @@ class WindowsBuilder(object):
|
||||
"""
|
||||
self._print('Running Inno Setup...')
|
||||
os.chdir(self.script_path)
|
||||
innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP-2.0.iss'), '/q'))
|
||||
innosetup = Popen((self.innosetup, os.path.join(self.script_path, 'OpenLP.iss'), '/q'))
|
||||
code = innosetup.wait()
|
||||
if code != 0:
|
||||
raise Exception('Error running Inno Setup')
|
||||
|
Loading…
Reference in New Issue
Block a user