Call colorized notify when --color for build.py, make.py, test.py

Author: theotherjimmy

tools/build.py

@@ -28,6 +28,7 @@
 
 
 from tools.toolchains import TOOLCHAINS
+from tools.toolchains import mbedToolchain
 from tools.targets import TARGET_NAMES, TARGET_MAP
 from tools.options import get_default_options_parser
 from tools.build_api import build_library, build_mbed_libs, build_lib
@@ -36,6 +37,7 @@
 from tools.build_api import print_build_results
 from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT
 from utils import argparse_filestring_type
+from tools.settings import CPPCHECK_CMD, CPPCHECK_MSG_FORMAT, CLI_COLOR_MAP
 
 if __name__ == '__main__':
     start = time()
@@ -164,6 +166,17 @@
     # Get toolchains list
     toolchains = options.tool if options.tool else TOOLCHAINS
 
+    if options.color:
+        # This import happens late to prevent initializing colorization when we don't need it
+        import colorize
+        if options.verbose:
+            notify = mbedToolchain.print_notify_verbose
+        else:
+            notify = mbedToolchain.print_notify
+        notify = colorize.print_in_color_notifier(CLI_COLOR_MAP, notify)
+    else:
+        notify = None
+
     # Get libraries list
     libraries = []
 
@@ -224,6 +237,7 @@
                         lib_build_res = build_library(options.source_dir, options.build_dir, mcu, toolchain,
                                                     options=options.options,
                                                     extra_verbose=options.extra_verbose_notify,
+                                                    notify=notify,
                                                     verbose=options.verbose,
                                                     silent=options.silent,
                                                     jobs=options.jobs,
@@ -235,6 +249,7 @@
                         lib_build_res = build_mbed_libs(mcu, toolchain,
                                                     options=options.options,
                                                     extra_verbose=options.extra_verbose_notify,
+                                                    notify=notify,
                                                     verbose=options.verbose,
                                                     silent=options.silent,
                                                     jobs=options.jobs,
@@ -245,6 +260,7 @@
                         build_lib(lib_id, mcu, toolchain,
                                   options=options.options,
                                   extra_verbose=options.extra_verbose_notify,
+                                  notify=notify,
                                   verbose=options.verbose,
                                   silent=options.silent,
                                   clean=options.clean,

tools/make.py

@@ -46,6 +46,8 @@
 from utils import argparse_filestring_type
 from utils import argparse_many
 from argparse import ArgumentTypeError
+from tools.toolchains import mbedToolchain
+from tools.settings import CLI_COLOR_MAP
 
 if __name__ == '__main__':
     # Parse Options
@@ -212,6 +214,17 @@
         args_error(parser, "[ERROR] You should specify a TOOLCHAIN")
     toolchain = options.tool[0]
 
+    if options.color:
+        # This import happens late to prevent initializing colorization when we don't need it
+        import colorize
+        if options.verbose:
+            notify = mbedToolchain.print_notify_verbose
+        else:
+            notify = mbedToolchain.print_notify
+        notify = colorize.print_in_color_notifier(CLI_COLOR_MAP, notify)
+    else:
+        notify = None
+
     # Test
     for test_no in p:
         test = Test(test_no)
@@ -250,6 +263,7 @@
                                      linker_script=options.linker_script,
                                      clean=options.clean,
                                      verbose=options.verbose,
+                                     notify=notify,
                                      silent=options.silent,
                                      macros=options.macros,
                                      jobs=options.jobs,

tools/test.py

@@ -34,6 +34,8 @@
 from tools.utils import mkdir, ToolException, NotSupportedException
 from tools.test_exporters import ReportExporter, ResultExporterType
 from utils import argparse_filestring_type, argparse_lowercase_type, argparse_many
+from tools.toolchains import mbedToolchain
+from tools.settings import CLI_COLOR_MAP
 
 if __name__ == '__main__':
     try:
@@ -121,6 +123,17 @@
         else:
             tests = all_tests
 
+        if options.color:
+            # This import happens late to prevent initializing colorization when we don't need it
+            import colorize
+            if options.verbose:
+                notify = mbedToolchain.print_notify_verbose
+            else:
+                notify = mbedToolchain.print_notify
+            notify = colorize.print_in_color_notifier(CLI_COLOR_MAP, notify)
+        else:
+            notify = None
+
         if options.list:
             # Print available tests in order and exit
             print_tests(tests, options.format)
@@ -155,6 +168,7 @@
                                                 name="mbed-build",
                                                 macros=options.macros,
                                                 verbose=options.verbose,
+                                                notify=notify,
                                                 archive=False)
 
                 library_build_success = True
@@ -179,6 +193,7 @@
                         properties=build_properties,
                         macros=options.macros,
                         verbose=options.verbose,
+                        notify=notify,
                         jobs=options.jobs,
                         continue_on_build_fail=options.continue_on_build_fail)