From 36faadae394a3c80e3875372138265d66dc5e35f Mon Sep 17 00:00:00 2001 From: nojhan Date: Wed, 17 May 2017 11:13:01 +0200 Subject: [PATCH] better themes for cmake, ctest and configure --- colout/colout_cmake.py | 3 ++- colout/colout_configure.py | 5 ++++- colout/colout_ctest.py | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/colout/colout_cmake.py b/colout/colout_cmake.py index 24b544f..252fc2f 100644 --- a/colout/colout_cmake.py +++ b/colout/colout_cmake.py @@ -31,7 +31,8 @@ def theme(context): [ "^(Scanning dependencies of target)(.*)$", performing, "normal,bold" ], # Link (make) - [ "^(Linking .* )(library|executable) (.*/)*(.+(\.[aso]+)*)$", + # [ "^(Linking .* )(library|executable) (.*/)*(.+(\.[aso]+)*)$", + [ "^(Linking .* )(library|executable) (.*)$", untimed, "normal,normal,bold" ], # [percent] Creating something [ "^\[\s*[0-9/]+%?\]\s(.*Creating.*)$", diff --git a/colout/colout_configure.py b/colout/colout_configure.py index 4d50e96..2f5e2b7 100644 --- a/colout/colout_configure.py +++ b/colout/colout_configure.py @@ -8,6 +8,9 @@ def theme(context): ["^(configure:) (error:)(.*)", "red","normal,bold"], ["^(configure:)(.*)", "magenta","normal,bold"], ["^(checking .*)", "blue",""], - ["^(config.status:) (creating )(.*)", "cyan,blue","normal,normal,bold"], + ["^(config.status:) (creating|linking)(.*)", "cyan,blue","normal,normal,bold"], ["^(config.status:) (executing )(.*)", "cyan,green","normal,normal,bold"], + ["^(config.status:) (.*)(is unchanged)", "cyan,green","normal,normal,bold"], + ["^\s*(Build.*)(yes)$","green", "normal,bold"], + ["^\s*(Build.*)(no)$","yellow", "normal,bold"], ] diff --git a/colout/colout_ctest.py b/colout/colout_ctest.py index d23d2bc..ba7e56e 100644 --- a/colout/colout_ctest.py +++ b/colout/colout_ctest.py @@ -12,6 +12,6 @@ def theme(context): return context,[ # Passed - [ "^\s*[0-9]+/[0-9]+ Test\s+#[0-9]+: (.*)\s+\.+\s+(Passed)", passed], - [ "^\s*[0-9]+/[0-9]+ Test\s+#[0-9]+: (.*)\s+\.+(\*{3}.*)\s+.*", notpassed] + [ "^\s*[0-9]+/[0-9]+ Test\s+#[0-9]+: (.*)\s+\.+\s+(Passed)", "blue,"+passed], + [ "^\s*[0-9]+/[0-9]+ Test\s+#[0-9]+: (.*)\s+\.+(\*{3}.*)\s+.*", "blue,"+notpassed] ]