From f92d3ec9beb0aa1ac9075d299b52db1e0dcfe250 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Thu, 23 Jun 2016 12:40:50 -0500 Subject: [PATCH] Move name of config file to one location --- tools/export/exporters.py | 2 +- tools/toolchains/__init__.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/export/exporters.py b/tools/export/exporters.py index ce0bceeb97..84fe16814a 100644 --- a/tools/export/exporters.py +++ b/tools/export/exporters.py @@ -174,7 +174,7 @@ class Exporter(object): if hasattr(self, "MBED_CONF_ACTIVE") and self.MBED_CONF_ACTIVE : # Add the configuration file to the target directory - self.config_header = "mbed_conf.h" + self.config_header = self.toolchain.MBED_CONFIG_FILE_NAME config.get_config_data_header(join(trg_path, self.config_header)) self.config_macros = [] else : diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index 3818f43854..3da97efe00 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -227,6 +227,8 @@ class mbedToolchain: GOANNA_FORMAT = "[Goanna] warning [%FILENAME%:%LINENO%] - [%CHECKNAME%(%SEVERITY%)] %MESSAGE%" GOANNA_DIAGNOSTIC_PATTERN = re.compile(r'"\[Goanna\] (?Pwarning) \[(?P[^:]+):(?P\d+)\] \- (?P.*)"') + MBED_CONFIG_FILE_NAME="mbed_config.h" + def __init__(self, target, options=None, notify=None, macros=None, silent=False, extra_verbose=False): self.target = target self.name = self.__class__.__name__ @@ -908,7 +910,7 @@ class mbedToolchain: def get_config_header(self): if self.config_data is None: return None - config_file = join(self.build_dir, "mbed_config.h") + config_file = join(self.build_dir, self.MBED_CONFIG_FILE_NAME) if not exists(config_file): with open(config_file, "wt") as f: f.write(Config.config_to_header(self.config_data))