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-12-23 12:16:13 -05:00
parent 8e2fa9d7ef 1a05686931
commit 27d9136229
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
windows/OpenLP-2.0.iss.default → windows/OpenLP.iss.default
View File

@ -26,7 +26,7 @@ AppPublisherURL={#AppURL}
AppSupportURL={#AppURL} AppSupportURL={#AppURL}
AppUpdatesURL={#AppURL} AppUpdatesURL={#AppURL}
DefaultDirName={pf}\{#AppName} DefaultDirName={pf}\{#AppName}
DefaultGroupName={#AppVerName} DefaultGroupName={#AppName}
AllowNoIcons=true AllowNoIcons=true
LicenseFile=LICENSE.txt LicenseFile=LICENSE.txt
OutputDir=%(branch)s\dist\ OutputDir=%(branch)s\dist\

6
windows/windows-builder.py
View File

@ -490,10 +490,10 @@ class WindowsBuilder(object):
Create an InnoSetup file pointing to the branch being built. Create an InnoSetup file pointing to the branch being built.
""" """
self._print('Creating Inno Setup file...') 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 = input.replace('%(branch)s', self.branch_path)
output = output.replace('%(display_version)s', self.version) 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.write(output)
outfile.close() outfile.close()
@ -529,7 +529,7 @@ class WindowsBuilder(object):
""" """
self._print('Running Inno Setup...') self._print('Running Inno Setup...')
os.chdir(self.script_path) 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() code = innosetup.wait()
if code != 0: if code != 0:
raise Exception('Error running Inno Setup') raise Exception('Error running Inno Setup')