Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd3598da authored by Sasha Smundak's avatar Sasha Smundak
Browse files

Output inherit trace as Make comments. 

Starlark configuration output is a makefile containing variable
assignments. Inheritance trace is also written to stdout. Trace lines
need to be comments, otherwise stdout cannot be digested by Make/Ckati.

Test: manual
Change-Id: I3c1ad6554ef4356f9ceff1ff3279b2eac962e9ac
parent e4442b7d

core/product_config.rbc

+4 −4
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init): 


        # Run this one, obtaining its configuration and child PCMs.

        if _options.trace_modules:

            print("%d:" % n)

            print("#%d: %s" % (n, name))



        # Run PCM.

        handle = __h_new()
@@ -167,7 +167,7 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init): 
        # Now we know everything about this PCM, record it in 'configs'.

        children = __h_inherited_modules(handle)

        if _options.trace_modules:

            print("   ", "    ".join(children.keys()))

            print("#   ", "    ".join(children.keys()))

        configs[name] = (pcm, __h_cfg(handle), children.keys(), False)

        pcm_count = pcm_count + 1
@@ -191,9 +191,9 @@ def _product_configuration(top_pcm_name, top_pcm, input_variables_init): 
        fail("Ran %d modules but postfix tree has only %d entries" % (pcm_count, len(config_postfix)))



    if _options.trace_modules:

        print("\n---Postfix---")

        print("\n#---Postfix---")

        for x in config_postfix:

            print("   ", x)

            print("#   ", x)



    # Traverse the tree from the bottom, evaluating inherited values

    for pcm_name in config_postfix: