From d7d6518ce41f7e08e3c27831bec99be21e4e8dfb Mon Sep 17 00:00:00 2001 From: Lightmann Date: Fri, 12 Jan 2024 11:13:36 -0500 Subject: [PATCH] Remove duplicate Theos icmd code + add TODO --- src/dragongen/theos.py | 4 ++++ src/dragongen/util.py | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/dragongen/theos.py b/src/dragongen/theos.py index 2df1d5b66..a0098cd18 100644 --- 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 index bfffa65f1..8b3698513 100644 --- 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)