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

Try to include new ucrt distributables in win build.

Browse Source
This commit is contained in:
Tomas Groth 2017-09-26 23:58:42 +02:00
parent 9ae3703f76
commit 0ad2a6186a
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builders/builder.py
View File

@ -262,6 +262,12 @@ 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):
"""
Return a list of the binaries to include
"""
return []
def run_pyinstaller(self): def run_pyinstaller(self):
""" """
Run PyInstaller on the branch to build an executable. Run PyInstaller on the branch to build an executable.
@ -269,6 +275,7 @@ 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',
@ -279,6 +286,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',
*get_binaries(), # Adds any binaries we wish to include
self.openlp_script] self.openlp_script]
if self.args.verbose: if self.args.verbose:
cmd.append('--log-level=DEBUG') cmd.append('--log-level=DEBUG')

18
builders/windows-builder.py
View File

@ -26,12 +26,11 @@ Windows Build Script
This script is used to build the Windows binary and the accompanying installer. This script is used to build the Windows binary and the accompanying installer.
For this script to work out of the box, it depends on a number of things: For this script to work out of the box, it depends on a number of things:
Python 3.4 Python 3.6
PyQt5 PyQt5
You should already have this installed, OpenLP doesn't work without it. The You should already have this installed, OpenLP doesn't work without it. The
version the script expects is the packaged one available from River Bank version the script expects is the packaged one available from pypi.
Computing.
PyEnchant PyEnchant
This script expects the precompiled, installable version of PyEnchant to be This script expects the precompiled, installable version of PyEnchant to be
@ -48,8 +47,7 @@ HTML Help Workshop
This is used to create the help file. This is used to create the help file.
PyInstaller PyInstaller
PyInstaller should be a git clone of PyInstaller can be installed from pypi.
https://github.com/matysek/pyinstaller branch develop
Bazaar Bazaar
You need the command line "bzr" client installed. You need the command line "bzr" client installed.
@ -340,6 +338,16 @@ class WindowsBuilder(Builder):
if self.args.portable: if self.args.portable:
self._run_portableapp_builder() self._run_portableapp_builder()
def get_binaries(self):
"""
Return a list of the binaries to include
"""
binaries = []
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
if __name__ == '__main__': if __name__ == '__main__':
WindowsBuilder().main() WindowsBuilder().main()