Review: Small tweaks & fixes

Author: henryleberre

toolchain/main.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import signal, getpass, platform, itertools, dataclasses
+import signal, getpass, platform, itertools
 
 from mfc         import args, lock, build, bench, state, count
 from mfc.state   import ARG
@@ -21,11 +21,11 @@ def __print_greeting():
     MFC_SIDEBAR_LINES = [
         f"[bold]{host_line}[/bold]",
         '-' * len(host_line),
-        f"[bold]--jobs [magenta]{ARG('jobs')}[/magenta][/bold]"
-    ] + [
-        f"[bold]--{'' if getattr(state.gCFG, field.name) else 'no-'}{field.name}[/bold]" for field in dataclasses.fields(state.gCFG)
-    ] + [
+        '',
+        f"[bold]--jobs [magenta]{ARG('jobs')}[/magenta][/bold]",
+        f"[bold]{' '.join(state.gCFG.make_options())}[/bold]",
         targets_line if ARG("command") != "test" else "",
+        '',
         '-' * len(help_line),
         f"[yellow]{help_line}[/yellow]",
     ]

toolchain/mfc/common.py

@@ -22,8 +22,6 @@
  .:-=++++===--==+=-+=   +.  :=
  +#=::::::::=%=. -+:    =+   *:
 .*=-=*=..    :=+*+:      -...--
-
-\
 """
 
 

toolchain/mfc/lock.py

@@ -5,7 +5,7 @@
 from .printer import cons
 
 
-MFC_LOCK_CURRENT_VERSION: int = 3
+MFC_LOCK_CURRENT_VERSION: int = 4
 
 
 @dataclasses.dataclass

toolchain/mfc/state.py

@@ -29,7 +29,7 @@ def make_options(self) -> typing.List[str]:
 
     def make_slug(self) -> str:
         """ Sort the items by key, then join them with underscores. This uniquely 
-            identifies the configuration. Example: no-debug no-gpu no_mpi """
+            identifies the configuration. Example: no-debug_no-gpu_no_mpi_no-gcov """
         return '_'.join([ f"{'no-' if not v else ''}{k}" for k, v in sorted(self.items(), key=lambda x: x[0]) ])
 
     def __eq__(self, other) -> bool:
@@ -41,7 +41,7 @@ def __eq__(self, other) -> bool:
         return True
 
     def __str__(self) -> str:
-        """ Returns a string like "mpi=No & gpu=No & debug=No" & gcov=No """
+        """ Returns a string like "mpi=No & gpu=No & debug=No & gcov=No" """
 
         return ' & '.join([ f"{k}={'Yes' if v else 'No'}" for k, v in self.items() ])