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

Cleaned up packaged files on windows

Browse Source
This commit is contained in:
Eric Froemling 2020-06-13 19:52:08 -07:00
parent d548da781b
commit c749b99261
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.efrocachemap
View File

@ -4139,12 +4139,12 @@
"build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/32/01/1382cb73f9a4484a49ba603429fc", "build/prefab/linux-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/32/01/1382cb73f9a4484a49ba603429fc",
"build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b4/dc/dcbe26dc38ac257f792cf10f0460", "build/prefab/linux/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/b4/dc/dcbe26dc38ac257f792cf10f0460",
"build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/64/16/a4f73103c2db98225fb3c7763ea7", "build/prefab/linux/release/ballisticacore": "https://files.ballistica.net/cache/ba1/64/16/a4f73103c2db98225fb3c7763ea7",
"build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/1d/fd/969e660fbbd15177aeb5d79aaad3", "build/prefab/mac-server/debug/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/56/3e/c92b2d32d11f9adb59f80f040ed7",
"build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/dc/1b4b59fcf7e1b3a2fabfb6fa7762", "build/prefab/mac-server/release/dist/ballisticacore_headless": "https://files.ballistica.net/cache/ba1/28/dc/1b4b59fcf7e1b3a2fabfb6fa7762",
"build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/5f/80/3fc03f524c5ab0ca0f18bef1c994", "build/prefab/mac/debug/ballisticacore": "https://files.ballistica.net/cache/ba1/2e/34/7a7d8aae625e6c871cdf8cc8607e",
"build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/72/c7/1b3960aeb864e2d69e7588c2fd70", "build/prefab/mac/release/ballisticacore": "https://files.ballistica.net/cache/ba1/72/c7/1b3960aeb864e2d69e7588c2fd70",
"build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/13/25/c5ed7e41549396a2a376a547778d", "build/prefab/windows-server/debug/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/2b/50/6e2a0606fdd282de8b421d548bcd",
"build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/0d/b7/144275e1c533a0b077d62610ff6b", "build/prefab/windows-server/release/dist/ballisticacore_headless.exe": "https://files.ballistica.net/cache/ba1/29/d1/b98723d9348f444db169dc7e2ea4",
"build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f5/80/08ff1c67de148ecd203892499a56", "build/prefab/windows/debug/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/2f/ad/c921162d7f618ee39846618579f6",
"build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/d6/03/2fdba74ac6883ff5408b6a165f04" "build/prefab/windows/release/BallisticaCore.exe": "https://files.ballistica.net/cache/ba1/f7/b5/797749be0b3dbcc8bab3e8f2fa17"
} }

16
tools/stage_assets
View File

@ -55,6 +55,7 @@ class Config:
self.dst: Optional[str] = None self.dst: Optional[str] = None
self.win_extras_src: Optional[str] = None self.win_extras_src: Optional[str] = None
self.win_platform: Optional[str] = None self.win_platform: Optional[str] = None
self.win_type: Optional[str] = None
self.include_audio = True self.include_audio = True
self.include_models = True self.include_models = True
self.include_collide_models = True self.include_collide_models = True
@ -121,6 +122,7 @@ class Config:
"""Parse sub-args in the windows platform string.""" """Parse sub-args in the windows platform string."""
winempty, wintype, winplt, wincfg = platform.split('-') winempty, wintype, winplt, wincfg = platform.split('-')
self.win_platform = winplt self.win_platform = winplt
self.win_type = wintype
assert winempty == '' assert winempty == ''
self.dst = sys.argv[2] self.dst = sys.argv[2]
self.tex_suffix = '.dds' self.tex_suffix = '.dds'
@ -243,6 +245,7 @@ def _write_payload_file(assets_root: str, full: bool) -> None:
def _sync_windows_extras(cfg: Config) -> None: def _sync_windows_extras(cfg: Config) -> None:
assert cfg.win_extras_src is not None assert cfg.win_extras_src is not None
assert cfg.win_platform is not None assert cfg.win_platform is not None
assert cfg.win_type is not None
if not os.path.isdir(cfg.win_extras_src): if not os.path.isdir(cfg.win_extras_src):
raise Exception('win extras src dir not found: ' + cfg.win_extras_src) raise Exception('win extras src dir not found: ' + cfg.win_extras_src)
@ -268,10 +271,15 @@ def _sync_windows_extras(cfg: Config) -> None:
# Now sync the top level individual files that we want. # Now sync the top level individual files that we want.
# (we could technically copy everything over but this keeps staging # (we could technically copy everything over but this keeps staging
# dirs a bit tidier) # dirs a bit tidier)
toplevelfiles: List[str] = [ toplevelfiles: List[str] = []
'libvorbis.dll', 'libvorbisfile.dll', 'ogg.dll', 'OpenAL32.dll',
'SDL2.dll' if cfg.win_type == 'win':
] toplevelfiles += [
'libvorbis.dll', 'libvorbisfile.dll', 'ogg.dll', 'OpenAL32.dll',
'SDL2.dll'
]
elif cfg.win_type == 'winserver':
toplevelfiles += ['python.exe']
# Include debug dlls for x64 so folks without msvc can run them. # Include debug dlls for x64 so folks without msvc can run them.
# (seems win32 doesn't have the same set so ignoring that for now) # (seems win32 doesn't have the same set so ignoring that for now)