diff options
author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2020-02-17 15:07:37 +0100 |
---|---|---|
committer | Cristian Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2020-06-08 10:30:05 +0200 |
commit | 15b509e4ab51a0a999190ef4f567a79cbdb541f3 (patch) | |
tree | 54e72166ccbbe9068524f02132853f284a972f27 /build_scripts | |
parent | 45d7dd636adfcbd9e086376f4260d58cc9901d41 (diff) |
Clean the build/install output a bit
* Adding STATUS or WARNING to a couple of message() calls.
* Replacing some print() by log.info()
* Changing some '*' by '-'
* Align configuration outputs to check paths easily
* Adding big message to check when shiboken2/pyside2 is being built.
* Including the cmake_minimum_required() function instead of an 'if'.
Change-Id: Idb6c5797286d400192d083403063e2ae582e3fe6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r-- | build_scripts/main.py | 34 | ||||
-rw-r--r-- | build_scripts/setup_runner.py | 6 | ||||
-rw-r--r-- | build_scripts/utils.py | 2 |
3 files changed, 23 insertions, 19 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index b139519c3..99cc02185 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -356,7 +356,7 @@ class PysideInstall(_install): def run(self): _install.run(self) - print('*** Install completed ({}s)'.format(elapsed())) + print('--- Install completed ({}s)'.format(elapsed())) class PysideDevelop(_develop): @@ -737,7 +737,7 @@ class PysideBuild(_build): _build.run(self) else: log.info("Skipped preparing and building packages.") - print('*** Build completed ({}s)'.format(elapsed())) + print('--- Build completed ({}s)'.format(elapsed())) def log_pre_build_info(self): if config.is_internal_shiboken_generator_build_and_part_of_top_level_all(): @@ -748,16 +748,16 @@ class PysideBuild(_build): setuptools_install_prefix = OPTION["FINAL_INSTALL_PREFIX"] log.info("=" * 30) log.info("Package version: {}".format(get_package_version())) - log.info("Build type: {}".format(self.build_type)) + log.info("Build type: {}".format(self.build_type)) log.info("Build tests: {}".format(self.build_tests)) log.info("-" * 3) - log.info("Make path: {}".format(self.make_path)) + log.info("Make path: {}".format(self.make_path)) log.info("Make generator: {}".format(self.make_generator)) - log.info("Make jobs: {}".format(OPTION["JOBS"])) + log.info("Make jobs: {}".format(OPTION["JOBS"])) log.info("-" * 3) - log.info("setup.py directory: {}".format(self.script_dir)) + log.info("setup.py directory: {}".format(self.script_dir)) log.info("Build scripts directory: {}".format(build_scripts_dir)) - log.info("Sources directory: {}".format(self.sources_dir)) + log.info("Sources directory: {}".format(self.sources_dir)) log.info(dedent(""" Building {st_package_name} will create and touch directories in the following order: @@ -767,9 +767,9 @@ class PysideBuild(_build): setuptools install directory (usually path-installed-python/lib/python*/site-packages/*) """).format(st_package_name=config.package_name())) - log.info("make build directory: {}".format(self.build_dir)) + log.info("make build directory: {}".format(self.build_dir)) log.info("make install directory: {}".format(self.install_dir)) - log.info("setuptools build directory: {}".format(self.st_build_dir)) + log.info("setuptools build directory: {}".format(self.st_build_dir)) log.info("setuptools install directory: {}".format(setuptools_install_prefix)) log.info(dedent(""" make-installed site-packages directory: {} @@ -779,15 +779,15 @@ class PysideBuild(_build): self.site_packages_dir)) log.info("-" * 3) log.info("Python executable: {}".format(self.py_executable)) - log.info("Python includes: {}".format(self.py_include_dir)) - log.info("Python library: {}".format(self.py_library)) - log.info("Python prefix: {}".format(self.py_prefix)) - log.info("Python scripts: {}".format(self.py_scripts_dir)) + log.info("Python includes: {}".format(self.py_include_dir)) + log.info("Python library: {}".format(self.py_library)) + log.info("Python prefix: {}".format(self.py_prefix)) + log.info("Python scripts: {}".format(self.py_scripts_dir)) log.info("-" * 3) - log.info("Qt qmake: {}".format(self.qtinfo.qmake_command)) + log.info("Qt qmake: {}".format(self.qtinfo.qmake_command)) log.info("Qt version: {}".format(self.qtinfo.version)) - log.info("Qt bins: {}".format(self.qtinfo.bins_dir)) - log.info("Qt docs: {}".format(self.qtinfo.docs_dir)) + log.info("Qt bins: {}".format(self.qtinfo.bins_dir)) + log.info("Qt docs: {}".format(self.qtinfo.docs_dir)) log.info("Qt plugins: {}".format(self.qtinfo.plugins_dir)) log.info("-" * 3) if sys.platform == 'win32': @@ -1074,7 +1074,7 @@ class PysideBuild(_build): log.info("Reusing old configuration for module {} ({})...".format( extension, module_src_dir)) - log.info("Compiling module {}...".format(extension)) + log.info("-- Compiling module {}...".format(extension)) cmd_make = [self.make_path] if OPTION["JOBS"]: cmd_make.append(OPTION["JOBS"]) diff --git a/build_scripts/setup_runner.py b/build_scripts/setup_runner.py index 1a7317e4d..b5b55fa20 100644 --- a/build_scripts/setup_runner.py +++ b/build_scripts/setup_runner.py @@ -41,6 +41,8 @@ import sys import os import textwrap +import distutils.log as log + from build_scripts.config import config from build_scripts.main import get_package_version, get_setuptools_extension_modules from build_scripts.main import cmd_class_dict @@ -49,6 +51,8 @@ from build_scripts.utils import run_process from setuptools import setup +if OPTION["VERBOSE_BUILD"]: + log.set_verbosity(1) class SetupRunner(object): def __init__(self, orig_argv): @@ -148,7 +152,7 @@ class SetupRunner(object): for cmd in self.invocations_list: cmd_as_string = " ".join(cmd) - print("\nRunning process: {}\n".format(cmd_as_string)) + log.info("\nRunning setup: {}\n".format(cmd_as_string)) exit_code = run_process(cmd) if exit_code != 0: msg = textwrap.dedent(""" diff --git a/build_scripts/utils.py b/build_scripts/utils.py index d1bc780dc..9f6d472cc 100644 --- a/build_scripts/utils.py +++ b/build_scripts/utils.py @@ -388,7 +388,7 @@ def run_process(args, initial_env=None): No output is captured. """ command = " ".join([(" " in x and '"{}"'.format(x) or x) for x in args]) - log.info("Running process in directory {}: command {}".format(os.getcwd(), command)) + log.info("In directory {}:\n\tRunning command: {}".format(os.getcwd(), command)) if initial_env is None: initial_env = os.environ |