Eliminado el soporte de discord.
Corrección de nombres y typos. Eliminación de código innecesario. Depuración archivos de idiomas.
This commit is contained in:
@@ -132,7 +132,7 @@ class ViewerManifest(LLManifest,PMViewerManifest):
|
||||
# <FS:Beq> package static_assets folder
|
||||
if self.pm_is_opensim():
|
||||
self.path("static_assets")
|
||||
self.path("fs_static_assets")
|
||||
self.path("pm_static_assets")
|
||||
# </FS:Beq>
|
||||
|
||||
# include the extracted packages information (see BuildPackagesInfo.cmake)
|
||||
@@ -293,12 +293,8 @@ class ViewerManifest(LLManifest,PMViewerManifest):
|
||||
# channel_type='test'
|
||||
elif channel_qualifier.startswith('nightly'):
|
||||
channel_type='nightly'
|
||||
elif channel_qualifier.startswith('manual'):
|
||||
channel_type='manual'
|
||||
elif channel_qualifier.startswith('profiling'):
|
||||
channel_type='profiling'
|
||||
else:
|
||||
channel_type='private'
|
||||
channel_type='alpha'
|
||||
return channel_type
|
||||
|
||||
def channel_variant_app_suffix(self):
|
||||
@@ -339,10 +335,10 @@ class ViewerManifest(LLManifest,PMViewerManifest):
|
||||
channel_type=self.channel_type()
|
||||
#<FS:TS> LL uses "Viewer" in the name of their release package. We use "Release".
|
||||
#if channel_type == 'release':
|
||||
# app_suffix='Viewer'
|
||||
app_suffix='Viewer'
|
||||
#else:
|
||||
# app_suffix=self.channel_variant()
|
||||
app_suffix=self.channel_variant()
|
||||
#app_suffix=self.channel_variant()
|
||||
|
||||
#<FS:ND> tag "OS" after CHANNEL_VENDOR_BASE and before any suffix
|
||||
# if self.pm_is_opensim():
|
||||
@@ -377,7 +373,8 @@ class ViewerManifest(LLManifest,PMViewerManifest):
|
||||
# if self.pm_is_opensim():
|
||||
# return "icons/" + chan + "-os"
|
||||
# </FS:ND>
|
||||
return "icons/" + chan
|
||||
#return "icons/" + chan
|
||||
return "icons/"
|
||||
|
||||
def extract_names(self,src):
|
||||
"""Extract contributor names from source file, returns string"""
|
||||
@@ -2299,7 +2296,7 @@ class LinuxManifest(ViewerManifest):
|
||||
# security etc.
|
||||
self.run_command(['tar', '-C', self.get_build_prefix(),
|
||||
'--numeric-owner', self.pm_linux_tar_excludes(), '-caf',
|
||||
tempname + '.tar.xz', installer_name])
|
||||
tempname + '.tar.gz', installer_name])
|
||||
else:
|
||||
print("Skipping %s.tar.xz for non-Release build (%s)" % \
|
||||
(installer_name, self.args['buildtype']))
|
||||
|
||||
Reference in New Issue
Block a user