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

Fix builder script to use new OpenLP run script name.

Browse Source 
bzr-revno: 39
This commit is contained in:
Raoul Snyman 2018-10-27 18:12:07 +02:00 committed by Tomas Groth
commit e17dfb2dad
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builders/builder.py
View File

@ -218,7 +218,7 @@ class Builder(object):
else: else:
self.version = None self.version = None
self.work_path = self.branch_path self.work_path = self.branch_path
self.openlp_script = os.path.abspath(os.path.join(self.work_path, 'openlp-run.py')) self.openlp_script = os.path.abspath(os.path.join(self.work_path, 'run_openlp.py'))
self.source_path = os.path.join(self.work_path, 'openlp') self.source_path = os.path.join(self.work_path, 'openlp')
self.manual_path = os.path.join(self.documentation_path, 'manual') self.manual_path = os.path.join(self.documentation_path, 'manual')
self.manual_build_path = os.path.join(self.manual_path, 'build') self.manual_build_path = os.path.join(self.manual_path, 'build')
@ -269,7 +269,6 @@ class Builder(object):
Run PyInstaller on the branch to build an executable. Run PyInstaller on the branch to build an executable.
""" """
self._print('Running PyInstaller...') self._print('Running PyInstaller...')
copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script)
os.chdir(self.work_path) os.chdir(self.work_path)
cmd = [self.python, cmd = [self.python,
self.pyinstaller_exe, self.pyinstaller_exe,
@ -428,7 +427,8 @@ class Builder(object):
rmtree(self.manual_build_path) rmtree(self.manual_build_path)
os.chdir(self.manual_path) os.chdir(self.manual_path)
sphinx_build = self.get_sphinx_build() sphinx_build = self.get_sphinx_build()
command = [self.sphinx_exe, '-b', sphinx_build, '-d', 'build/doctrees', 'source', 'build/{}'.format(sphinx_build)] command = [self.sphinx_exe, '-b', sphinx_build, '-d', 'build/doctrees', 'source',
'build/{}'.format(sphinx_build)]
self._run_command(command, 'Error running Sphinx') self._run_command(command, 'Error running Sphinx')
self.after_run_sphinx() self.after_run_sphinx()
@ -477,5 +477,3 @@ class Builder(object):
self._print('Done.') self._print('Done.')
raise SystemExit() raise SystemExit()