diff options
| author | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 09:08:48 -0700 |
|---|---|---|
| committer | Glenn Glazer <coyot@lindenlab.com> | 2017-04-11 09:08:48 -0700 |
| commit | 5a1135e364142c173a75ed0002ff336a31745019 (patch) | |
| tree | cf7988f6325d0a37bdeb55599591a8809c9afc7c | |
| parent | 6a393ada3e1d2cf0543f80dfd522436554d5bb95 (diff) | |
MAINT-6928: upgrade to VMP package 504140, use renamed directory to walk around codesign bug; fix dullahan file copy code
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/autobuild.xml b/autobuild.xml index 3b4a10fc56..04d3856103 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3072,9 +3072,9 @@ <key>archive</key> <map> <key>hash</key> - <string>a5fdf96ad417880108ec7bbdb20843ec</string> + <string>e389ce7a6732c9c9e71da4b12d5d6aa3</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4113/11555/viewer_manager-1.0-darwin64-504101.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4151/11742/viewer_manager-1.0-darwin64-504140.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3096,9 +3096,9 @@ <key>archive</key> <map> <key>hash</key> - <string>1a98826c4ac200fd1f2ad05f8e98c4cf</string> + <string>0c28cb0a9fdeecd138c33166c102c70b</string> <key>url</key> - <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4114/11561/viewer_manager-1.0-windows-504101.tar.bz2</string> + <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/4153/11755/viewer_manager-1.0-windows-504140.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 7c1db31f04..4fb40061c2 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -779,6 +779,8 @@ class DarwinManifest(ViewerManifest): debpkgdir = os.path.join(pkgdir, "lib", "debug") vmpdir = os.path.join(pkgdir, "VMP") vmp266dir = os.path.join(vmpdir, "2.6") + #apparently the codesign tool has a problem with dir names with dots in them + vmp266nodotdir = os.path.join(vmpdir, "python26") llbasedir = os.path.join(pkgdir, "llbase") requestsdir = os.path.join(pkgdir, "requests") @@ -818,6 +820,12 @@ class DarwinManifest(ViewerManifest): self.path2basename(vmp266dir,"*.py") self.end_prefix() self.end_prefix() + if os.path.exists(vmp266dir): + try: + os.rename(vmp266dir, vmp266nodotdir) + except Exception, e: + print "Failed to rename python 2.6 supplemental directory with error %s" % repr(e) + raise # most everything goes in the Resources directory if self.prefix(src="", dst="Resources"): @@ -948,8 +956,8 @@ class DarwinManifest(ViewerManifest): # Dullahan helper apps go inside SLPlugin.app if self.prefix(src="", dst="SLPlugin.app/Contents/Frameworks"): - for helperappfile in ('DullahanHelper.app'): - self.path2basename(relpkgdir, helperappfile) + helperappfile = 'DullahanHelper.app' + self.path2basename(relpkgdir, helperappfile) pluginframeworkpath = self.dst_path_of('Chromium Embedded Framework.framework'); # Putting a Frameworks directory under Contents/MacOS |