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

Replace fs_flavor method with more convenient method fs_is_opensim since we are checking for OpenSim only anyway

meow-7.2.2
Ansariel 2018-06-30 16:16:17 +02:00
parent 5586c0e160
commit a3b21752f1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/fs_viewer_manifest.py
View File

@ -3,9 +3,9 @@ import subprocess
import tarfile
class FSViewerManifest:
def fs_flavor( self ):
return self.args['viewer_flavor'] # [oss or hvk]
def fs_is_opensim(self):
return self.args['viewer_flavor'] == 'oss' #Havok would be hvk
def fs_splice_grid_substitution_strings( self, subst_strings ):
ret = subst_strings

10
indra/newview/viewer_manifest.py
View File

@ -290,7 +290,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
# a standard map of strings for replacing in the templates
#<FS:TS> tag "OS" after CHANNEL_VENDOR_BASE and before any suffix
channel_base = "Phoenix-" + CHANNEL_VENDOR_BASE
if self.fs_flavor() == 'oss':
if self.fs_is_opensim():
channel_base = channel_base + "OS"
#</FS:TS>
substitution_strings = {
@ -310,7 +310,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
app_suffix=self.channel_variant()
#<FS:ND> tag "OS" after CHANNEL_VENDOR_BASE and before any suffix
if self.fs_flavor() == 'oss':
if self.fs_is_opensim():
app_suffix = "OS" + app_suffix
#</FS:ND>
@ -324,7 +324,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
def icon_path(self):
# <FS:ND> Add -os for oss builds
if self.fs_flavor() == 'oss':
if self.fs_is_opensim():
return "icons/" + self.channel_type() + "-os"
# </FS:ND>
return "icons/" + self.channel_type()
@ -805,7 +805,7 @@ class WindowsManifest(ViewerManifest):
self.path("msvcr120.dll")
# <FS:Ansariel> FIRE-22709: Local voice not working in OpenSim
if self.fs_flavor() == 'oss':
if self.fs_is_opensim():
with self.prefix(src=os.path.join(relpkgdir, 'voice_os'), dst="voice_os"):
self.path("libsndfile-1.dll")
self.path("ortp.dll")
@ -1738,7 +1738,7 @@ class DarwinManifest(ViewerManifest):
# - Ambroff 2008-08-20
#<FS:TS> Select proper directory based on flavor and build type
dmg_template_prefix = 'firestorm'
if self.fs_flavor() == 'oss':
if self.fs_is_opensim():
dmg_template_prefix = 'firestormos'
dmg_template = os.path.join(
'installers', 'darwin', '%s-%s-dmg' % (dmg_template_prefix, self.channel_type()))