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

Windows prefab server fix

Browse Source
This commit is contained in:
Eric Froemling 2020-04-21 19:25:57 -07:00
parent bcc8110b5c
commit c8738ff437
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -291,7 +291,7 @@ build/prefab/windows/release/BallisticaCore.exe: .efrocachemap
@tools/snippets efrocache_get $@ @tools/snippets efrocache_get $@
prefab-windows-server-debug: prefab-windows-server-debug-build prefab-windows-server-debug: prefab-windows-server-debug-build
build/prefab/windows-server/debug/dist/Python.exe \ build/prefab/windows-server/debug/dist/python.exe \
build/prefab/windows-server/debug/ballisticacore_server.py build/prefab/windows-server/debug/ballisticacore_server.py
prefab-windows-server-debug-build: prereqs \ prefab-windows-server-debug-build: prereqs \
@ -319,7 +319,7 @@ build/prefab/windows-server/debug/config_template.yaml: \
cp $< $@ cp $< $@
prefab-windows-server-release: prefab-windows-server-release-build prefab-windows-server-release: prefab-windows-server-release-build
build/prefab/windows-server/release/dist/Python.exe \ build/prefab/windows-server/release/dist/python.exe \
build/prefab/windows-server/release/ballisticacore_server.py build/prefab/windows-server/release/ballisticacore_server.py
prefab-windows-server-release-build: prereqs \ prefab-windows-server-release-build: prereqs \

16
tools/stage_assets
View File

@ -232,11 +232,11 @@ def _sync_windows_extras(cfg: Config) -> str:
# It'll technically be possible to orphaned top level # It'll technically be possible to orphaned top level
# files in dst, but we should be pulling those into dists # files in dst, but we should be pulling those into dists
# individually by name anyway so it should be safe. # individually by name anyway so it should be safe.
assert cfg.dst is not None
for dirname in ('DLLs', 'Lib'): for dirname in ('DLLs', 'Lib'):
# We also need to be more particular about which pyc files we pull # We also need to be more particular about which pyc files we pull
# over. The Python stuff in Extras is also used by some scripts # over. The Python stuff in Extras is also used by some scripts
# so there may be arbitrary non-opt pycs hanging around. # so there may be arbitrary non-opt pycs hanging around.
assert cfg.dst is not None
_run(f'mkdir -p "{cfg.dst}/{dirname}"') _run(f'mkdir -p "{cfg.dst}/{dirname}"')
cmd = ("rsync --recursive --update --delete --delete-excluded " cmd = ("rsync --recursive --update --delete --delete-excluded "
" --prune-empty-dirs" " --prune-empty-dirs"
@ -248,11 +248,15 @@ def _sync_windows_extras(cfg: Config) -> str:
"\"" + cfg.dst + "/" + dirname + "/\"") "\"" + cfg.dst + "/" + dirname + "/\"")
_run(cmd) _run(cmd)
# Now sync the top level individual files. # Now sync the top level individual files.
cmd = ("rsync --update " + cfg.win_extras_src + "/*.dll " + cmd = ("rsync --update " + cfg.win_extras_src + "/*.dll " +
cfg.win_extras_src + "/*.exe" cfg.win_extras_src + "/*.exe"
" \"" + cfg.dst + "/\"") " \"" + cfg.dst + "/\"")
_run(cmd) _run(cmd)
# If we're running under WSL we won't be able to launch these .exe files
# unless they're marked executable, so do that here.
_run(f'chmod +x {cfg.dst}/*.exe')
# We may want to add some site-packages on top; say where they should go. # We may want to add some site-packages on top; say where they should go.
return 'Lib' return 'Lib'