diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-03-08 12:34:11 -0800 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-03-08 12:34:11 -0800 |
| commit | c69db33ded0a860060a9702495cfcddc26008d09 (patch) | |
| tree | 160ab7cdfdbb7da4e60d68fddb5ada8c99a773f3 | |
| parent | cf8dc0d97a2a34c038d1bedc5d0fd7a1badbcd86 (diff) | |
SL-321: fix windows pathing, add icons
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 8c51719031..4fbdc52e30 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -342,17 +342,23 @@ class WindowsManifest(ViewerManifest): pkgdir = os.path.join(self.args['build'], os.pardir, 'packages') relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") + vmpdir = os.path.join(pkgdir, "VMP") if self.is_packaging_viewer(): # Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe. self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe()) # include the compiled launcher scripts so that it gets included in the file_list - self.path(src='%s/apply_update.exe' % self.args['configuration'], dst="apply_update.exe") - self.path(src='%s/download_update.exe' % self.args['configuration'], dst="download_update.exe") - self.path(src='%s/SL_Launcher.exe' % self.args['configuration'], dst="SL_Launcher.exe") - self.path(src='%s/update_manager.exe' % self.args['configuration'], dst="update_manager.exe") + self.path(src='%s/apply_update.exe' % vmpdir, dst="apply_update.exe") + self.path(src='%s/download_update.exe' % vmpdir, dst="download_update.exe") + self.path(src='%s/SL_Launcher.exe' % vmpdir, dst="SL_Launcher.exe") + self.path(src='%s/update_manager.exe' % vmpdir, dst="update_manager.exe") #IUM is not normally executed directly, just imported. No exe needed. - self.path2basename("../viewer_components/manager","InstallerUserMessage.py") + self.path2basename(vmpdir,"InstallerUserMessage.py") + #VMP Tkinter icons + if self.prefix("vmp_icons"): + self.path("*.png") + self.path("*.gif") + self.end_prefix("vmp_icons") # Plugin host application self.path2basename(os.path.join(os.pardir, |