Damian/Puma_Viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Primer depuración. Limpieza archivos innecesarios, cambios de nombres y preparación para Puma.

Browse Source
This commit is contained in:
Damian
2025-05-25 22:25:31 -03:00
parent d883ddd0d0
commit a5d5fe6288
37 changed files with 287 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/viewer_manifest.py
+40 -40
View File
@@ -45,7 +45,7 @@ import time
sys.dont_write_bytecode = True # <FS:Ansariel> Prevents creating __pycache__ directory
from pm_viewer_manifest import FSViewerManifest #<FS:ND/> Manifest extensions for Firestorm
from pm_viewer_manifest import PMViewerManifest #<FS:ND/> Manifest extensions for Puma
viewer_dir = os.path.dirname(__file__)
# Add indra/lib/python to our path so we don't have to muck with PYTHONPATH.
@@ -60,7 +60,7 @@ try:
except ImportError:
from llbase import llsd
# </FS:Beq>
class ViewerManifest(LLManifest,FSViewerManifest):
class ViewerManifest(LLManifest,PMViewerManifest):
def is_packaging_viewer(self):
# Some commands, files will only be included
# if we are packaging the viewer on windows.
@@ -130,7 +130,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("beamsColors")
# <FS:Beq> package static_assets folder
if self.fs_is_opensim():
if self.pm_is_opensim():
self.path("static_assets")
self.path("fs_static_assets")
# </FS:Beq>
@@ -191,7 +191,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("*.txt")
self.path("*.xml")
# <FS:AO> Include firestorm resources
# <FS:AO> Include puma resources
with self.prefix(src_dst="pm_resources"):
self.path("*.dae") # <FS:Beq> FIRE-30963 - better physics defaults
@@ -209,7 +209,7 @@ class ViewerManifest(LLManifest,FSViewerManifest):
self.path("*/*.png")
self.path("*.tga")
self.path("*.j2c")
self.path("*.jpg") # <FS:Ansariel> Needed for Firestorm
self.path("*.jpg") # <FS:Ansariel> Needed for Puma
self.path("*.png")
self.path("textures.xml")
self.path("*/xui/*/*.xml")
@@ -322,9 +322,9 @@ class ViewerManifest(LLManifest,FSViewerManifest):
global CHANNEL_VENDOR_BASE
# 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_is_opensim():
channel_base = channel_base + "OS"
channel_base = "Puma-" + CHANNEL_VENDOR_BASE
# if self.pm_is_opensim():
# channel_base = channel_base + ""
#</FS:TS>
substitution_strings = {
'channel_vendor_base' : '_'.join(channel_base.split()),
@@ -345,8 +345,8 @@ class ViewerManifest(LLManifest,FSViewerManifest):
app_suffix=self.channel_variant()
#<FS:ND> tag "OS" after CHANNEL_VENDOR_BASE and before any suffix
if self.fs_is_opensim():
app_suffix = "OS" + app_suffix
# if self.pm_is_opensim():
# app_suffix = "" + app_suffix
#</FS:ND>
#<FS:ND> Don't separate name by whitespace. This break a lot of things in the old FS installer logic.
@@ -374,8 +374,8 @@ class ViewerManifest(LLManifest,FSViewerManifest):
if chan in ['alpha', 'nightly','manual', 'profiling']:
chan = 'test'
if self.fs_is_opensim():
return "icons/" + chan + "-os"
# if self.pm_is_opensim():
# return "icons/" + chan + "-os"
# </FS:ND>
return "icons/" + chan
@@ -616,7 +616,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
debpkgdir = os.path.join(pkgdir, "lib", "debug")
if self.is_packaging_viewer():
# Find firestorm-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
# Find puma-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
self.path(src='%s/puma-bin.exe' % self.args['configuration'], dst=self.final_exe())
# Emit the whole app image as one of the GitHub step outputs. We
# want the whole app -- but NOT the extraneous build products that
@@ -855,7 +855,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
if not self.is_packaging_viewer():
self.package_file = "copied_deps"
self.fs_copy_windows_manifest( )
self.pm_copy_windows_manifest( )
def nsi_file_commands(self, install=True):
# <FS:Ansariel> Undo Github-Build stuff - I don't think we need this
@@ -943,17 +943,17 @@ class Windows_x86_64_Manifest(ViewerManifest):
# </FS:Ansariel>
def dl_url_from_channel(self):
if self.channel_type() == 'release':
return 'https://www.firestormviewer.org/choose-your-platform'
return 'https://wiki.avataresargentinos.com.ar/descargas'
elif self.channel_type() == 'beta':
return 'https://www.firestormviewer.org/early-access-beta-downloads'
return 'https://wiki.avataresargentinos.com.ar/descargas'
elif self.channel_type() == 'alpha':
return 'https://www.firestormviewer.org/early-access-alpha-downloads'
return 'https://wiki.avataresargentinos.com.ar/descargas'
elif self.channel_type() == 'manual':
return 'https://www.firestormviewer.org/early-access-manual-downloads'
return 'https://wiki.avataresargentinos.com.ar/descargas'
elif self.channel_type() == 'profiling':
return 'https://www.firestormviewer.org/profiling-downloads'
return 'https://wiki.avataresargentinos.com.ar/descargas'
elif self.channel_type() == 'nightly':
return 'https://www.firestormviewer.org/firestorm-nightly-build-downloads'
return 'https://wiki.avataresargentinos.com.ar/descargas'
else:
return '<NO-URL>'
@@ -972,19 +972,19 @@ class Windows_x86_64_Manifest(ViewerManifest):
'dl_url':self.dl_url_from_channel()
}
substitution_strings = self.fs_splice_grid_substitution_strings( substitution_strings ) #<FS:ND/> Add grid args
substitution_strings = self.pm_splice_grid_substitution_strings( substitution_strings ) #<FS:ND/> Add grid args
# <FS:ND> Properly name OS version, also add Phoenix- in front of installer name
#installer_file = self.installer_base_name() + '_Setup.exe'
installer_file = self.fs_installer_basename() + "_Setup.exe"
installer_file = self.pm_installer_basename() + "_Setup.exe"
# </FS:ND>
substitution_strings['installer_file'] = installer_file
substitution_strings['is64bit'] = (1 if (self.address_size == 64) else 0)
substitution_strings['isavx2'] = (1 if (self.fs_is_avx2()) else 0)
substitution_strings['is_opensim'] = self.fs_is_opensim() # <FS:Ansariel> FIRE-30446: Register hop-protocol for OS version only
substitution_strings['isavx2'] = (1 if (self.pm_is_avx2()) else 0)
substitution_strings['is_opensim'] = self.pm_is_opensim() # <FS:Ansariel> FIRE-30446: Register hop-protocol for OS version only
substitution_strings['friendly_app_name'] = self.friendly_app_name() # <FS:Ansariel> FIRE-30446: Set FriendlyAppName for protocol registrations
substitution_strings['icon_suffix'] = ("_os" if (self.fs_is_opensim()) else "") # <FS:Ansariel> FIRE-24335: Use different icon for OpenSim version
substitution_strings['icon_suffix'] = ("_os" if (self.pm_is_opensim()) else "") # <FS:Ansariel> FIRE-24335: Use different icon for OpenSim version
version_vars = """
!define INSTEXE "SLVersionChecker.exe"
@@ -1029,7 +1029,7 @@ class Windows_x86_64_Manifest(ViewerManifest):
tempfile = "puma_setup_tmp.nsi"
self.fs_sign_win_binaries() # <FS:ND/> Sign files, step one. Sign compiled binaries
self.pm_sign_win_binaries() # <FS:ND/> Sign files, step one. Sign compiled binaries
# the following replaces strings in the nsi template
# it also does python-style % substitution
@@ -1059,8 +1059,8 @@ class Windows_x86_64_Manifest(ViewerManifest):
self.run_command([possible_path, '/V2', self.dst_path_of(tempfile)])
self.fs_sign_win_installer(substitution_strings) # <FS:ND/> Sign files, step two. Sign installer.
self.fs_save_windows_symbols()
self.pm_sign_win_installer(substitution_strings) # <FS:ND/> Sign files, step two. Sign installer.
self.pm_save_windows_symbols()
self.created_path(self.dst_path_of(installer_file))
self.package_file = installer_file
@@ -1814,7 +1814,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
# <FS:ND> Make sure all our package names look similar
#imagename = self.installer_base_name()
imagename = self.fs_installer_basename()
imagename = self.pm_installer_basename()
# </FS:ND>
sparsename = imagename + ".sparseimage"
@@ -1850,8 +1850,8 @@ class Darwin_x86_64_Manifest(ViewerManifest):
# - Ambroff 2008-08-20
#<FS:TS> Select proper directory based on flavor and build type
dmg_template_prefix = 'puma'
if self.fs_is_opensim():
dmg_template_prefix = 'pumaos'
if self.pm_is_opensim():
dmg_template_prefix = 'puma'
dmg_template = os.path.join(
'installers', 'darwin', '%s-%s-dmg' % (dmg_template_prefix, self.channel_type()))
print ("Trying template directory", dmg_template)
@@ -1970,7 +1970,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
plain_sign += glob.glob( app_in_dmg + "/Contents/Frameworks/Chromium Embedded Framework.framework/Libraries/*.dylib" )
deep_sign = [
# <FS:ND> Firestorm does not ship SLVersionChecker
# <FS:ND> Puma does not ship SLVersionChecker
#resources + "updater/SLVersionChecker",
resources + "SLPlugin.app/Contents/MacOS/SLPlugin",
resources + "SLVoice",
@@ -2032,7 +2032,7 @@ class Darwin_x86_64_Manifest(ViewerManifest):
# get rid of the temp file
self.package_file = finalname
self.remove(sparsename)
self.fs_save_osx_symbols()
self.pm_save_osx_symbols()
class LinuxManifest(ViewerManifest):
@@ -2209,7 +2209,7 @@ class LinuxManifest(ViewerManifest):
#self.path("libexpat.so*")
#self.path("libssl.so*")
#self.path("libGLOD.so")
#self.fs_path("libminizip.so")
#self.pm_path("libminizip.so")
self.path("libuuid.so*")
self.path("libSDL*.so*")
self.path_optional("libdirectfb*.so*")
@@ -2271,12 +2271,12 @@ class LinuxManifest(ViewerManifest):
# a standard map of strings for replacing in the templates
#installer_name = self.installer_base_name()
installer_name = self.fs_installer_basename()
installer_name = self.pm_installer_basename()
self.fs_save_breakpad_symbols("linux")
self.fs_delete_linux_symbols() # <FS:ND/> Delete old syms
self.pm_save_breakpad_symbols("linux")
self.pm_delete_linux_symbols() # <FS:ND/> Delete old syms
self.strip_binaries()
self.fs_save_linux_symbols() # <FS:ND/> Package symbols, add debug link
self.pm_save_linux_symbols() # <FS:ND/> Package symbols, add debug link
# Fix access permissions
self.run_command(['find', self.get_dst_prefix(),
@@ -2298,7 +2298,7 @@ class LinuxManifest(ViewerManifest):
# --numeric-owner hides the username of the builder for
# security etc.
self.run_command(['tar', '-C', self.get_build_prefix(),
'--numeric-owner', self.fs_linux_tar_excludes(), '-caf',
'--numeric-owner', self.pm_linux_tar_excludes(), '-caf',
tempname + '.tar.xz', installer_name])
else:
print("Skipping %s.tar.xz for non-Release build (%s)" % \
@@ -2396,7 +2396,7 @@ class Linux_i686_Manifest(LinuxManifest):
#self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
self.path("libvivoxsdk.so")
self.fs_delete_linux_symbols() # <FS:ND/> Delete old syms
self.pm_delete_linux_symbols() # <FS:ND/> Delete old syms
self.strip_binaries()