mirror of
https://github.com/RYDE-WORK/ballistica.git
synced 2026-01-19 13:25:31 +08:00
a bit more tidying
This commit is contained in:
parent
ff6492e19e
commit
78b850f835
@ -43,6 +43,9 @@
|
|||||||
- Sphinx based Python documentation generation is now wired up (Thanks
|
- Sphinx based Python documentation generation is now wired up (Thanks
|
||||||
Loup-Garou911XD!)
|
Loup-Garou911XD!)
|
||||||
- Renaming & overwriting existing profiles is no longer possible (Thanks Temp!)
|
- Renaming & overwriting existing profiles is no longer possible (Thanks Temp!)
|
||||||
|
- Cleaned up builds when running under WSL. Things like `make mypy` should now
|
||||||
|
work correctly there, and it should now be possible to build and run either
|
||||||
|
Linux or Windows builds there.
|
||||||
|
|
||||||
### 1.7.32 (build 21741, api 8, 2023-12-20)
|
### 1.7.32 (build 21741, api 8, 2023-12-20)
|
||||||
- Fixed a screen message that no one will ever see (Thanks vishal332008?...)
|
- Fixed a screen message that no one will ever see (Thanks vishal332008?...)
|
||||||
|
|||||||
6
Makefile
6
Makefile
@ -969,7 +969,7 @@ WINDOWS_CONFIGURATION ?= Debug
|
|||||||
|
|
||||||
# Stage assets and other files so a built binary will run.
|
# Stage assets and other files so a built binary will run.
|
||||||
windows-staging: assets-windows resources meta
|
windows-staging: assets-windows resources meta
|
||||||
$(STAGE_BUILD) -win-$(WINPLT) -$(WINCFGLC) build/windows/$(WINCFG)_$(WINPLT)
|
@$(STAGE_BUILD) -win-$(WINPLT) -$(WINCFGLC) build/windows/$(WINCFG)_$(WINPLT)
|
||||||
|
|
||||||
# Build and run a debug windows build (from WSL).
|
# Build and run a debug windows build (from WSL).
|
||||||
windows-debug: windows-debug-build
|
windows-debug: windows-debug-build
|
||||||
@ -1150,8 +1150,8 @@ cmake-modular-server-clean:
|
|||||||
|
|
||||||
# Stage assets for building/running within CLion.
|
# Stage assets for building/running within CLion.
|
||||||
clion-staging: assets-cmake resources meta
|
clion-staging: assets-cmake resources meta
|
||||||
$(STAGE_BUILD) -cmake -debug build/clion_debug
|
@$(STAGE_BUILD) -cmake -debug build/clion_debug
|
||||||
$(STAGE_BUILD) -cmake -release build/clion_release
|
@$(STAGE_BUILD) -cmake -release build/clion_release
|
||||||
|
|
||||||
# Tell make which of these targets don't represent files.
|
# Tell make which of these targets don't represent files.
|
||||||
.PHONY: cmake cmake-build cmake-clean cmake-server cmake-server-build \
|
.PHONY: cmake cmake-build cmake-clean cmake-server cmake-server-build \
|
||||||
|
|||||||
@ -166,6 +166,8 @@ int get_running_server_port_(const struct Context_* ctx,
|
|||||||
cJSON* state_dict = cJSON_Parse(buf);
|
cJSON* state_dict = cJSON_Parse(buf);
|
||||||
if (!state_dict) {
|
if (!state_dict) {
|
||||||
// An un-parseable state file is not a recoverable error; go down hard.
|
// An un-parseable state file is not a recoverable error; go down hard.
|
||||||
|
// State files are written and then moved into place so we should never
|
||||||
|
// see something like a half-written file.
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Fatal Error: pcommandbatch client %s_%d (pid %d):"
|
"Fatal Error: pcommandbatch client %s_%d (pid %d):"
|
||||||
" failed to parse state file value of size %zu.\n",
|
" failed to parse state file value of size %zu.\n",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user