Rework CLI tools to use modern install method

Modern python installs (i.e. using pyproject.toml) want to install CLI
tools by just pointing to a module method and generating the executables
on install. In order to support this, move the installed tools to the
dtschema module directory renaming them to be modules.

This fixes allowing modifications to the tools on editable installs. The
conversion to pyproject.toml inadvertently broke this.

Signed-off-by: Rob Herring <[email protected]>

tools/dt-check-compatible → dtschema/check_compatible.py

@@ -15,7 +15,7 @@ def sigint_handler(signum, frame):
 
 import dtschema
 
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser(fromfile_prefix_chars='@',
         epilog='Arguments can also be passed in a file prefixed with a "@" character.')
     ap.add_argument("compatible_str", nargs='+',

tools/dt-doc-validate → dtschema/doc_validate.py

@@ -41,7 +41,7 @@ def check_doc(filename):
 
     return ret
 
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser(fromfile_prefix_chars='@',
         epilog='Arguments can also be passed in a file prefixed with a "@" character.')
     ap.add_argument("yamldt", nargs='*', type=str,

tools/dtb2py → dtschema/dtb2py.py

@@ -11,7 +11,7 @@
 
 strict = False
 
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("dtbfile", type=str, help="Schema directories and/or files")
     ap.add_argument('-s', '--schema', help="path to additional additional schema files")

tools/dt-validate → dtschema/dtb_validate.py

@@ -91,11 +91,11 @@ def check_subtree(self, tree, subtree, disabled, nodename, fullname, filename):
     def check_dtb(self, filename):
         """Check the given DT against all schemas"""
         with open(filename, 'rb') as f:
-            dt = sg.validator.decode_dtb(f.read())
+            dt = self.validator.decode_dtb(f.read())
         for subtree in dt:
             self.check_subtree(dt, subtree, False, "/", "/", filename)
 
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser(fromfile_prefix_chars='@',
         epilog='Arguments can also be passed in a file prefixed with a "@" character.')
     ap.add_argument("dtbs", nargs='*',

tools/extract-compatibles → dtschema/extract_compatibles.py

@@ -23,8 +23,7 @@ def item_generator(json_input, lookup_key):
             for item_val in item_generator(item, lookup_key):
                 yield item_val
 
-if __name__ == "__main__":
-
+def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("yamlfile", type=str,
                     help="Filename of YAML encoded schema input file")

tools/dt-extract-example → dtschema/extract_example.py

@@ -51,7 +51,7 @@ def sigint_handler(signum, frame):
 
 yaml = ruamel.yaml.YAML(typ='safe')
 
-if __name__ == "__main__":
+def main():
     ex = '// empty'
     ap = argparse.ArgumentParser()
     ap.add_argument("yamlfile", type=str,

tools/dt-extract-props → dtschema/extract_props.py

@@ -18,7 +18,7 @@ def sigint_handler(signum, frame):
 
 strict = False
 
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser()
     ap.add_argument("schema_files", type=str, nargs='*',
                     help="preparsed schema file or list of additional schema files/directories")

tools/dt-mk-schema → dtschema/mk_schema.py

@@ -20,8 +20,7 @@ def sigint_handler(signum, frame):
 import json
 
 
-
-if __name__ == "__main__":
+def main():
     ap = argparse.ArgumentParser(fromfile_prefix_chars='@',
         epilog='Arguments can also be passed in a file prefixed with a "@" character.')
     ap.add_argument("-o", "--outfile", type=str,
@@ -37,7 +36,7 @@ def sigint_handler(signum, frame):
 
     schemas = dtschema.DTValidator(args.schemas).schemas
     if not schemas:
-        exit(-1)
+        return -1
 
     if args.outfile:
         f = open(args.outfile, 'w', encoding='utf-8')

pyproject.toml

@@ -30,17 +30,15 @@ dependencies = [
     "pylibfdt",
 ]
 
+[project.scripts]
+dt-check-compatible = "dtschema.check_compatible:main"
+dt-doc-validate = "dtschema.doc_validate:main"
+dt-extract-example = "dtschema.extract_example:main"
+dt-extract-props = "dtschema.extract_props:main"
+dt-mk-schema = "dtschema.mk_schema:main"
+dt-validate = "dtschema.dtb_validate:main"
+dtb2py = "dtschema.dtb2py:main"
+
 [project.urls]
 Homepage="https://github.com/devicetree-org/dt-schema"
 Source="https://github.com/devicetree-org/dt-schema"
-
-[tool.setuptools]
-script-files = [
-    'tools/dt-check-compatible',
-    'tools/dt-validate',
-    'tools/dt-doc-validate',
-    'tools/dt-mk-schema',
-    'tools/dt-extract-example',
-    'tools/dt-extract-props',
-    'tools/dtb2py'
-]