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/installers/windows/installer_template.nsi
+26 -26
View File
@@ -87,10 +87,10 @@ Name ${INSTNAME}
;SubCaption 0 $(LicenseSubTitleSetup) # Override "license agreement" text
# <FS:Ansariel> FIRE-24335: Use different icon for OpenSim version
#!define MUI_ICON "%%SOURCE%%\installers\windows\puma_icon_os.ico"
#!define MUI_UNICON "%%SOURCE%%\installers\windows\puma_icon_os.ico"
!define MUI_ICON "%%SOURCE%%\installers\windows\puma_icon${ICON_SUFFIX}.ico"
!define MUI_UNICON "%%SOURCE%%\installers\windows\puma_icon${ICON_SUFFIX}.ico"
#!define MUI_ICON "%%SOURCE%%\installers\windows\firestorm_icon_os.ico"
#!define MUI_UNICON "%%SOURCE%%\installers\windows\firestorm_icon_os.ico"
!define MUI_ICON "%%SOURCE%%\installers\windows\firestorm_icon${ICON_SUFFIX}.ico"
!define MUI_UNICON "%%SOURCE%%\installers\windows\firestorm_icon${ICON_SUFFIX}.ico"
# </FS:Ansariel>
BrandingText " " # Bottom of window text
@@ -105,7 +105,7 @@ SetOverwrite on # Overwrite files by default
#AutoCloseWindow true # After all files install, close window
# Registry key paths, ours and Microsoft's
!define LINDEN_KEY "SOFTWARE\Avatares Argentinos"
!define LINDEN_KEY "SOFTWARE\The Phoenix Firestorm Project"
!define INSTNAME_KEY "${LINDEN_KEY}\${INSTNAME}"
!define MSCURRVER_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion"
!define MSNTCURRVER_KEY "SOFTWARE\Microsoft\Windows NT\CurrentVersion"
@@ -538,7 +538,7 @@ CreateShortCut "$SMPROGRAMS\$INSTSHORTCUT\$INSTSHORTCUT.lnk" \
WriteINIStr "$SMPROGRAMS\$INSTSHORTCUT\SL Create Account.url" \
"InternetShortcut" "URL" \
"https://www.ayudavirtual.org/unirseasl/"
"https://www.firestormviewer.org/join-secondlife/"
WriteINIStr "$SMPROGRAMS\$INSTSHORTCUT\SL Your Account.url" \
"InternetShortcut" "URL" \
"https://www.secondlife.com/account/"
@@ -580,10 +580,10 @@ WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "" "$INSTDIR"
WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Version" "${VERSION_LONG}"
WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Shortcut" "$INSTSHORTCUT"
WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Exe" "$VIEWER_EXE"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "Publisher" "Avatares Argentinos"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLInfoAbout" "https://avataresargentinos.com.ar"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLUpdateInfo" "https://avataresargentinos.com.ar/descargas"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "HelpLink" "https://avataresargentinos.com.ar/soporte"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "Publisher" "The Phoenix Firestorm Project, Inc."
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLInfoAbout" "https://www.firestormviewer.org"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLUpdateInfo" "https://www.firestormviewer.org/downloads"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "HelpLink" "https://www.firestormviewer.org/support"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayName" "$INSTNAME"
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "UninstallString" '"$INSTDIR\uninst.exe"'
WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayVersion" "${VERSION_LONG}"
@@ -914,28 +914,28 @@ Push $2
# Required since ProfileImagePath is of type REG_EXPAND_SZ
ExpandEnvStrings $2 $2
# Delete files in \Users\<User>\AppData\Roaming\Puma
# Delete files in \Users\<User>\AppData\Roaming\Firestorm
# Remove all settings files but leave any other .txt files to preserve the chat logs
RMDir /r "$2\AppData\Roaming\Puma\logs"
RMDir /r "$2\AppData\Roaming\Puma\browser_profile"
RMDir /r "$2\AppData\Roaming\Puma\user_settings"
Delete "$2\AppData\Roaming\Puma\*.xml"
Delete "$2\AppData\Roaming\Puma\*.bmp"
Delete "$2\AppData\Roaming\Puma\search_history.txt"
Delete "$2\AppData\Roaming\Puma\plugin_cookies.txt"
Delete "$2\AppData\Roaming\Puma\typed_locations.txt"
# Delete files in \Users\<User>\AppData\Local\Puma
RMDir /r "$2\AppData\Roaming\Firestorm\logs"
RMDir /r "$2\AppData\Roaming\Firestorm\browser_profile"
RMDir /r "$2\AppData\Roaming\Firestorm\user_settings"
Delete "$2\AppData\Roaming\Firestorm\*.xml"
Delete "$2\AppData\Roaming\Firestorm\*.bmp"
Delete "$2\AppData\Roaming\Firestorm\search_history.txt"
Delete "$2\AppData\Roaming\Firestorm\plugin_cookies.txt"
Delete "$2\AppData\Roaming\Firestorm\typed_locations.txt"
# Delete files in \Users\<User>\AppData\Local\Firestorm
${If} ${ISOPENSIM} == "0"
${If} ${IS64BIT} == "0"
RMDir /r "$2\AppData\Local\Puma" #Delete the Havok cache folder
RMDir /r "$2\AppData\Local\Firestorm" #Delete the Havok cache folder
${Else}
RMDir /r "$2\AppData\Local\Puma_x64" #Delete the OpenSim cache folder
RMDir /r "$2\AppData\Local\Firestorm_x64" #Delete the OpenSim cache folder
${EndIf}
${Else}
${If} ${IS64BIT} == "0"
RMDir /r "$2\AppData\Local\PumaOS" #Delete the Havok cache folder
RMDir /r "$2\AppData\Local\FirestormOS" #Delete the Havok cache folder
${Else}
RMDir /r "$2\AppData\Local\PumaOS_x64" #Delete the OpenSim cache folder
RMDir /r "$2\AppData\Local\FirestormOS_x64" #Delete the OpenSim cache folder
${EndIf}
${EndIf}
@@ -948,11 +948,11 @@ Pop $2
Pop $1
Pop $0
# Delete files in ProgramData\Puma
# Delete files in ProgramData\Firestorm
Push $0
ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"
StrCmp $0 "" +2
RMDir /r "$0\Puma"
RMDir /r "$0\Firestorm"
Pop $0
Keep: