From 0e4975712a3a501d995db9a4fc06f91c68267845 Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Tue, 30 Nov 2021 04:20:15 -0600 Subject: [PATCH] Update status.html generator. Get pending back on the status page, add shell builtins as a category. --- scripts/mkstatus.py | 10 ++++------ www/roadmap.html | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/mkstatus.py b/scripts/mkstatus.py index 5cb6ae77..ed6dd544 100755 --- a/scripts/mkstatus.py +++ b/scripts/mkstatus.py @@ -21,15 +21,15 @@ def readit(args, shell=False): print "Collecting data..." -stuff,blah=readit(["sed","-n", 's//\\1 /;t good;d;:good;h;:loop;n;s@@@;t out;H;b loop;:out;g;s/\\n/ /g;p', "www/roadmap.html", "www/status.html"]) +stuff,blah=readit(["sed","-n", 's//\\1 /;t good;d;:good;h;:loop;n;s@@@;t out;H;b loop;:out;g;s/\\n/ /g;p', "www/roadmap.html"]) blah,toystuff=readit(["./toybox"]) -blah,pending=readit(["sed", "-n", "s/.*NEWTOY[(]\([^,]*\).*TOYFLAG_NOFORK.*/\1/p", "toys/pending/sh.c"]) +blah,stuff["shell"]=readit(["sed", "-n", "s/.*NEWTOY[(]\\([^,]*\\).*TOYFLAG_NOFORK.*/\\1/p", "toys/pending/sh.c"]) +blah,pending=readit(["/bin/bash", "-c", "sed -n 's/[^ \\t].*TOY(\\([^,]*\\),.*/\\1/p' toys/pending/*.c"]) version=readit(["./toybox","--version"])[-1][-1] print "Analyzing..." # Create reverse mappings: reverse["command"] gives list of categories it's in - reverse={} for i in stuff: for j in stuff[i]: @@ -58,7 +58,6 @@ conv = [("posix", '%%s', '+%s+')] - def categorize(reverse, i, skippy=""): linky = "%s" out = i @@ -103,7 +102,7 @@ outfile.write("""toybox current status Toybox Status """); outfile.write("

Status of toybox %s

\n" % version); -outfile.write("

Legend: %s pending

\n"%" ".join(map(lambda i: i[2]%(i[0].split("_")[0]), conv[:-2]))) +outfile.write("

Legend: %s pending

\n"%" ".join(map(lambda i: i[2]%(i[0].split("_")[0]), conv))) outfile.write("

Completed

%s

\n" % "\n".join(done)) outfile.write("

Partially implemented (in toys/pending)

%s

\n" % "\n".join(pend)) @@ -117,7 +116,6 @@ for i in conv: todo = [] i=i[0] - if i=="shell": continue for j in stuff[i]: if j in toystuff: continue if j in pending: todo.append('%s' % j) diff --git a/www/roadmap.html b/www/roadmap.html index 195de819..865d9515 100644 --- a/www/roadmap.html +++ b/www/roadmap.html @@ -777,7 +777,7 @@ timezone database. Unless we want to maintain our own fork of the standards body's database like glibc does, these are of no interest, but for completeness:

-
  • +