Consolidating meta makefile generation

.idea/dictionaries/ericf.xml

@@ -1556,6 +1556,7 @@
       <w>otherplayer</w>
       <w>otherspawn</w>
       <w>ourhash</w>
+      <w>ourname</w>
       <w>ourself</w>
       <w>outdata</w>
       <w>outdelay</w>

ballisticacore-cmake/.idea/dictionaries/ericf.xml

@@ -729,6 +729,7 @@
       <w>osis</w>
       <w>osssssssssss</w>
       <w>ostype</w>
+      <w>ourname</w>
       <w>ourself</w>
       <w>ourstanding</w>
       <w>outpath</w>

docs/ba_module.md

@@ -1,5 +1,5 @@
 <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
-<h4><em>last updated on 2021-06-11 for Ballistica version 1.6.4 build 20378</em></h4>
+<h4><em>last updated on 2021-06-12 for Ballistica version 1.6.4 build 20379</em></h4>
 <p>This page documents the Python classes and functions in the 'ba' module,
  which are the ones most relevant to modding in Ballistica. If you come across something you feel should be included here or could be better explained, please <a href="mailto:support@froemling.net">let me know</a>. Happy modding!</p>
 <hr>

src/meta/Makefile

@@ -1,6 +1,6 @@
 # Released under the MIT License. See LICENSE for details.
 #
-# This file was generated by tools/update_meta_makefile.
+# This file was generated by batools.metamakefile.
 
 all: cpp_sources
 

tools/batools/metamakefile.py

@@ -0,0 +1,143 @@
+# Released under the MIT License. See LICENSE for details.
+#
+"""Procedurally regenerates our code Makefile.
+
+This Makefiles builds our generated code such as encrypted python strings,
+node types, etc).
+"""
+from __future__ import annotations
+
+import os
+import sys
+from typing import TYPE_CHECKING
+from dataclasses import dataclass
+
+from efro.terminal import Clr
+
+if TYPE_CHECKING:
+    from typing import Optional, Set, List, Dict, Any, Tuple
+
+# These paths need to be relative to the dir we're writing the Makefile to.
+TOOLS_DIR = '../../tools'
+ROOT_DIR = '../..'
+OUT_DIR_CPP = '../ballistica/generated'
+
+
+@dataclass
+class Target:
+    """A target to be added to the makefile."""
+    src: List[str]
+    dst: str
+    cmd: str
+    public: bool
+    mkdir: bool = False
+
+
+def update(projroot: str, check: bool) -> None:
+    """Main script entry point."""
+
+    from efrotools import get_public_license
+
+    # Operate out of root dist dir for consistency.
+    os.chdir(projroot)
+
+    targets = _generate_targets()
+
+    # Write Makefile.
+    fname = 'src/meta/Makefile'
+    existing: Optional[str]
+    try:
+        with open(fname, 'r') as infile:
+            existing = infile.read()
+    except Exception:
+        existing = None
+
+    out = (get_public_license('makefile') +
+           f'\n#\n# This file was generated by {__name__}.\n\n')
+    public_dsts: Set[str] = set()
+    private_dsts: Set[str] = set()
+    for target in targets:
+        (public_dsts if target.public else private_dsts).add(target.dst)
+    out += 'all: cpp_sources\n'
+    out += ('\n'
+            'cpp_sources: ' + ' \\\n             '.join(
+                dst.replace(' ', '\\ ') for dst in sorted(public_dsts)) + '\n')
+    out += ('\n'
+            '#__PUBSYNC_STRIP_BEGIN__\n'
+            'cpp_sources: ' + ' \\\n             '.join(
+                dst.replace(' ', '\\ ') for dst in sorted(private_dsts)) +
+            '\n' + '#__PUBSYNC_STRIP_END__\n')
+
+    out += f'\nclean:\n\t@rm -rf {OUT_DIR_CPP}\n\n'
+    var_num = 1
+
+    for public in [True, False]:
+        if not public:
+            out += '#__PUBSYNC_STRIP_BEGIN__\n\n'
+        for target in targets:
+            if target.public != public:
+                continue
+            if bool(False) and ' ' in target.dst:
+                out += ('TARGET_' + str(var_num) + ' = ' +
+                        target.dst.replace(' ', '\\ ') + '\n${TARGET_' +
+                        str(var_num) + '}')
+                var_num += 1
+            else:
+                out += target.dst.replace(' ', '\\ ')
+            out += ' : ' + ' '.join(s for s in target.src) + (
+                ('\n\t@mkdir -p "' + os.path.dirname(target.dst) +
+                 '"') if target.mkdir else '') + '\n\t@' + target.cmd + '\n\n'
+        if not public:
+            out += '#__PUBSYNC_STRIP_END__\n'
+
+    if out == existing:
+        print('Meta Makefile is up to date.')
+    else:
+        if check:
+            print(Clr.SRED + 'ERROR: file out of date: ' + fname + Clr.RST)
+            sys.exit(255)
+        print(Clr.SBLU + 'Generating: ' + fname + Clr.RST)
+        with open(fname, 'w') as outfile:
+            outfile.write(out)
+
+
+def _generate_targets() -> List[Target]:
+    targets: List[Target] = []
+    # Manually define a few entries and automatically add one for each
+    # of our ba_embedded_*.py files.
+    for pkg, public in [('bameta', True), ('bametainternal', False)]:
+        entries: List[Tuple[str, str]] = []
+
+        for fname in os.listdir(f'src/meta/{pkg}/python_embedded'):
+            if (fname.endswith('.py') and fname != '__init__.py'
+                    and 'flycheck' not in fname):
+                entries.append((os.path.splitext(fname)[0],
+                                'BINDING' if fname == 'binding.py' else
+                                'FLAT_DATA' if public else 'ENCRYPTED_DATA'))
+        # Generate targets from our entries.
+        for name, out_type in entries:
+            extra_sources: List[str] = []
+            if out_type == 'FLAT_DATA':
+                cmd = os.path.join(
+                    TOOLS_DIR,
+                    f'pcommand gen_flat_data_code $< $@ {name}_code')
+                extra_sources.append(os.path.join(TOOLS_DIR,
+                                                  'batools/meta.py'))
+            elif out_type == 'BINDING':
+                cmd = os.path.join(TOOLS_DIR,
+                                   'pcommand gen_binding_code $< $@')
+                extra_sources.append(os.path.join(TOOLS_DIR,
+                                                  'batools/meta.py'))
+            else:
+                cmd = os.path.join(
+                    TOOLS_DIR, f'generate_code {out_type} {name}_code $< $@')
+                extra_sources.append(os.path.join(TOOLS_DIR, 'generate_code'))
+
+            targets.append(
+                Target(src=[f'{pkg}/python_embedded/{name}.py'] +
+                       extra_sources,
+                       dst=os.path.join(OUT_DIR_CPP, 'python_embedded',
+                                        f'{name}.inc'),
+                       cmd=cmd,
+                       public=public))
+    return targets

tools/batools/pcommand.py

@@ -874,3 +874,9 @@ def update_resources_makefile() -> None:
     """Update the resources Makefile if needed."""
     from batools.resourcesmakefile import update
     update(projroot=str(PROJROOT), check='--check' in sys.argv)
+
+
+def update_meta_makefile() -> None:
+    """Update the meta Makefile if needed."""
+    from batools.metamakefile import update
+    update(projroot=str(PROJROOT), check='--check' in sys.argv)

tools/batools/resourcesmakefile.py

@@ -278,9 +278,8 @@ def _write_makefile(fname: str, targets: List[Dict], check: bool) -> None:
     except Exception:
         existing = None
 
-    ourname = os.path.basename(__file__)
     out = (get_public_license('makefile') +
-           f'\n# Generated by {ourname}; do not hand-edit.\n\n')
+           f'\n# Generated by {__name__}; do not hand-edit.\n\n')
     all_dsts = set()
     for target in targets:
         all_dsts.add(target['dst'])

tools/batools/updateproject.py

@@ -668,11 +668,15 @@ class Updater:
             sys.exit(255)
 
     def _update_meta_makefile(self) -> None:
-        if os.path.exists('tools/update_meta_makefile'):
+        # FIXME: should support running this in public too.
-            if os.system('tools/update_meta_makefile' + self._checkarg) != 0:
+        if not self._public:
-                print(f'{Clr.RED}Error checking/updating'
+            try:
-                      f' generated-code Makefile.{Clr.RED}')
+                subprocess.run(['tools/pcommand', 'update_meta_makefile'] +
-                sys.exit(255)
+                               self._checkarglist,
+                               check=True)
+            except Exception as exc:
+                raise CleanError(
+                    'Error checking/updating meta Makefile.') from exc
 
     def _update_resources_makefile(self) -> None:
         # FIXME: should support running this in public too.

tools/pcommand

@@ -40,7 +40,7 @@ from batools.pcommand import (
     update_assets_makefile, update_project, update_cmake_prefab_lib,
     cmake_prep_dir, gen_binding_code, gen_flat_data_code, wsl_path_to_win,
     wsl_build_check_win_drive, win_ci_binary_build, genchangelog,
-    android_sdk_utils, update_resources_makefile)
+    android_sdk_utils, update_resources_makefile, update_meta_makefile)
 # pylint: enable=unused-import
 
 if TYPE_CHECKING: