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

SL-9952: updater.exe now renamed to SLVersionChecker.exe 

thereby avoiding strange Windows requirement for elevated privilege.
master
Nat Goodspeed 2018-11-07 15:57:20 -08:00
parent 6c51d3ba74
commit cb5c5bb6ee
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llappviewer.cpp
View File

@ -1140,13 +1140,13 @@ bool LLAppViewer::init()
// viewer itself.
updater.autokill = false;
#if LL_WINDOWS
updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater.exe");
updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "SLVersionChecker.exe");
#elif LL_DARWIN
// explicitly run the system Python interpreter on updater.py
// explicitly run the system Python interpreter on SLVersionChecker.py
updater.executable = "python";
updater.args.add(gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", "updater.py"));
updater.args.add(gDirUtilp->add(gDirUtilp->getAppRODataDir(), "updater", "SLVersionChecker.py"));
#else
updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "updater");
updater.executable = gDirUtilp->getExpandedFilename(LL_PATH_EXECUTABLE, "SLVersionChecker");
#endif
// add LEAP mode command-line argument to whichever of these we selected
updater.args.add("leap");

10
indra/newview/viewer_manifest.py
View File

@ -497,9 +497,7 @@ class WindowsManifest(ViewerManifest):
with self.prefix(src=os.path.join(pkgdir, "VMP")):
# include the compiled launcher scripts so that it gets included in the file_list
self.path('updater.exe')
#IUM is not normally executed directly, just imported. No exe needed.
self.path("InstallerUserMessage.py")
self.path('SLVersionChecker.exe')
with self.prefix(dst="vmp_icons"):
with self.prefix(src=self.icon_path()):
@ -713,7 +711,7 @@ class WindowsManifest(ViewerManifest):
self.path("libvlccore.dll")
self.path("plugins/")
# pull in the crash logger and updater from other projects
# pull in the crash logger from other projects
# tag:"crash-logger" here as a cue to the exporter
self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'],
dst="win_crash_logger.exe")
@ -783,7 +781,7 @@ class WindowsManifest(ViewerManifest):
substitution_strings['installer_file'] = installer_file
version_vars = """
!define INSTEXE "updater.exe"
!define INSTEXE "SLVersionChecker.exe"
!define VERSION "%(version_short)s"
!define VERSION_LONG "%(version)s"
!define VERSION_DASHES "%(version_dashes)s"
@ -828,7 +826,7 @@ class WindowsManifest(ViewerManifest):
# Unlike the viewer binary, the VMP filenames are invariant with respect to version, os, etc.
for exe in (
self.final_exe(),
"updater.exe",
"SLVersionChecker.exe",
):
self.sign(exe)