mirror of
https://gitlab.com/openlp/packaging.git
synced 2024-12-22 04:52:50 +00:00
Change method name
This commit is contained in:
parent
2df10e780d
commit
d05247ea47
@ -262,9 +262,9 @@ class Builder(object):
|
||||
self._bzr('export', self.branch_path, ['-r', 'tag:' + self.version, self.work_path],
|
||||
'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 []
|
||||
|
||||
@ -275,7 +275,6 @@ class Builder(object):
|
||||
self._print('Running PyInstaller...')
|
||||
copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script)
|
||||
os.chdir(self.work_path)
|
||||
# Create the binary list
|
||||
cmd = [self.python,
|
||||
self.pyinstaller_exe,
|
||||
'--clean',
|
||||
@ -286,7 +285,7 @@ class Builder(object):
|
||||
'--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'),
|
||||
'-i', self.icon_path,
|
||||
'-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]
|
||||
if self.args.verbose:
|
||||
cmd.append('--log-level=DEBUG')
|
||||
|
@ -339,16 +339,16 @@ class WindowsBuilder(Builder):
|
||||
if self.args.portable:
|
||||
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 = []
|
||||
# Finds the UCRT DDLs available from the Windows SDK
|
||||
parameters = []
|
||||
# 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'):
|
||||
binaries.append('--add-binary')
|
||||
binaries.append(binary + ";.")
|
||||
return binaries
|
||||
parameters.append('--add-binary')
|
||||
parameters.append(binary + ";.")
|
||||
return parameters
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
|
Loading…
Reference in New Issue
Block a user