summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-07-27 15:44:56 -0700
committerGlenn Glazer <coyot@lindenlab.com>2016-07-27 15:44:56 -0700
commitf44829f2aefe8c5fae9fba6bb838500719e1067e (patch)
tree589fe018bcede49ec004bd8862d55dff49a75ba5 /indra/newview
parent1224697a40a469bebd794c5816d6cc9c34e1000a (diff)
SL-321: basic launcher/updater integration test fixes
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/viewer_manifest.py20
1 files changed, 17 insertions, 3 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index aaad79387f..3572b7dba8 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -27,6 +27,7 @@ Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
$/LicenseInfo$
"""
import sys
+import os
import os.path
import shutil
import errno
@@ -702,6 +703,7 @@ class Darwin_i386_Manifest(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")
+ llbasedir = os.path.join(pkgdir, os.pardir)
if self.prefix(src="", dst="Contents"): # everything goes in Contents
self.path("Info.plist", dst="Info.plist")
@@ -715,8 +717,14 @@ class Darwin_i386_Manifest(ViewerManifest):
#this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323
self.path2basename("../viewer_components/manager","SL_Launcher")
self.path2basename("../viewer_components/manager","*.py")
- self.path2basename("../../../../../packages/llbase","*")
- self.end_prefix()
+ llbase_path = os.path.join(self.get_dst_prefix(),'llbase')
+ if not os.path.exists(llbase_path):
+ os.makedirs(llbase_path)
+ if self.prefix(dst="llbase"):
+ self.path2basename("../packages/llbase","*.py")
+ self.path2basename("../packages/llbase","_cllsd.so")
+ self.end_prefix()
+ self.end_prefix()
# most everything goes in the Resources directory
if self.prefix(src="", dst="Resources"):
@@ -1071,7 +1079,13 @@ class LinuxManifest(ViewerManifest):
#this copies over the python wrapper script, associated utilities and required libraries, see SL-321, SL-322 and SL-323
self.path2basename("../viewer_components/manager","SL_Launcher")
self.path2basename("../viewer_components/manager","*.py")
- self.path2basename("../packages/llbase","*")
+ llbase_path = os.path.join(self.get_dst_prefix(),'llbase')
+ if not os.path.exists(llbase_path):
+ os.makedirs(llbase_path)
+ if self.prefix(dst="llbase"):
+ self.path2basename("../packages/llbase","*.py")
+ self.path2basename("../packages/llbase","_cllsd.so")
+ self.end_prefix()
self.end_prefix("bin")
if self.prefix("res-sdl"):