Cleanup and a bunch a bug fix in the cli.

Author: sleepy-monax

cutekit/builder.py

@@ -337,7 +337,7 @@ def compileObjs(
     for rule in rules.rules.values():
         if rule.id == "cxx-scan":
             ddi += compileSrcs(w, scope, rule, srcs=scope.wilcard(rule.fileIn))
-        elif rule.id not in ["cp", "ld", "ar", "cxx-collect", "cxx-modmap"]:
+        elif rule.id not in ["cp", "ld", "ar", "cxx-collect"]:
             objs += compileSrcs(w, scope, rule, srcs=scope.wilcard(rule.fileIn))
     return objs, ddi
 

cutekit/cli.py

@@ -850,7 +850,8 @@ def usage(self) -> str:
             res += self.schema.usage()
 
         if len(self.subcommands) == 1:
-            res += "[subcommand] [args...]"
+            name = next(iter(self.subcommands.keys()))
+            res += f"{name} [args...]"
 
         elif len(self.subcommands) > 0:
             res += "{"
@@ -891,10 +892,7 @@ def eval(self, args: list[str]):
 
             if self.subcommands:
                 if len(rest) > 0:
-                    if not self.populated:
-                        raise ValueError("Expected subcommand")
-                    else:
-                        self.lookupSubcommand(rest[0]).eval(rest)
+                    self.lookupSubcommand(rest[0]).eval(rest)
                 else:
                     print("Usage: " + cmd + self.usage(), end="\n\n")
                     return

cutekit/model.py

@@ -642,7 +642,6 @@ class Tool(DataClassJsonMixin):
     "ld-shared": Tool(shell.latest("clang++")),
     "cxx-scan": Tool(shell.latest("clang-scan-deps")),
     "cxx-collect": Tool("jq"),
-    "cxx-modmap": Tool("ck --safemode tools cxx-modmap"),
     "cxx-dyndep": Tool("ck --safemode tools cxx-dyndep"),
 }
 """Default tools available in all projects."""

cutekit/rules.py

@@ -60,14 +60,6 @@ class Rule:
         [],
         [],
     ),
-    "cxx-modmap": Rule(
-        "cxx-modmap",
-        ["*.cpp"],
-        "*.dd",
-        "$obj --dir=$builddir --deps=$builddir/modules.ddi > $out.tmp && mv $out.tmp $out",
-        [],
-        [],
-    ),
     "cxx-dyndep": Rule(
         "cxx-dyndep",
         ["*.dd"],