Fix python variant of merge_config

cmake/kconfig.cmake

@@ -112,9 +112,8 @@ endif()
 if(CREATE_NEW_DOTCONFIG)
   execute_process(
     COMMAND
-    ${PROJECT_SOURCE_DIR}/scripts/kconfig/merge_config.sh
-    -m
-    -q
+    ${PYTHON_EXECUTABLE}
+    ${PROJECT_SOURCE_DIR}/scripts/kconfig/merge_config.py
     -O ${PROJECT_BINARY_DIR}
     ${merge_config_files}
     WORKING_DIRECTORY ${APPLICATION_SOURCE_DIR}

scripts/kconfig/merge_config.py

@@ -3,50 +3,91 @@
 import argparse
 import re
 
+
 def arguments_parse():
     parser = argparse.ArgumentParser()
     parser.add_argument('-q', dest="quiet", action='store_true')
-    parser.add_argument('-m', dest='runmake', action='store_false',
-        help='only merge the fragments, do not execute the make command')
-    parser.add_argument('-n', dest='alltarget', action='store_const', const='allnoconfig', default='alldefconfig',
-        help='use allnoconfig instead of alldefconfig')
     parser.add_argument('-r', dest='warnredun', action='store_true',
-        help='list redundant entries when merging fragments')
+                        help='list redundant entries when merging fragments')
     parser.add_argument('-O', dest='output_dir',
-        help='to put generated output files', default='.')
+                        help='to put generated output files', default='.')
     parser.add_argument('config', nargs='+')
 
     return parser.parse_args()
 
 
+def get_config_name(line):
+    # '# CONFIG_FOO is not set' should be treated by merge_config as a
+    # state like any other
+
+    is_not_set_pattern = re.compile('^# (CONFIG_[a-zA-Z0-9_]*) is not set.*')
+    pattern            = re.compile('^(CONFIG_[a-zA-Z0-9_]*)[= ].*')
+
+    match            =            pattern.match(line)
+    match_is_not_set = is_not_set_pattern.match(line)
+
+    if match_is_not_set:
+        return match_is_not_set.group(1)
+    elif match:
+        return match.group(1)
+
+    return "" # No match
+
 def main():
     args = arguments_parse()
 
-    pattern = re.compile('^(CONFIG_[a-zA-Z0-9_]*)[= ].*')
-    config_values = {}
-
-    for config_file in args.config[:]:
-        print("Merging %s" % config_file)
-        with open(config_file, 'r') as file:
-            for line in file:
-                match = pattern.match(line)
-                if match:
-                    config_name = match.group(1)
-                    config_full = match.group(0)
-                    if config_name in config_values:
-                        if config_values[config_name] != config_full and not args.quiet:
-                            print("Value of %s is redefined by fragment %s" % (config_name, config_file))
-                            print("Previous value %s" % config_values[config_name])
-                            print("new value %s" % config_full)
-                        elif args.warnredun:
-                            print("Value of %s is redundant by fragment %s" % (config_name, config_file))
-                    config_values[config_name] = config_full
-
-    if args.runmake:
-        print("Running make not yet supported")
-
-    with open('%s/.config' % args.output_dir, 'w') as out_config:
-        out_config.write('\n'.join(map(lambda x: x[1], config_values.items())))
+    # Create a datastructure in 'conf' that looks like this:
+    # [
+    #   ("CONFIG_UART", "CONFIG_UART=y"),
+    #   ("CONFIG_ARM", "# CONFIG_ARM is not set")
+    # ]
+    # In other words [(config_name, config_line), ... ]
+    #
+    # Note that "# CONFIG_ARM is not set" is not the same as a
+    # comment, it has meaning (for now).
+    # https://github.com/zephyrproject-rtos/zephyr/issues/5443
+    conf = []
+    for i, fragment_path in enumerate(args.config):
+        with open(fragment_path, "r") as f:
+            fragment = f.read()
+        fragment_list = fragment.split("\n")
+
+        fragment_conf = []
+        for line in fragment_list:
+            config_name = get_config_name(line)
+            if config_name:
+                fragment_conf.append( (config_name, line) )
+
+        if i == 0:
+            print("-- Using {} as base".format(fragment_path))
+        else:
+            print("-- Merging {}".format(fragment_path))
+
+            for config_name, line in fragment_conf:
+                for (i, (prev_config_name, prev_line)) in enumerate(list(conf)):
+                    if config_name == prev_config_name:
+                        # The fragment is defining a config that has
+                        # already been defined, the fragment has
+                        # priority, so we remove the existing entry
+                        # and then possibly issue a warning.
+                        conf.pop(i)
+
+                        is_redundant = line == prev_line
+                        is_redefine  = line != prev_line
+                        if not args.quiet:
+                            if is_redefine:
+                                print("-- Value of {} is redefined by fragment {}".format(config_name, fragment_path))
+                                print("-- Previous value: {}".format(prev_line))
+                                print("-- New value: {}".format(line))
+
+                            if is_redundant and args.warnredun:
+                                print("-- Value of {} is redundant by fragment {}".format(config_name, fragment_path))
+
+        conf.extend(fragment_conf)
+
+    with open('{}/.config'.format(args.output_dir), 'w') as f:
+        for (config_name, line) in conf:
+            f.write("{}\n".format(line))
 
 if __name__ == "__main__":
     main()