From d05247ea479c7f903b8e0f37269c7c6245849157 Mon Sep 17 00:00:00 2001 From: Tomas Groth Date: Thu, 28 Sep 2017 21:25:51 +0200 Subject: [PATCH] Change method name --- builders/builder.py | 7 +++---- builders/windows-builder.py | 14 +++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/builders/builder.py b/builders/builder.py index d1e7734..5226da4 100644 --- a/builders/builder.py +++ b/builders/builder.py @@ -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') diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 3e7f656..1562789 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -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__':