Major refactoring to move Qt5 from core into a module. Rules are written but moc/uic/rrc are not generated yet.

1 files changed, 5 insertions, 10 deletions

diff --git a/ninjabackend.py b/ninjabackend.py
index 66bae36..a00f216 100644
--- a/ninjabackend.py
+++ b/ninjabackend.py
@@ -499,15 +499,10 @@ class NinjaBackend(backends.Backend):
             velem.add_item('pool', 'console')
             velem.write(outfile)
 
-    def generate_dep_gen_rules(self, outfile):
-        outfile.write('# Rules for external dependency generators.\n\n')
-        processed = {}
-        for dep in self.environment.coredata.deps.values():
-            name = dep.get_name()
-            if name in processed:
-                continue
-            processed[name] = True
-            for rule in dep.get_generate_rules():
+    def generate_module_rules(self, outfile):
+        outfile.write('# Rules coming from modules.\n\n')
+        for mod in self.build.modules.values():
+            for rule in mod.get_rules():
                 outfile.write('rule %s\n' % rule.name)
                 command = ' '.join([ninja_quote(x) for x in rule.cmd_list])
                 command = command.replace('@INFILE@', '$in').replace('@OUTFILE@', '$out')
@@ -529,7 +524,7 @@ class NinjaBackend(backends.Backend):
             self.generate_static_link_rules(True, outfile)
         self.generate_static_link_rules(False, outfile)
         self.generate_dynamic_link_rules(outfile)
-        self.generate_dep_gen_rules(outfile)
+        self.generate_module_rules(outfile)
         outfile.write('# Other rules\n\n')
         outfile.write('rule CUSTOM_COMMAND\n')
         outfile.write(' command = $COMMAND\n')