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

Change method name

Browse Source
This commit is contained in:
Tomas Groth 2017-09-28 21:25:51 +02:00
parent 2df10e780d
commit d05247ea47
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builders/builder.py
View File

@ -262,9 +262,9 @@ class Builder(object):
self._bzr('export', self.branch_path, ['-r', 'tag:' + self.version, self.work_path], self._bzr('export', self.branch_path, ['-r', 'tag:' + self.version, self.work_path],
'Error exporting the code') 'Error exporting the code')
def get_binaries(self): def get_extra_parameters(self):
""" """
Return a list of the binaries to include Return a list of any extra parameters we wish to use
""" """
return [] return []
@ -275,7 +275,6 @@ class Builder(object):
self._print('Running PyInstaller...') self._print('Running PyInstaller...')
copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script) copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script)
os.chdir(self.work_path) os.chdir(self.work_path)
# Create the binary list
cmd = [self.python, cmd = [self.python,
self.pyinstaller_exe, self.pyinstaller_exe,
'--clean', '--clean',
@ -286,7 +285,7 @@ class Builder(object):
'--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'), '--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'),
'-i', self.icon_path, '-i', self.icon_path,
'-n', 'OpenLP', '-n', 'OpenLP',
*self.get_binaries(), # Adds any binaries we wish to include *self.get_extra_parameters(), # Adds any extra parameters we wish to use
self.openlp_script] self.openlp_script]
if self.args.verbose: if self.args.verbose:
cmd.append('--log-level=DEBUG') cmd.append('--log-level=DEBUG')

14
builders/windows-builder.py
View File

@ -339,16 +339,16 @@ class WindowsBuilder(Builder):
if self.args.portable: if self.args.portable:
self._run_portableapp_builder() self._run_portableapp_builder()
def get_binaries(self): def get_extra_parameters(self):
""" """
Return a list of the binaries to include Return a list of any extra parameters we wish to use
""" """
binaries = [] parameters = []
# Finds the UCRT DDLs available from the Windows SDK # Finds the UCRT DDLs available from the Windows 10 SDK
for binary in glob.glob('C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x86\\*.dll'): for binary in glob.glob('C:\\Program Files (x86)\\Windows Kits\\10\\Redist\\ucrt\\DLLs\\x86\\*.dll'):
binaries.append('--add-binary') parameters.append('--add-binary')
binaries.append(binary + ";.") parameters.append(binary + ";.")
return binaries return parameters
if __name__ == '__main__': if __name__ == '__main__':