From 157cf512a3e3563f9114f7ee0a9bd81ee2a972a0 Mon Sep 17 00:00:00 2001 From: duplo Date: Fri, 9 Jan 2009 10:44:29 +0000 Subject: [PATCH] Change the gcc -v parser for obtain separate version and build informations git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2147 38d2e660-2303-0410-9eaa-f027e97ec537 --- wizard/bertos_utils.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index 99a84414..3af061ef 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -47,10 +47,16 @@ def getToolchainInfo(output): target = expr.findall(output) if len(target) == 1: info["target"] = target[0].split("Target: ")[1] - expr = re.compile("gcc version .*") + expr = re.compile("gcc version [0-9,.]*") version = expr.findall(output) if len(version) == 1: info["version"] = version[0].split("gcc version ")[1] + expr = re.compile("gcc version [0-9,.]* \(.*\)") + build = expr.findall(output) + if len(build) == 1: + build = build[0].split("gcc version ")[1] + build = build[build.find("(") + 1 : build.find(")")] + info["build"] = build expr = re.compile("Configured with: .*") configured = expr.findall(output) if len(configured) == 1: -- 2.25.1