RYDE-WORK/ballistica
1
0
Fork 0
mirror of https://github.com/RYDE-WORK/ballistica.git synced 2026-02-06 15:47:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reorganizing meta build files

Browse Source
This commit is contained in:
Eric Froemling 2021-06-09 18:52:16 -05:00
parent 3a374ee834
commit 6f867d4c90
No known key found for this signature in database
GPG Key ID: 89C93F0F8D6D5A98
15 changed files with 79 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
.efrocachemap
View File

@ -3933,48 +3933,48 @@
"assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e", "assets/build/windows/Win32/vc_redist.x86.exe": "https://files.ballistica.net/cache/ba1/1c/e1/4a1a2eddda2f4aebd5f8b64ab08e",
"assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f", "assets/build/windows/Win32/vcruntime140d.dll": "https://files.ballistica.net/cache/ba1/50/8d/bc2600ac9491f1b14d659709451f",
"ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a", "ballisticacore-windows/Generic/BallisticaCore.ico": "https://files.ballistica.net/cache/ba1/89/c0/e32c7d2a35dc9aef57cc73b0911a",
"build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b0/49/0d242e1c81141be0ee561a184d88", "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b9/5f/a24d0e3decc9c1fd7c8916f3f923",
"build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0", "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/74/1d/fc9e33e565475daaac80da5252f0",
"build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/dc/87/b9f0c806997f9a7a2ca1ef951fa1", "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2d/c2/2ced7763507998ebe541e01dd323",
"build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/55/84/9518f657254defb0ef73c851398d", "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/12/d7/da484b1f54f5072408469fe87281",
"build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/df/69/682d4c7c7e84d061b98994bc99b9", "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d4/9a/66b1d94d102d4ac24bfa0fed2b32",
"build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b", "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/9c/7b/ac1a200be0f37078af0991faca3b",
"build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cd/dc/37d0300f47f401c15d132e294f2e", "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/65/9e/488d49a4ed7c9152caad39c7e1d6",
"build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/7b/5e/da03ccf4a7ebab8c46b95b469367", "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/9f/55/ffbb6733306e64bea46a3b52b800",
"build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/ea/17/500370ba461c0f7227b76cde2204", "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e1/0d/57f16944df21a2a7674e2c290f3a",
"build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/66/bd/2e3b4d3e269b9e3e65e9300232b7", "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/d0/65/0304b9d5fd18f4ebc2b012e1deb8",
"build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/21/c6/1e10d70c2568b56913890568537a", "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/26/d0/6bfa73d6ca87eeeddc8a243771a8",
"build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/96/a1/d839bc70d0f55d4004836a7e176e", "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/50/bb/91fc543ae2b907f808263b71953c",
"build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/f8/51/b7c3284e399104333e92df77e4a7", "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b1/18/808dace258cf071dcc43540f5a35",
"build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/8d/3c/6ccc8358ee11f2db98759b23cb46", "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/11/86/a4bdc3fff7c351fd14525b6e0ba9",
"build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/fe/36/8c17984b5b81d1dd8b20d7137e15", "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/00/bb/79b2ef9373b2f9f030921dc124c5",
"build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/6d/62/68ccb9541b572031affc826cc7ce", "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/ae/4a/c793ea4f4255ea56d136cfe00eff",
"build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/7f/1d/8183153d8a03b7176dbc406ce067", "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a0/cd/20dd8f27f6a6636fcc72bc4b0f76",
"build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/d0/b4/eb830b468a4ce0bce93f12d54cab", "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/b1/18/98e6cc26c43affc6bda50568d586",
"build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/fd/da/292850ec6a6a5281d56065b4de0c", "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/2b/bd/2fd8a4436bbc4dbb9406862840ef",
"build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/2f/b7/22991b860126043b5fdf95ebfe35", "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/da/fc/e8e75337f8cc48b9b3f763246f13",
"build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f0/d3/e88910c0724d5d5828598a55b3ac", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/17/8a/3e4eec6be82a7d51ec68c2cd9134",
"build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/72/71/edc3f08a87cc22c1bf069f9b40a2", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/18/27/4063e018845b61a43d3fb975dda9",
"build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a3/a8/c243af3492cfd3dd85a8c48e539b", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/94/8e/b57d1b16f9a97ae6b75f6aa64d24",
"build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/54/bb/8a57fcf38a843b2d74a8d98eef1b", "build/prefab/lib/linux_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/67/16/3cd755e2c440aa23a2dd80307490",
"build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/e1/80/49cdd00bede642db781d468e8b8a", "build/prefab/lib/linux_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ab/db/013d99bd87bc2edc2e5c896e5fbf",
"build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/65/53/361464e556f691be8123a6981df0", "build/prefab/lib/linux_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/3c/cd/74f08764b40ee9ad6876714c478e",
"build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2c/66/b5a14d9f0d7a86019145b227ddac", "build/prefab/lib/linux_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a1/bb/e080c9b51f9b7461de2620e79849",
"build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/8c/55/91087a4da808d294172d55b57a80", "build/prefab/lib/linux_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0b/ff/43378bb472e36c180aa64f4a6298",
"build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/2b/b8/428e18a3b1f7d4d353c0e5d96d23", "build/prefab/lib/mac_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/06/44/7bf83038f40de57134ef9880c9fa",
"build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/61/9f/c9d4c272812db7f1afe914152f5a", "build/prefab/lib/mac_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/18/2c/7d851b62ace84ac9d577ffd3f063",
"build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/ed/da/8ba534efe375faee13faee6f92cb", "build/prefab/lib/mac_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b5/e4/be4df91fab11dd1acd20f24d7b51",
"build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/44/40/6b9b4be17d23e5ff78a0f0242699", "build/prefab/lib/mac_arm64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/f3/bd/5d6e0e7bb69f8db28a4424a5700a",
"build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/fc/09/e9e374f8ff007abd68731bd3ddb9", "build/prefab/lib/mac_x86_64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/39/51/7d883a7e68f15624d5ab0eb99e70",
"build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/21/3f/116ca7d820d2e9722ac2505471f4", "build/prefab/lib/mac_x86_64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/d8/2e/7c67cb2046cafe06d1446851eb18",
"build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/86/9f/c6610a0006b255768a74d73ce77b", "build/prefab/lib/mac_x86_64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/c1/37/421b9994eb20ec8e8f5c9d9af098",
"build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/a1/6e/c4b8e6499dd2404c010eb25fc55e", "build/prefab/lib/mac_x86_64_server/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/38/fb/b4547e1d925e49887df4a8eb23f1",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/33/1b/2f39ff51ed00220a9fec7439679f", "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/8c/0b/9be1def8b6f8bed7b8f71a539faf",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/e9/0d/099c69f8ac43c38ca0fa453e720f", "build/prefab/lib/windows/Debug_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/ff/7e/99a0285eb245a35e2fb08c7ffb68",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/bc/ce/38223808242f4c93bb934953fa30", "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/4f/7d/7fc8fcb8db604f1ef8f743605efd",
"build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/7c/f9/a4434d09913fe7abfaee609a7328", "build/prefab/lib/windows/Debug_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/4d/e5/35a0103528941302111286b71703",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/05/39/c6316ab0a10b2f7be04ec2e362bf", "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.lib": "https://files.ballistica.net/cache/ba1/a3/2b/7af61fae139893d2201627e0bd1f",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/a6/e2/fa09037662a6dea09a4e3535f0d5", "build/prefab/lib/windows/Release_Win32/BallisticaCoreGenericInternal.pdb": "https://files.ballistica.net/cache/ba1/92/58/b776d66dd27d86c409cf858dc229",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/d5/61/766e7eb3ff456541f7d500d3a8fa", "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.lib": "https://files.ballistica.net/cache/ba1/b3/1b/ea5970a95243a6422ab9425f496b",
"build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/dc/b6/88bcc84113846ee6387ef9f7e277" "build/prefab/lib/windows/Release_Win32/BallisticaCoreHeadlessInternal.pdb": "https://files.ballistica.net/cache/ba1/70/e6/2361224d82ef64479db475a5bc76"
} }

5
.gitignore vendored
View File

@ -119,8 +119,9 @@ assets/src_master
# XCode # XCode
xcuserdata/ xcuserdata/
# Generated code output # Generated sources
/src/generated/ /src/ballistica/generated
/assets/src/ba_data/python/_generated
# Dynamically generated resource files # Dynamically generated resource files
/ballisticacore-android/BallisticaCore/src/cardboard/res/drawable-*/vr_icon.png /ballisticacore-android/BallisticaCore/src/cardboard/res/drawable-*/vr_icon.png

2
.idea/dictionaries/ericf.xml generated
View File

@ -172,6 +172,8 @@
<w>ballisticacorecb</w> <w>ballisticacorecb</w>
<w>bamaster</w> <w>bamaster</w>
<w>bamasteraddr</w> <w>bamasteraddr</w>
<w>bameta</w>
<w>bametainternal</w>
<w>barcolor</w> <w>barcolor</w>
<w>barebones</w> <w>barebones</w>
<w>baseh</w> <w>baseh</w>

2
.idea/scopes/UncheckedPython.xml generated
View File

@ -1,3 +1,3 @@
<component name="DependencyValidationManager"> <component name="DependencyValidationManager">
<scope name="UncheckedPython" pattern="file:assets/src/ba_data/python/_ba.py||file:src/meta/ballistica/binding.py" /> <scope name="UncheckedPython" pattern="file:assets/src/ba_data/python/_ba.py||file:src/meta/bameta/python_embedded/binding.py" />
</component> </component>

2
ballisticacore-cmake/.idea/dictionaries/ericf.xml generated
View File

@ -74,6 +74,8 @@
<w>ballistica</w> <w>ballistica</w>
<w>ballisticacore</w> <w>ballisticacore</w>
<w>bamasteraddr</w> <w>bamasteraddr</w>
<w>bameta</w>
<w>bametainternal</w>
<w>barebones</w> <w>barebones</w>
<w>basetype</w> <w>basetype</w>
<w>basicsize</w> <w>basicsize</w>

2
docs/ba_module.md
View File

@ -1,5 +1,5 @@
<!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND --> <!-- THIS FILE IS AUTO GENERATED; DO NOT EDIT BY HAND -->
<h4><em>last updated on 2021-06-09 for Ballistica version 1.6.4 build 20374</em></h4> <h4><em>last updated on 2021-06-09 for Ballistica version 1.6.4 build 20375</em></h4>
<p>This page documents the Python classes and functions in the 'ba' module, <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> 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> <hr>

2
src/ballistica/ballistica.cc
View File

@ -21,7 +21,7 @@
namespace ballistica { namespace ballistica {
// These are set automatically via script; don't modify them here. // These are set automatically via script; don't modify them here.
const int kAppBuildNumber = 20375; const int kAppBuildNumber = 20376;
const char* kAppVersion = "1.6.4"; const char* kAppVersion = "1.6.4";
// Our standalone globals. // Our standalone globals.

4
src/ballistica/python/python.cc
View File

@ -956,7 +956,7 @@ void Python::Reset(bool do_init) {
// - add our user and system script dirs to python path // - add our user and system script dirs to python path
// - import and instantiate our app-state class // - import and instantiate our app-state class
#include "generated/ballistica/bootstrap.inc" #include "ballistica/generated/python_embedded/bootstrap.inc"
PyObject* result = PyObject* result =
PyRun_String(bootstrap_code, Py_file_input, bootstrap_context.get(), PyRun_String(bootstrap_code, Py_file_input, bootstrap_context.get(),
bootstrap_context.get()); bootstrap_context.get());
@ -970,7 +970,7 @@ void Python::Reset(bool do_init) {
Py_DECREF(result); Py_DECREF(result);
// Import and grab all the Python stuff we use. // Import and grab all the Python stuff we use.
#include "generated/ballistica/binding.inc" #include "ballistica/generated/python_embedded/binding.inc"
AppInternalPythonPostInit(); AppInternalPythonPostInit();

14
src/meta/Makefile
View File

@ -1,18 +1,18 @@
# Released under the MIT License. See LICENSE for details. # Released under the MIT License. See LICENSE for details.
# #
# This file was generated by tools/update_generated_code_makefile. # This file was generated by tools/update_meta_makefile.
all: generated_code all: cpp_sources
generated_code: ../generated/ballistica/binding.inc \ cpp_sources: ../ballistica/generated/python_embedded/binding.inc \
../generated/ballistica/bootstrap.inc ../ballistica/generated/python_embedded/bootstrap.inc
clean: clean:
@rm -rf ../generated @rm -rf ../ballistica/generated
../generated/ballistica/bootstrap.inc : ballistica/bootstrap.py ../../tools/batools/codegen.py ../ballistica/generated/python_embedded/bootstrap.inc : bameta/python_embedded/bootstrap.py ../../tools/batools/codegen.py
@../../tools/pcommand gen_flat_data_code $< $@ bootstrap_code @../../tools/pcommand gen_flat_data_code $< $@ bootstrap_code
../generated/ballistica/binding.inc : ballistica/binding.py ../../tools/batools/codegen.py ../ballistica/generated/python_embedded/binding.inc : bameta/python_embedded/binding.py ../../tools/batools/codegen.py
@../../tools/pcommand gen_binding_code $< $@ @../../tools/pcommand gen_binding_code $< $@

7
src/meta/bameta/__init__.py Normal file
View File

@ -0,0 +1,7 @@
# Released under the MIT License. See LICENSE for details.
#
"""Build/tool functionality specific to the Ballistica project.
This stuff can be a bit more sloppy/loosey-goosey since it is not used by the
game itself.
"""

0
src/meta/ballistica/binding.py → src/meta/bameta/python_embedded/binding.py
View File

2
src/meta/ballistica/bootstrap.py → src/meta/bameta/python_embedded/bootstrap.py
View File

@ -1,5 +1,5 @@
# Released under the MIT License. See LICENSE for details. # Released under the MIT License. See LICENSE for details.
"""Initial ba bootstrapping.""" """Initial ballistica bootstrapping."""
from __future__ import annotations from __future__ import annotations

6
tools/batools/codegen.py
View File

@ -7,6 +7,8 @@ import os
import json import json
from typing import TYPE_CHECKING from typing import TYPE_CHECKING
from efro.terminal import Clr
if TYPE_CHECKING: if TYPE_CHECKING:
from typing import List, Sequence, Optional, Any, Dict from typing import List, Sequence, Optional, Any, Dict
@ -41,7 +43,7 @@ def gen_flat_data_code(projroot: str, in_path: str, out_path: str,
pretty_path = os.path.abspath(out_path) pretty_path = os.path.abspath(out_path)
if pretty_path.startswith(projroot + '/'): if pretty_path.startswith(projroot + '/'):
pretty_path = pretty_path[len(projroot) + 1:] pretty_path = pretty_path[len(projroot) + 1:]
print(f'Generating code: {pretty_path}') print(f'Meta-building {Clr.BLD}{pretty_path}{Clr.RST}')
with open(out_path, 'w') as outfile: with open(out_path, 'w') as outfile:
outfile.write(sval_out) outfile.write(sval_out)
@ -99,6 +101,6 @@ def gen_binding_code(projroot: str, in_path: str, out_path: str) -> None:
pretty_path = os.path.abspath(out_path) pretty_path = os.path.abspath(out_path)
if pretty_path.startswith(projroot + '/'): if pretty_path.startswith(projroot + '/'):
pretty_path = pretty_path[len(projroot) + 1:] pretty_path = pretty_path[len(projroot) + 1:]
print('Generating code: ' + pretty_path) print(f'Meta-building {Clr.BLD}{pretty_path}{Clr.RST}')
with open(out_path, 'w') as outfile: with open(out_path, 'w') as outfile:
outfile.write(ccode) outfile.write(ccode)

9
tools/batools/updateproject.py
View File

@ -80,7 +80,7 @@ class Updater:
# NOTE: Do py-enums before updating asset deps since it *is* an asset. # NOTE: Do py-enums before updating asset deps since it *is* an asset.
self._update_python_enums_module() self._update_python_enums_module()
self._update_resources_makefile() self._update_resources_makefile()
self._update_generated_code_makefile() self._update_meta_makefile()
self._update_assets_makefile() self._update_assets_makefile()
self._check_makefiles() self._check_makefiles()
@ -667,10 +667,9 @@ class Updater:
f'{Clr.RED}Error checking/updating assets Makefile.{Clr.RST}') f'{Clr.RED}Error checking/updating assets Makefile.{Clr.RST}')
sys.exit(255) sys.exit(255)
def _update_generated_code_makefile(self) -> None: def _update_meta_makefile(self) -> None:
if os.path.exists('tools/update_generated_code_makefile'): if os.path.exists('tools/update_meta_makefile'):
if os.system('tools/update_generated_code_makefile' + if os.system('tools/update_meta_makefile' + self._checkarg) != 0:
self._checkarg) != 0:
print(f'{Clr.RED}Error checking/updating' print(f'{Clr.RED}Error checking/updating'
f' generated-code Makefile.{Clr.RED}') f' generated-code Makefile.{Clr.RED}')
sys.exit(255) sys.exit(255)

3
tools/efrotools/code.py
View File

@ -453,7 +453,8 @@ def _apply_pylint_run_to_cache(projroot: Path, run: Any, dirtyfiles: List[str],
# Ignore some specific untracked deps; complain about any others. # Ignore some specific untracked deps; complain about any others.
untracked_deps = set(dep for dep in untracked_deps untracked_deps = set(dep for dep in untracked_deps
if dep not in ignored_untracked_deps) if dep not in ignored_untracked_deps
and not dep.startswith('bametainternal'))
if untracked_deps: if untracked_deps:
raise CleanError( raise CleanError(
f'Pylint found untracked dependencies: {untracked_deps}.' f'Pylint found untracked dependencies: {untracked_deps}.'