From 084983485f9e05ff9164fabe3244ffd6f33295cf Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 31 Jul 2009 13:26:24 -0400
Subject: [PATCH] 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 ++++++++++++++++++++-----
install.xml | 4 ++--
2 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f35c6f449e7..7b8a64e3b46 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -472,16 +472,31 @@ def construct(self):
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")
diff --git a/install.xml b/install.xml
index 379af00af20..df92a5d799e 100644
--- a/install.xml
+++ b/install.xml
@@ -85,9 +85,9 @@
<key>darwin</key>
<map>
<key>md5sum</key>
- <string>c4de63e9416a800155aff3f96b149a0c</string>
+ <string>30e3b60d596801a4f4c74c56ece059dc</string>
<key>url</key>
- <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090730.tar.bz2</uri>
+ <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090731.tar.bz2</uri>
</map>
<key>linux</key>
<map>
--
GitLab