From 1053c5ca407917c3bc842cbcb80786d43206c5b3 Mon Sep 17 00:00:00 2001
From: "callum@lindenlab.com" <callum@lindenlab.com>
Date: Sat, 11 Mar 2017 16:15:37 -0800
Subject: [PATCH] Update: (thanks Drake) MAINT-6998 [Project Alex Ivy] 64bit
viewer installs to Program Files (x86) by default. Added option to engage 32
or 64 bit registry
---
indra/newview/installers/windows/installer_template.nsi | 1 +
indra/newview/viewer_manifest.py | 3 +++
2 files changed, 4 insertions(+)
diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index 42f8e0ce1f0..7a135fa53ca 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -91,6 +91,7 @@ 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)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 1b2c5027292..7ea600f24a8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -632,8 +632,10 @@ def package_finish(self):
"""
if(self.args['arch'].lower() == 'x86_64'):
+ registry="SetRegView 64"
program_files="$PROGRAMFILES64"
else:
+ registry="SetRegView 32"
program_files="$PROGRAMFILES32"
tempfile = "secondlife_setup_tmp.nsi"
@@ -645,6 +647,7 @@ def package_finish(self):
"%%INST_VARS%%":inst_vars_template % substitution_strings,
"%%INSTALL_FILES%%":self.nsi_file_commands(True),
"%%$PROGRAMFILES%%":program_files,
+ "%%REGISTRY%%":registry,
"%%DELETE_FILES%%":self.nsi_file_commands(False)})
# We use the Unicode version of NSIS, available from
--
GitLab