From 084983485f9e05ff9164fabe3244ffd6f33295cf Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 31 Jul 2009 13:26:24 -0400 Subject: DEV-34837: update Mac apr_suite package so that each of the .dylib files self-identifies as @executable_path/../Resources/filename. This allows the SL executable to find it at runtime in its official place in the app bundle. Change viewer_manifest.py to copy libllcommon.dylib, libapr*.dylib to app bundle's Resources subdir. --- indra/newview/viewer_manifest.py | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'indra') diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f35c6f449e..7b8a64e3b4 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -472,16 +472,31 @@ class DarwinManifest(ViewerManifest): self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") + libdir = "../../libraries/universal-darwin/lib_release" + + for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"): + self.path(os.path.join(libdir, libfile), libfile) + # need to get the kdu dll from any of the build directories as well + lib = "llkdu" + libfile = "lib%s.dylib" % lib try: - self.path(self.find_existing_file('../llkdu/%s/libllkdu.dylib' % self.args['configuration'], - "../../libraries/universal-darwin/lib_release/libllkdu.dylib"), - dst='libllkdu.dylib') + self.path(self.find_existing_file('../%s/%s/%s' % + (lib, self.args['configuration'], libfile), + os.path.join(libdir, libfile)), + dst=libfile) pass except: - print "Skipping libllkdu.dylib" + print "Skipping %s" % libfile pass - + + lib = "llcommon" + libfile = "lib%s.dylib" % lib + self.path(self.find_existing_file('../%s/%s/%s' % + (lib, self.args['configuration'], libfile), + os.path.join(libdir, libfile)), + dst=libfile) + #libfmodwrapper.dylib self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") -- cgit v1.2.3