Remove duplicate Theos icmd code + add TODO

DragonBuild · Jan 13, 2024 · d7d6518 · d7d6518
1 parent 6a57a6a
commit d7d6518
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/src/dragongen/theos.py b/src/dragongen/theos.py
@@ -251,8 +251,12 @@ def __init__(self):
 
         self.project['name'] = self.control['Name']
 
+        # TODO: this does nothing atm since Theos projects don't generater DragonMakes
+        # which are queried in bin/dragon for icmd else 'sbreload'
         if 'INSTALL_TARGET_PROCESSES' in self.root_makefile.variables:
             self.project['icmd'] = 'killall -9 ' + self.root_makefile.variables['INSTALL_TARGET_PROCESSES']
+        else:
+            self.project['icmd'] = 'sbreload'
 
         self._process_makefile(self.root_makefile)
         # print(self.project, file=sys.stderr)

diff --git a/src/dragongen/util.py b/src/dragongen/util.py
@@ -87,13 +87,6 @@ def interpret_theos_makefile(file: object, root: object = True) -> dict:
     finally:
         file.close()
 
-    if root:
-        project['name'] = os.path.basename(os.getcwd())
-        if 'INSTALL_TARGET_PROCESS' in variables:
-            project['icmd'] = 'killall -9 ' + variables['INSTALL_TARGET_PROCESS']
-        else:
-            project['icmd'] = 'sbreload'
-
     if os.environ['DGEN_DEBUG']:
         print("\n\n", file=sys.stderr)
         print("module type:" + str(module_type), file=sys.stderr)