From 7d98b5ab2a11ec229e25cf8f81b06cf9cd776781 Mon Sep 17 00:00:00 2001 From: Raoul Snyman Date: Tue, 6 Dec 2016 22:11:10 +0200 Subject: [PATCH] Move some logging around and fix up a path to the icon file --- builders/builder.py | 30 +++++++++++++++--------------- builders/windows-builder.py | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/builders/builder.py b/builders/builder.py index 56f9864..b9d1f52 100644 --- a/builders/builder.py +++ b/builders/builder.py @@ -180,7 +180,6 @@ class Builder(object): self._print_verbose(' {:.<20}: {}'.format('python: ', self.python)) self._print_verbose(' {:.<20}: {}'.format('script: ', self.script_path)) self._print_verbose(' {:.<20}: {}'.format('config: ', self.config_path)) - self._print_verbose(' {:.<20}: {}'.format('config path: ', os.path.dirname(self.config_path))) def setup_executables(self): """ @@ -205,7 +204,22 @@ class Builder(object): path = os.path.abspath(self.config.get('paths', name)) setattr(self, '{name}_path'.format(name=name), path) self._print_verbose(' {name:.<20} {path}'.format(name=name + ': ', path=path)) + self.openlp_script = os.path.abspath(os.path.join(self.work_path, 'openlp-run.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') + self.i18n_utils = os.path.join(self.work_path, 'scripts', 'translation_utils.py') + self.i18n_path = os.path.join(self.work_path, 'resources', 'i18n') + self.build_path = os.path.join(self.work_path, 'build') + self._print_verbose(' {:.<20} {}'.format('openlp script: ', self.openlp_script)) + self._print_verbose(' {:.<20} {}'.format('source: ', self.source_path)) + self._print_verbose(' {:.<20} {}'.format('manual path: ', self.manual_path)) + self._print_verbose(' {:.<20} {}'.format('manual build path: ', self.manual_build_path)) + self._print_verbose(' {:.<20} {}'.format('i18n utils: ', self.i18n_utils)) + self._print_verbose(' {:.<20} {}'.format('i18n path: ', self.i18n_path)) + self._print_verbose(' {:.<20} {}'.format('build path: ', self.build_path)) # Make any command line options override the config file + self._print_verbose('Overrides:') if self.args.branch: self.branch_path = os.path.abspath(self.args.branch) self._print_verbose(' {:.<20} {}'.format('branch **: ', self.branch_path)) @@ -222,20 +236,6 @@ class Builder(object): self.work_path = self.branch_path self._print_verbose(' {:.<20} {}'.format('version: ', 'bzr')) self._print_verbose(' {:.<20} {}'.format('work path: ', self.work_path)) - self.openlp_script = os.path.abspath(os.path.join(self.work_path, 'openlp-run.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') - self.i18n_utils = os.path.join(self.work_path, 'scripts', 'translation_utils.py') - self.i18n_path = os.path.join(self.work_path, 'resources', 'i18n') - self.build_path = os.path.join(self.work_path, 'build') - self._print_verbose(' {:.<20} {}'.format('openlp script: ', self.openlp_script)) - self._print_verbose(' {:.<20} {}'.format('source: ', self.source_path)) - self._print_verbose(' {:.<20} {}'.format('manual path: ', self.manual_path)) - self._print_verbose(' {:.<20} {}'.format('manual build path: ', self.manual_build_path)) - self._print_verbose(' {:.<20} {}'.format('i18n utils: ', self.i18n_utils)) - self._print_verbose(' {:.<20} {}'.format('i18n path: ', self.i18n_path)) - self._print_verbose(' {:.<20} {}'.format('build path: ', self.build_path)) def setup_extra(self): """ diff --git a/builders/windows-builder.py b/builders/windows-builder.py index 9c85636..4b21ef7 100644 --- a/builders/windows-builder.py +++ b/builders/windows-builder.py @@ -293,7 +293,7 @@ class WindowsBuilder(Builder): """ self._print('Copying extra files for Windows...') self._print_verbose('... OpenLP.ico') - copy(os.path.join(self.script_path, 'OpenLP.ico'), os.path.join(self.dist_path, 'OpenLP.ico')) + copy(self.icon_path, os.path.join(self.dist_path, 'OpenLP.ico')) self._print_verbose('... LICENSE.txt') copy(os.path.join(self.script_path, 'LICENSE.txt'), os.path.join(self.dist_path, 'LICENSE.txt')) self._print_verbose('... psvince.dll')