livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace fs_try_path with path_optional

master
Ansariel 2022-05-10 19:17:02 +02:00
parent c9407feece
commit 3cd356f063
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/fs_viewer_manifest.py
View File

@ -155,13 +155,6 @@ class FSViewerManifest:
os.rename("%s/firestorm-symbols-%s-%d.tar.bz2" % (self.args['configuration'].lower(), osname, self.address_size), sName)
# New llmanifest is braindead and does not allow any optional files.
# For some files likes jemalloc or openjpeg it makes sense to allow them to be abesent
def fs_try_path( self, src, dst=None ):
if self.path( src,dst ) == 0:
self.missing.pop()
def fs_generate_breakpad_symbols_for_file( self, aFile ):
from os import makedirs, remove
from os.path import join, isfile

14
indra/newview/viewer_manifest.py
View File

@ -613,7 +613,7 @@ class WindowsManifest(ViewerManifest):
self.path("alut.dll")
# For textures
self.fs_try_path("openjp2.dll")
self.path_optional("openjp2.dll")
# Uriparser
self.path("uriparser.dll")
@ -1885,7 +1885,7 @@ class LinuxManifest(ViewerManifest):
# CEF files
with self.prefix(src=os.path.join(pkgdir, 'lib', 'release'), dst="lib"):
self.path( "libcef.so" )
self.fs_try_path( "libminigbm.so" )
self.path_optional( "libminigbm.so" )
with self.prefix(src=os.path.join(pkgdir, 'lib', 'release', 'swiftshader'), dst=os.path.join("bin", "swiftshader") ):
self.path( "*.so" )
@ -1998,10 +1998,10 @@ class LinuxManifest(ViewerManifest):
#self.fs_path("libminizip.so")
self.path("libuuid.so*")
self.path("libSDL*.so*")
self.fs_try_path("libdirectfb*.so*")
self.fs_try_path("libfusion*.so*")
self.fs_try_path("libdirect*.so*")
self.fs_try_path("libopenjpeg.so*")
self.path_optional("libdirectfb*.so*")
self.path_optional("libfusion*.so*")
self.path_optional("libdirect*.so*")
self.path_optional("libopenjpeg.so*")
self.path("libhunspell-1.3.so*")
self.path("libalut.so*")
#self.path("libpng15.so.15") #use provided libpng to workaround incompatible system versions on some distros
@ -2030,7 +2030,7 @@ class LinuxManifest(ViewerManifest):
# version number.
#self.path("libfontconfig.so.*.*")
self.fs_try_path("libjemalloc.so*")
self.path_optional("libjemalloc.so*")
# Vivox runtimes
# Currentelly, the 32-bit ones will work with a 64-bit client.