[build] Add implicity dependency on Souffle

Author: Andy C

build/ninja_lib.py

@@ -94,7 +94,6 @@ def log(msg, *args):
     #    ysh-static ->
     #
     # _bin/cxx-opt+norl/bin/oils_for_unix.mycpp
-
     ('cxx', 'opt+norl'),
 
     #('clang', 'asan'),
@@ -392,7 +391,11 @@ def asdl_library(self,
             generated_headers=[out_header],
         )
 
-    def py_binary(self, main_py, deps_base_dir='_build/NINJA', template='py'):
+    def py_binary(self,
+                  main_py,
+                  deps_base_dir='_build/NINJA',
+                  template='py',
+                  implicit=None):
         """Wrapper for Python script with dynamically discovered deps
 
         Args:
@@ -403,6 +406,8 @@ def py_binary(self, main_py, deps_base_dir='_build/NINJA', template='py'):
             - using dependencies from prebuilt/ninja/mycpp.mycpp_main/deps.txt
             - with the 'shwrap-mycpp' template defined in build/ninja-lib.sh
         """
+        implicit = implicit or []
+
         rel_path, _ = os.path.splitext(main_py)
         # asdl/asdl_main.py -> asdl.asdl_main
         py_module = rel_path.replace('/', '.')
@@ -416,6 +421,7 @@ def py_binary(self, main_py, deps_base_dir='_build/NINJA', template='py'):
         shwrap_name = os.path.basename(rel_path)
         self.n.build('_bin/shwrap/%s' % shwrap_name,
                      'write-shwrap', [main_py] + deps,
+                     implicit=implicit,
                      variables=[('template', template)])
         self.n.newline()
 

mycpp/NINJA_subgraph.py

@@ -15,9 +15,12 @@
 def DefineTargets(ru):
 
     # Creates _bin/shwrap/mycpp_main
-    ru.py_binary('mycpp/mycpp_main.py',
-                 deps_base_dir='prebuilt/ninja',
-                 template='mycpp')
+    ru.py_binary(
+        'mycpp/mycpp_main.py',
+        deps_base_dir='prebuilt/ninja',
+        template='mycpp',
+        implicit=['_bin/datalog/dataflow'],
+    )
 
     # mycpp wrapper that depends on _bin/datalog/dataflow, a binary created
     # from Souffle datalog!
@@ -218,10 +221,11 @@ def NinjaGraph(ru):
            description='mycpp-souffle $mypypath $preamble_path $out $in')
     n.newline()
 
-    n.rule('translate-mycpp-nosouffle',
-           command=
-           '_bin/shwrap/mycpp_main_nosouffle $mypypath $preamble_path $out $in',
-           description='mycpp-nosouffle $mypypath $preamble_path $out $in')
+    n.rule(
+        'translate-mycpp-nosouffle',
+        command=
+        '_bin/shwrap/mycpp_main_nosouffle $mypypath $preamble_path $out $in',
+        description='mycpp-nosouffle $mypypath $preamble_path $out $in')
     n.newline()
 
     n.rule('translate-pea',