openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/new-run-script into lp:openlp/packaging.

Commit message:
Fix builder script to use new OpenLP run script name.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/new-run-script/+merge/357906

Fix builder script to use new OpenLP run script name.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/new-run-script into lp:openlp/packaging.

=== modified file 'builders/builder.py'
--- builders/builder.py	2018-07-12 19:41:00 +0000
+++ builders/builder.py	2018-10-27 06:11:26 +0000
@@ -218,7 +218,7 @@
         else:
             self.version = None
             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.manual_path = os.path.join(self.documentation_path, 'manual')
         self.manual_build_path = os.path.join(self.manual_path, 'build')
@@ -269,7 +269,6 @@
         Run PyInstaller on the branch to build an executable.
         """
         self._print('Running PyInstaller...')
-        copy(os.path.join(self.work_path, 'openlp.py'), self.openlp_script)
         os.chdir(self.work_path)
         cmd = [self.python,
                self.pyinstaller_exe,
@@ -428,7 +427,8 @@
             rmtree(self.manual_build_path)
         os.chdir(self.manual_path)
         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.after_run_sphinx()
 
@@ -477,5 +477,3 @@
 
         self._print('Done.')
         raise SystemExit()
-
-