From ac97b88cd7a03c9138527f7290095a15c92070bd Mon Sep 17 00:00:00 2001 From: Eric Froemling Date: Wed, 20 Jul 2022 11:10:23 -0700 Subject: [PATCH] hardening docs generation --- .efrocachemap | 40 ++++++++++++++++++------------------ CHANGELOG.md | 2 +- Makefile | 2 +- src/ballistica/ballistica.cc | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.efrocachemap b/.efrocachemap index 6fa6dd32..8dbefa8b 100644 --- a/.efrocachemap +++ b/.efrocachemap @@ -3995,26 +3995,26 @@ "assets/src/ba_data/python/ba/_generated/__init__.py": "https://files.ballistica.net/cache/ba1/ee/e8/cad05aa531c7faf7ff7b96db7f6e", "assets/src/ba_data/python/ba/_generated/enums.py": "https://files.ballistica.net/cache/ba1/b2/e5/0ee0561e16257a32830645239f34", "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/45/97/722168219b0eba22198e889bcb4f", - "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/1d/05/881d0a7dd22470aa96a4ac3f2746", - "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/72/c3/b636b2456c630fde3d0884a56639", - "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/df/4e/343b75a0bc0b412266f8bf35f9f2", - "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/4d/6a/7fafe79952d6bb343733de3ad44a", - "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/f6/8c/ffd32a0ff4f073ed39a85632cdd8", - "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/3f/b9/2e5f66fdf210c838469640a62ddb", - "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/f5/d2/6462d94b737bf59ca4b5623a8200", - "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/a9/97/bd8a516ee4977c89fd9d5ef41a8b", - "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/99/f2/eece146d73cb06db810c39636738", - "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/45/ba/3fc160f013cd0983fa2263f615a1", - "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/44/bc/5d9148c747ebc57164f1a48ac134", - "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/94/58/cc8220a9448f7f8a244bc53af7ad", - "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/61/80/a198f52aed1a2748e362f0761617", - "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/c5/f9/ef398657d9d9b908245d0125c58d", - "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/a0/75/c46ff9fe1aa1235e2774b8d87bfa", - "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/80/c8/700c80ad9984d1b6d95d9c709935", - "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/a3/1a/1b63755704c2bb1e9792b2b767f5", - "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/61/d2/7f6b29c173a1051563ceaec90833", - "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/27/ce/0eeb45047708cbd13cf62f92b0c5", + "build/prefab/full/linux_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/d9/3a/3a6e1468ee1132054f6d0342e1b0", + "build/prefab/full/linux_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/e3/69/9289ce92e4aa151272c464851c6b", + "build/prefab/full/linux_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/61/ef/6f5838998a576c1fb3b12a46189b", + "build/prefab/full/linux_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/aa/55/35d10c93ac03948688f5cd6edf6e", + "build/prefab/full/linux_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/0c/b9/3aac3d5c03f730f3d51605be7fae", + "build/prefab/full/linux_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/8c/59/a72e8bbcd96d792bee2552460375", + "build/prefab/full/linux_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/cf/db/1624dc231f9bdde12129bf22021e", + "build/prefab/full/linux_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/df/3f/4c1da2edf239d3158c42112d5b0a", + "build/prefab/full/mac_arm64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/c8/ee/efa1ee5190565a50bd02755193e2", + "build/prefab/full/mac_arm64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/11/49/83496b5a48b4fdf6575045e1addd", + "build/prefab/full/mac_arm64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/2e/c6/2729554bc0c8129efa9d9b07f415", + "build/prefab/full/mac_arm64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/78/ce/def8730fd7e32a1ee8c03b226942", + "build/prefab/full/mac_x86_64_gui/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/e5/8a/9dc5bd2f0c82f1bf5a3eb837e8ee", + "build/prefab/full/mac_x86_64_gui/release/ballisticacore": "https://files.ballistica.net/cache/ba1/7b/d3/9055e620a7efc822b26d894bfce4", + "build/prefab/full/mac_x86_64_server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/95/28/332468a8d937550e59501c9d5314", + "build/prefab/full/mac_x86_64_server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/08/61/33a1e48971b197c99371718e6e24", + "build/prefab/full/windows_x86_gui/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/bc/33/16952c0de8c6d39b2cb2a2719701", + "build/prefab/full/windows_x86_gui/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/af/5b/5f3eb7f198f37e50e52b8c5f80e6", + "build/prefab/full/windows_x86_server/debug/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/7d/f1/d8662c08d1d09177808f9cabacb1", + "build/prefab/full/windows_x86_server/release/dist/BallisticaCoreHeadless.exe": "https://files.ballistica.net/cache/ba1/4f/8f/74fc102af79d1f1a9e118670c13e", "build/prefab/lib/linux_arm64_gui/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/1a/6c/0c89987987ba2394da51b13d48cb", "build/prefab/lib/linux_arm64_gui/release/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/b8/b1/7ce57441f44a48185d1842cc954e", "build/prefab/lib/linux_arm64_server/debug/libballisticacore_internal.a": "https://files.ballistica.net/cache/ba1/0d/3e/77ed4e2948754ceb60353ab90091", diff --git a/CHANGELOG.md b/CHANGELOG.md index 92f092e3..290d82f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### 1.7.5 (build 20658, api 7, 2022-07-20) +### 1.7.5 (build 20660, api 7, 2022-07-20) - Android build now uses the ReLinker library to load the native main.so, which will (hopefully) avoid some random load failures on older Android versions. - Android Google Play build now prints a message at launch if the billing library isn't available or needs to be updated (explaining why purchases won't work in that case). - Various minor bug fixes (mostly cleaning up unnecessary error logging) diff --git a/Makefile b/Makefile index 31b451e6..eed5d0b1 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ dummymodule: ./tools/pcommand update_dummy_module --force # Generate docs. -docs: +docs: assets-cmake @tools/pcommand gendocs # Tell make which of these targets don't represent files. diff --git a/src/ballistica/ballistica.cc b/src/ballistica/ballistica.cc index 75ac1292..8af40dfb 100644 --- a/src/ballistica/ballistica.cc +++ b/src/ballistica/ballistica.cc @@ -21,7 +21,7 @@ namespace ballistica { // These are set automatically via script; don't modify them here. -const int kAppBuildNumber = 20658; +const int kAppBuildNumber = 20660; const char* kAppVersion = "1.7.5"; // Our standalone globals.