diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-03 11:06:12 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-03 11:06:12 -0700 |
| commit | 81c5f03013ca53402abc1df31cac28d47dc8aa46 (patch) | |
| tree | 508754f2a0c73427def0e1b9951c7ffce154f7fa | |
| parent | e1253f1a8c28409834c1ddaf69b24dc02a3551ce (diff) | |
MAINT-6928: upgrade VMP package to 504920 and rip out viewer-manifest changes for 2.6
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 17 |
2 files changed, 7 insertions, 18 deletions
diff --git a/autobuild.xml b/autobuild.xml index 378fdf5619..b288d11388 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3072,9 +3072,9 @@ <key>archive</key> <map> <key>hash</key> - <string>7c1aaebbb4e34512a1489b3c67f520f2</string> + <string>de64c8bff972568900e4888cb4e23a26</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4569/13796/viewer_manager-1.0-darwin64-504558.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4931/15927/viewer_manager-1.0-darwin64-504920.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3096,9 +3096,9 @@ <key>archive</key> <map> <key>hash</key> - <string>360e630b43446b6a8dc35384aa4dbd5c</string> + <string>7c04f899e34f486d98b1e08832c6c940</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4571/13808/viewer_manager-1.0-windows-504558.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4936/15939/viewer_manager-1.0-windows-504920.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index b289db9b8f..fced30370c 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -782,7 +782,6 @@ class DarwinManifest(ViewerManifest): relpkgdir = os.path.join(pkgdir, "lib", "release") debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") - vmp266dir = os.path.join(vmpdir, "python26") llbasedir = os.path.join(pkgdir, "llbase") requestsdir = os.path.join(pkgdir, "requests") @@ -793,10 +792,8 @@ class DarwinManifest(ViewerManifest): self.path(os.path.join(relpkgdir, "libndofdev.dylib"), dst="Resources/libndofdev.dylib") self.path(os.path.join(relpkgdir, "libhunspell-1.3.0.dylib"), dst="Resources/libhunspell-1.3.0.dylib") - if self.prefix(dst="MacOS"): - #apparently the codesign tool has a problem with dir names with dots in them - """vmp266nodotdir = os.path.join(self.get_dst_prefix(), "python26")""" - #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 and MAINT-6928 + if self.prefix(dst="MacOS"): + #this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322, SL-323 self.path2basename(vmpdir,"SL_Launcher") self.path2basename(vmpdir,"*.py") llbase_path = os.path.join(self.get_dst_prefix(),'llbase') @@ -814,15 +811,7 @@ class DarwinManifest(ViewerManifest): os.makedirs(requests_path) if self.prefix(dst="requests"): self.path2basename(requestsdir,"*") - self.end_prefix() - #these supplemental files are in case the user still has 2.6 as their default python - #https://jira.secondlife.com/browse/MAINT-6928 - p266_path = os.path.join(self.get_dst_prefix(),'python26') - if not os.path.exists(p266_path): - os.makedirs(p266_path) - if self.prefix("python26"): - self.path2basename(vmp266dir,"*.py") - self.end_prefix() + self.end_prefix() self.end_prefix() # most everything goes in the Resources directory |