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

MAINT-6998 [Project Alex Ivy] 64bit viewer installs to Program Files (x86) by default. (Update: call to select registry needs to be inside a function)

meow-7.2.2
Callum Prentice 2017-03-11 18:01:43 -08:00
parent 1053c5ca40
commit 656457e79b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/installers/windows/installer_template.nsi
View File

@ -91,7 +91,6 @@ SetOverwrite on # Overwrite files by default
AutoCloseWindow true # After all files install, close window
InstallDir "%%$PROGRAMFILES%%\${INSTNAME}"
%%REGISTRY%%
InstallDirRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" ""
UninstallText $(UninstallTextMsg)
DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)
@ -137,6 +136,7 @@ FunctionEnd
;; entry to the language ID selector below
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
Function .onInit
%%ENGAGEREGISTRY%%
Call CheckCPUFlags # Make sure we have SSE2 support
Call CheckWindowsVersion # Don't install On unsupported systems
Push $0

6
indra/newview/viewer_manifest.py
View File

@ -632,10 +632,10 @@ class WindowsManifest(ViewerManifest):
"""
if(self.args['arch'].lower() == 'x86_64'):
registry="SetRegView 64"
engage_registry="SetRegView 64"
program_files="$PROGRAMFILES64"
else:
registry="SetRegView 32"
engage_registry="SetRegView 32"
program_files="$PROGRAMFILES32"
tempfile = "secondlife_setup_tmp.nsi"
@ -647,7 +647,7 @@ class WindowsManifest(ViewerManifest):
"%%INST_VARS%%":inst_vars_template % substitution_strings,
"%%INSTALL_FILES%%":self.nsi_file_commands(True),
"%%$PROGRAMFILES%%":program_files,
"%%REGISTRY%%":registry,
"%%ENGAGEREGISTRY%%":engage_registry,
"%%DELETE_FILES%%":self.nsi_file_commands(False)})
# We use the Unicode version of NSIS, available from