From c814e2bca7062406f49660c90a3c96cb82060543 Mon Sep 17 00:00:00 2001 From: Amar Takhar Date: Thu, 11 Jun 2015 15:13:25 -0400 Subject: Move tag map to a central location with some cleanups. --- py/config/__init__.py | 17 ++++++++++++----- py/config/options.py | 8 +------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/py/config/__init__.py b/py/config/__init__.py index 9270b198ad..b3cba8b9f4 100644 --- a/py/config/__init__.py +++ b/py/config/__init__.py @@ -1,11 +1,18 @@ from .base import BuildConfig, Config, Default, Feature, Disable -#from .feature import * -#from .options import * + +tag_map = { + "general": "General settings", + "build": "Build options", + "network": "Network option", + "storage": "Storage option" +} + + class RTEMSConfig(object): - options_map = {} # Global options map. - features_list = [] # Global features list. - config_list = [] # Global config list. + options_map = {} # Dictionary of options. + features_list = [] # List of features. + config_list = [] # List of configs. def __init__(self, default, config): self.default = default diff --git a/py/config/options.py b/py/config/options.py index eb1840b2eb..602b0de5c9 100644 --- a/py/config/options.py +++ b/py/config/options.py @@ -1,3 +1,4 @@ +from .__init__ import tag_map from textwrap import TextWrapper wrapper = TextWrapper() @@ -6,13 +7,6 @@ wrapper.initial_indent = "# " wrapper.subsequent_indent = "# " -tag_map = { - "general": "General settings", - "build": "Build options", - "network": "Network option", - "storage": "Storage option" -} - class Option(object): """ Base class for all Options -- cgit v1.2.3