diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2018-09-13 16:23:45 -0400 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2018-09-13 16:23:45 -0400 | 
| commit | cc99cd65cf0355f201157d8f71743899af6f2ade (patch) | |
| tree | 9ec01d5740853751dfecd331617884d2128055aa /indra/newview | |
| parent | 83b40329fd822277ff5b47e6f36a7897c85e6260 (diff) | |
DRTVWR-474: Copy updater and its icons into Mac app's Resources.
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 11 | 
1 files changed, 10 insertions, 1 deletions
| diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 6540aa9f6b..32ff7f6ea8 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -470,7 +470,7 @@ class WindowsManifest(ViewerManifest):                      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 @@ class DarwinManifest(ViewerManifest):                  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")    | 
