From cc99cd65cf0355f201157d8f71743899af6f2ade Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Thu, 13 Sep 2018 16:23:45 -0400
Subject: [PATCH] DRTVWR-474: Copy updater and its icons into Mac app's
Resources.
---
indra/newview/viewer_manifest.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6540aa9f6b5..32ff7f6ea88 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -470,7 +470,7 @@ def test_for_no_msvcrt_manifest_and_copy_action(self, src, dst):
pass
except NoMatchingAssemblyException as err:
pass
-
+
self.ccopy(src,dst)
else:
raise Exception("Directories are not supported by test_CRT_and_copy_action()")
@@ -916,6 +916,15 @@ def construct(self):
with self.prefix(src=self.icon_path(), dst="") :
self.path("secondlife.icns")
+ # Copy in the updater script and helper modules
+ self.path(src=os.path.join(pkgdir, 'VMP'), dst="updater")
+
+ with self.prefix(src="", dst=os.path.join("updater", "icons")):
+ self.path2basename(os.path.join(self.icon_path(), "secondlife.ico"))
+ with self.prefix(src="vmp_icons", dst=""):
+ self.path("*.png")
+ self.path("*.gif")
+
with self.prefix(src=relpkgdir, dst=""):
self.path("libndofdev.dylib")
self.path("libhunspell-1.3.0.dylib")
--
GitLab