From 8f8a32d24d9404b45b44034ee8e68f6aee4a840f Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 5 Jan 2024 16:23:05 -0800 Subject: [PATCH] some copyright date updates for 2024 --- .efrocachemap | 56 ++++++++++++++--------------- CHANGELOG.md | 2 +- src/assets/ba_data/python/baenv.py | 2 +- src/ballistica/shared/ballistica.cc | 2 +- tools/batools/project/_checks.py | 41 ++++++++++++++------- 5 files changed, 60 insertions(+), 43 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 7c0ee901..39fde5bb 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -4060,26 +4060,26 @@ "build/assets/windows/Win32/ucrtbased.dll": "2def5335207d41b21b9823f6805997f1", "build/assets/windows/Win32/vc_redist.x86.exe": "b08a55e2e77623fe657bea24f223a3ae", "build/assets/windows/Win32/vcruntime140d.dll": "865b2af4d1e26a1a8073c89acb06e599", - "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "d21914011f1e77a976b148a5b8c69dce", - "build/prefab/full/linux_arm64_gui/release/ballisticakit": "cf5237fcf915d7d8d821a258f50ca179", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "3af7cbd5537179db4d40ba9716fff2b8", - "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "9fd2409a3903b751d48fc660f9e70099", - "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "0cca04e822b4238d8a1e850cc6a94ed1", - "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "523227d51e692d79de1cd69cadb1f8aa", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "59a7745669408160aa43610422e41359", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "d8c3b8fe1f6d16e576109094a4d5b53b", - "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "08210135eacec59cb41dd722ae626f77", - "build/prefab/full/mac_arm64_gui/release/ballisticakit": "31dded01891017b46eaa0f6bd75e0f7f", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "6329a6bd805d4915224b754a9865c579", - "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "ff9c7e8e7883aa2016fa25775baefd26", - "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "34b828fbe4977b19430ba0a95ca50458", - "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "8a65ad46eb98595295c9c068ea5e7775", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "3320556d000c66d23f8011abab1eb0cb", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "0e3b251bf6c965314a8cc4d306f2448b", - "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "feb05d9807f54cc40e4cbeab373de79d", - "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "ee822a29b6f63c1375be7045b82543eb", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "487a8d7e6a25ad423b846ecc47bfafec", - "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a4d3bf9e4660df50ba66564df0bf0e13", + "build/prefab/full/linux_arm64_gui/debug/ballisticakit": "c5e053c4b83c085c21f7445f7d53cb7c", + "build/prefab/full/linux_arm64_gui/release/ballisticakit": "2a4ba9065e50bf327b0fc582007ad6ed", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticakit_headless": "683b185c89662b0b751a42906464e386", + "build/prefab/full/linux_arm64_server/release/dist/ballisticakit_headless": "a3c6c3ac394ba54117930e1c7aea1812", + "build/prefab/full/linux_x86_64_gui/debug/ballisticakit": "e3fda2b9dad14b6919ea97a61d21489b", + "build/prefab/full/linux_x86_64_gui/release/ballisticakit": "e5343c505d4c2f1b3b547e867dab3d41", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticakit_headless": "6a723038a6157d810cb6c9d7a921826a", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticakit_headless": "39ff22b4a24581bca7c2918b4d10c691", + "build/prefab/full/mac_arm64_gui/debug/ballisticakit": "abb2c71fa426bc836f38b661afb5e3f7", + "build/prefab/full/mac_arm64_gui/release/ballisticakit": "aff057b7be5f10c3e87fb71739bd786b", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticakit_headless": "c4a32ca21b1621239378d689068015dd", + "build/prefab/full/mac_arm64_server/release/dist/ballisticakit_headless": "41854e470df59e6cace772a620a915ac", + "build/prefab/full/mac_x86_64_gui/debug/ballisticakit": "f4acd58fdcb43cc5ad104c6530240f4e", + "build/prefab/full/mac_x86_64_gui/release/ballisticakit": "a0939128bbd12ebddd19691cbd2a8bdb", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticakit_headless": "9a9aadd78d7dc65663e622e6f41ca944", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticakit_headless": "5cbd8b0b2a33bfc132b24ebe0798c732", + "build/prefab/full/windows_x86_gui/debug/BallisticaKit.exe": "339ac97c0591caf6f78f2c9712b1ea19", + "build/prefab/full/windows_x86_gui/release/BallisticaKit.exe": "8411b4ae387975f17d1f255e879fbd9c", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaKitHeadless.exe": "364cbe9a490300dc423e76be2dadd32f", + "build/prefab/full/windows_x86_server/release/dist/BallisticaKitHeadless.exe": "a186829073b2a809be8e7505477b7108", "build/prefab/lib/linux_arm64_gui/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", "build/prefab/lib/linux_arm64_gui/release/libballisticaplus.a": "97d51afca996ae15b61fd9f409a00459", "build/prefab/lib/linux_arm64_server/debug/libballisticaplus.a": "db535f0ca1e01af825f75f204fbc8928", @@ -4096,14 +4096,14 @@ "build/prefab/lib/mac_x86_64_gui/release/libballisticaplus.a": "452623f0495dd4375e5b5d9b80d643d5", "build/prefab/lib/mac_x86_64_server/debug/libballisticaplus.a": "ca49b32ed573feea11613d62cd89840c", "build/prefab/lib/mac_x86_64_server/release/libballisticaplus.a": "452623f0495dd4375e5b5d9b80d643d5", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "e9494cd7208333dc6bd5cbac2e0aefc0", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "394ac61c479969f32f907202bc86015a", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "fb19dd72fc79a208fd55a5ab01fe978f", - "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "b1280e359206f6e626ceb33df18d1f84", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "4bd91c11238f1d135285c22c0ff68644", - "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "a0aaf79bb595d8449f46421f5e86f04e", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "cb0974645afa59e96d690844361514df", - "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "55285a142b79b7b5643b749864d64aae", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.lib": "3981a2a3291a86349f99626b35a76a56", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitGenericPlus.pdb": "fdfe72ba7bcb6b2cbcedf144dce4fa44", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.lib": "b2178a56d5395f61cc33a70b50d87506", + "build/prefab/lib/windows/Debug_Win32/BallisticaKitHeadlessPlus.pdb": "7869a7a14c57859529fd564c4a8ad1b1", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.lib": "6f244022dc28a358eec48524ab04e810", + "build/prefab/lib/windows/Release_Win32/BallisticaKitGenericPlus.pdb": "94906a8bee71a52820ae294f5267c5bc", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.lib": "a61ddb3fc5375e948612d19f282b00c1", + "build/prefab/lib/windows/Release_Win32/BallisticaKitHeadlessPlus.pdb": "abc867cddab0f02c74e0a39a866d58cc", "src/assets/ba_data/python/babase/_mgen/__init__.py": "f885fed7f2ed98ff2ba271f9dbe3391c", "src/assets/ba_data/python/babase/_mgen/enums.py": "b611c090513a21e2fe90e56582724e9d", "src/ballistica/base/mgen/pyembed/binding_base.inc": "72bfed2cce8ff19741989dec28302f3f", diff --git a/CHANGELOG.md b/CHANGELOG.md index ae2dac98..0c92ee54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.33 (build 21755, api 8, 2024-01-05) +### 1.7.33 (build 21756, api 8, 2024-01-05) - Stress test input-devices are now a bit smarter; they won't press any buttons while UIs are up (this could cause lots of chaos if it happened). - Added a 'Show Demos When Idle' option in advanced settings. If enabled, the diff --git a/src/assets/ba_data/python/baenv.py b/src/assets/ba_data/python/baenv.py index 5633ae86..fcff313e 100644 --- a/src/assets/ba_data/python/baenv.py +++ b/src/assets/ba_data/python/baenv.py @@ -52,7 +52,7 @@ if TYPE_CHECKING: # Build number and version of the ballistica binary we expect to be # using. -TARGET_BALLISTICA_BUILD = 21755 +TARGET_BALLISTICA_BUILD = 21756 TARGET_BALLISTICA_VERSION = '1.7.33' diff --git a/src/ballistica/shared/ballistica.cc b/src/ballistica/shared/ballistica.cc index fa3f3925..24451720 100644 --- a/src/ballistica/shared/ballistica.cc +++ b/src/ballistica/shared/ballistica.cc @@ -39,7 +39,7 @@ auto main(int argc, char** argv) -> int { namespace ballistica { // These are set automatically via script; don't modify them here. -const int kEngineBuildNumber = 21755; +const int kEngineBuildNumber = 21756; const char* kEngineVersion = "1.7.33"; const int kEngineApiVersion = 8; diff --git a/tools/batools/project/_checks.py b/tools/batools/project/_checks.py index 3955fa22..85694c8c 100755 --- a/tools/batools/project/_checks.py +++ b/tools/batools/project/_checks.py @@ -19,6 +19,11 @@ if TYPE_CHECKING: def _get_legal_notice_private() -> str: """Return the one line legal notice we expect private files to have.""" + return 'Copyright (c) 2011-2024 Eric Froemling' + + +def _get_legal_notice_private_prev() -> str: + """Allows us to auto-update.""" return 'Copyright (c) 2011-2023 Eric Froemling' @@ -210,6 +215,7 @@ def _check_c_license( # Look for public license line (public or private repo) or private # license line (private repo only) line_private = '// ' + _get_legal_notice_private() + line_private_prev = '// ' + _get_legal_notice_private_prev() line_public = get_public_license('c++') lnum = 0 @@ -229,7 +235,7 @@ def _check_c_license( fname, line_number=lnum, expected=line_private, - can_auto_update=False, + can_auto_update=(lines[lnum] == line_private_prev), ) @@ -463,6 +469,7 @@ def _check_python_file_license( if self.license_line_checks: public_license = get_public_license('python') private_license = '# ' + _get_legal_notice_private() + private_license_prev = '# ' + _get_legal_notice_private_prev() lnum = copyrightline if len(lines) < lnum + 1: raise RuntimeError('Not enough lines in file:', fname) @@ -486,17 +493,27 @@ def _check_python_file_license( f'{disable_note}' ) else: - if lines[lnum] != public_license and lines[lnum] != private_license: - raise CleanError( - f'License text not found' - f" at '{fname}' line {lnum+1};" - f' please correct.\n' - f'Expected text (for public files):' - f' {public_license}\n' - f'Expected text (for private files):' - f' {private_license}\n' - f'{disable_note}' - ) + if lines[lnum] not in [public_license, private_license]: + # Special case: if we find last year's private license + # we can update to this year's. + if lines[lnum] == private_license_prev: + self.add_line_correction( + fname, + line_number=lnum, + expected=private_license, + can_auto_update=(lines[lnum] == private_license_prev), + ) + else: + raise CleanError( + f'License text not found' + f" at '{fname}' line {lnum+1};" + f' please correct.\n' + f'Expected text (for public files):' + f' {public_license}\n' + f'Expected text (for private files):' + f' {private_license}\n' + f'{disable_note}' + ) def _calc_python_file_copyright_line(