<p>Patrick Georgi has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26944">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/optionlist: move kconfig2wiki to kconfig2html and adapt to html<br><br>This also removes a "chapters mode" that we never used.<br><br>Change-Id: Ib301e2f4db0b9678081fa987a5dcc7108bb103a4<br>Signed-off-by: Patrick Georgi <pgeorgi@chromium.org><br>---<br>R util/optionlist/kconfig2html<br>1 file changed, 17 insertions(+), 31 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/44/26944/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/optionlist/kconfig2wiki b/util/optionlist/kconfig2html</span><br><span>similarity index 64%</span><br><span>rename from util/optionlist/kconfig2wiki</span><br><span>rename to util/optionlist/kconfig2html</span><br><span>index 9e8fc27..defd35d 100755</span><br><span>--- a/util/optionlist/kconfig2wiki</span><br><span>+++ b/util/optionlist/kconfig2html</span><br><span>@@ -56,11 +56,11 @@</span><br><span>           if helplen:</span><br><span>                  i = i.expandtabs()</span><br><span>                   if not len(i) or i[:helplen].isspace():</span><br><span style="color: hsl(0, 100%, 40%);">-                         sys.stdout.write("%s\n" % htmlescape(i))</span><br><span style="color: hsl(120, 100%, 40%);">+                            sys.stdout.write("%s<br />\n" % htmlescape(i))</span><br><span>                               continue</span><br><span>                     else:</span><br><span>                                helplen = 0</span><br><span style="color: hsl(0, 100%, 40%);">-                             sys.stdout.write("||\n")</span><br><span style="color: hsl(120, 100%, 40%);">+                            sys.stdout.write("</td></tr>\n")</span><br><span> </span><br><span>           words = i.strip().split(None,1)</span><br><span>              if not len(words): continue</span><br><span>@@ -74,32 +74,18 @@</span><br><span>            elif words[0]=="prompt":</span><br><span>                   description = htmlescape(zapquotes(words[1]))</span><br><span>                elif words[0] in ("help", "---help---"):</span><br><span style="color: hsl(0, 100%, 40%);">-                    sys.stdout.write("|- bgcolor=\"#eeeeee\"\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                        sys.stdout.write("| %s || %s || %s || %s || \n" % (config,source,configtype,description) )</span><br><span style="color: hsl(120, 100%, 40%);">+                  sys.stdout.write("<tr bgcolor=\"#eeeeee\">\n")</span><br><span style="color: hsl(120, 100%, 40%);">+                      sys.stdout.write("<td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>\n" % (config,source,configtype,description) )</span><br><span>                     helplen = len(i[:i.find(words[0])].expandtabs())</span><br><span>             elif words[0] == "comment":</span><br><span style="color: hsl(0, 100%, 40%);">-                   sys.stdout.write("|- bgcolor=\"#eeeeee\"\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                        sys.stdout.write("| || || (comment) || || %s ||\n" % htmlescape(zapquotes(words[1])))</span><br><span style="color: hsl(120, 100%, 40%);">+                       sys.stdout.write("<tr bgcolor=\"#eeeeee\">\n")</span><br><span style="color: hsl(120, 100%, 40%);">+                      sys.stdout.write("<td></td><td></td><td>(comment)</td><td></td><td>%s</td></tr>\n" % htmlescape(zapquotes(words[1])))</span><br><span>            elif words[0]=="menu":</span><br><span>                     if len(words)>1:</span><br><span>                          temp = htmlescape(zapquotes(words[1]))</span><br><span style="color: hsl(0, 100%, 40%);">-                          if extra_chapters:</span><br><span style="color: hsl(0, 100%, 40%);">-                                      sys.stdout.write("== Menu: %s ==\n" % temp)</span><br><span style="color: hsl(0, 100%, 40%);">-                                   sys.stdout.write("{| border=\"0\" style=\"font-size: smaller\"\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                                       sys.stdout.write("|- bgcolor=\"#6699dd\"\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                        sys.stdout.write("! align=\"left\" | Option\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                     sys.stdout.write("! align=\"left\" | Source\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                     sys.stdout.write("! align=\"left\" | Format\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                     sys.stdout.write("! align=\"left\" | Short&nbsp;Description\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                 sys.stdout.write("! align=\"left\" | Description\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                else:</span><br><span style="color: hsl(0, 100%, 40%);">-                                   # Don't start an extra chapter for a</span><br><span style="color: hsl(0, 100%, 40%);">-                                        # new menu</span><br><span style="color: hsl(0, 100%, 40%);">-                                      sys.stdout.write("|- bgcolor=\"#6699dd\"\n")</span><br><span style="color: hsl(0, 100%, 40%);">-                                        sys.stdout.write("! align=\"left\" | Menu: %s || || || ||\n" % temp)</span><br><span style="color: hsl(120, 100%, 40%);">+                              sys.stdout.write("<tr bgcolor=\"#6699dd\">\n")</span><br><span style="color: hsl(120, 100%, 40%);">+                              sys.stdout.write("<td colspan=5>Menu: %s</td></tr>\n" % temp)</span><br><span>            elif words[0] == "endmenu":</span><br><span style="color: hsl(0, 100%, 40%);">-                   if extra_chapters:</span><br><span style="color: hsl(0, 100%, 40%);">-                              sys.stdout.write("|}\n")</span><br><span>                   sys.stdout.write("\n")</span><br><span>             elif words[0] == "source":</span><br><span>                         fn=zapquotes(words[1])</span><br><span>@@ -107,7 +93,7 @@</span><br><span>                          readfile(name)</span><br><span>               elif words[0] in ("default","depends", "select", "if", "endif", "#"): pass</span><br><span>               #else: sys.stderr.write("unknown: %s\n" % i)</span><br><span style="color: hsl(0, 100%, 40%);">-  if helplen: sys.stdout.write("||\n")</span><br><span style="color: hsl(120, 100%, 40%);">+        if helplen: sys.stdout.write("</td></tr>\n")</span><br><span> </span><br><span> def main():</span><br><span>        import sys, time</span><br><span>@@ -118,15 +104,15 @@</span><br><span> </span><br><span>         sys.stdout.write("This is an automatically generated list of '''coreboot compile-time options'''.\n")</span><br><span>      sys.stdout.write("\nLast update: %s\n" % sys.argv[2])</span><br><span style="color: hsl(0, 100%, 40%);">- sys.stdout.write("{| border=\"0\" style=\"font-size: smaller\"\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       sys.stdout.write("|- bgcolor=\"#6699dd\"\n")</span><br><span style="color: hsl(0, 100%, 40%);">-        sys.stdout.write("! align=\"left\" | Option\n")</span><br><span style="color: hsl(0, 100%, 40%);">-     sys.stdout.write("! align=\"left\" | Source\n")</span><br><span style="color: hsl(0, 100%, 40%);">-     sys.stdout.write("! align=\"left\" | Format\n")</span><br><span style="color: hsl(0, 100%, 40%);">-     sys.stdout.write("! align=\"left\" | Short&nbsp;Description\n")</span><br><span style="color: hsl(0, 100%, 40%);">- sys.stdout.write("! align=\"left\" | Description\n")</span><br><span style="color: hsl(120, 100%, 40%);">+      sys.stdout.write("<table border=\"0\" style=\"font-size: smaller\">\n");</span><br><span style="color: hsl(120, 100%, 40%);">+  sys.stdout.write("<tr bgcolor=\"#6699dd\">\n")</span><br><span style="color: hsl(120, 100%, 40%);">+      sys.stdout.write("<td align=\"left\">Option</td>\n")</span><br><span style="color: hsl(120, 100%, 40%);">+  sys.stdout.write("<td align=\"left\">Source</td>\n")</span><br><span style="color: hsl(120, 100%, 40%);">+  sys.stdout.write("<td align=\"left\">Format</td>\n")</span><br><span style="color: hsl(120, 100%, 40%);">+  sys.stdout.write("<td align=\"left\">Short&nbsp;Description</td>\n")</span><br><span style="color: hsl(120, 100%, 40%);">+      sys.stdout.write("<td align=\"left\">Description</td></tr>\n")</span><br><span>         readfile(sys.argv[1])</span><br><span style="color: hsl(0, 100%, 40%);">-   sys.stdout.write("|}\n")</span><br><span style="color: hsl(120, 100%, 40%);">+    sys.stdout.write("</table>\n")</span><br><span> </span><br><span> if __name__ == "__main__":</span><br><span>   main()</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26944">change 26944</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26944"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ib301e2f4db0b9678081fa987a5dcc7108bb103a4 </div>
<div style="display:none"> Gerrit-Change-Number: 26944 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Patrick Georgi <pgeorgi@google.com> </div>