Changes in / [f5211ee:01e7043] in mainline

Files:

• Makefile (modified) (2 diffs)
• tools/config.py (modified) (5 diffs)

Makefile

@@ -41 +41 @@
 CONFIG_HEADER = config.h
 
-ifeq ($(PROFILE),)
-        PRESETS_FILE =
-else
-        PRESETS_FILE = defaults/$(PROFILE)/Makefile.config
-endif
-
 .PHONY: all precheck cscope autotool config_auto config_default config distclean clean
 
@@ -72 +66 @@
 
 config_default: $(CONFIG_RULES)
-        $(CONFIG) $< default $(PRESETS_FILE)
+        $(CONFIG) $< default $(PROFILE)
 
 config: $(CONFIG_RULES)

tools/config.py

@@ -413 +413 @@
         return list
 
-## Choose a profile and load configuration presets.
-#
-def load_presets(root, fname, screen, config):
+## Ask user to choose a configuration profile.
+#
+def profile_choose(root, fname, screen, config):
         options = []
         opt2path = {}
@@ -436 +436 @@
                                         subprofile = True
                                         options.append("%s (%s)" % (name, subname))
-                                        opt2path[cnt] = (canon, subcanon)
+                                        opt2path[cnt] = [name, subname]
                                         cnt += 1
                         
                         if not subprofile:
                                 options.append(name)
-                                opt2path[cnt] = (canon, None)
+                                opt2path[cnt] = [name]
                                 cnt += 1
         
@@ -449 +449 @@
                 return None
         
-        read_config(opt2path[value][0], config)
-        if opt2path[value][1] != None:
-                read_config(opt2path[value][1], config)
+        return opt2path[value]
+
+## Read presets from a configuration profile.
+#
+# @param profile        Profile to load from (a list of string components)
+# @param config         Output configuration
+#
+def presets_read(profile, config):
+        path = os.path.join(PRESETS_DIR, profile[0], MAKEFILE)
+        read_config(path, config)
+
+        if len(profile) > 1:
+                path = os.path.join(PRESETS_DIR, profile[0], profile[1], MAKEFILE)
+                read_config(path, config)
+
+## Parse profile name (relative OS path) into a list of components.
+#
+# @param profile_name   Relative path (using OS separator)
+# @return               List of components
+#
+def parse_profile_name(profile_name):
+        profile = []
+
+        head, tail = os.path.split(profile_name)
+        if head != '':
+                profile.append(head)
+
+        profile.append(tail)
+        return profile
 
 def main():
-        cfgfile_in = None
+        profile = None
         config = {}
         rules = []
@@ -464 +490 @@
         # otherwise configuration from previous run is used.
         if len(sys.argv) >= 4:
-                cfgfile_in = sys.argv[3]
-        else:
-                cfgfile_in = MAKEFILE
-        
-        # Read configuration file
-        if os.path.exists(cfgfile_in):
-                read_config(cfgfile_in, config)
+                profile = parse_profile_name(sys.argv[3])
+                presets_read(profile, config)
+        elif os.path.exists(MAKEFILE):
+                read_config(MAKEFILE, config)
         
         # Default mode: only check values and regenerate configuration files
@@ -547 +570 @@
                         
                         if value == 0:
-                                load_presets(PRESETS_DIR, MAKEFILE, screen, config)
+                                profile = profile_choose(PRESETS_DIR, MAKEFILE, screen, config)
+                                if profile != None:
+                                        presets_read(profile, config)
                                 position = 1
                                 continue