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 ++++++++++++++++++++----- 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 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") diff --git a/install.xml b/install.xml index 379af00af2..df92a5d799 100644 --- a/install.xml +++ b/install.xml @@ -85,9 +85,9 @@ darwin md5sum - c4de63e9416a800155aff3f96b149a0c + 30e3b60d596801a4f4c74c56ece059dc url - http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090730.tar.bz2 + http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/apr_suite-1.3.7-darwin-20090731.tar.bz2 linux -- cgit v1.2.3 From 9ed6c4fc76ee86337499b374a401a99c1cb97b5f Mon Sep 17 00:00:00 2001 From: Palmer Truelson Date: Fri, 31 Jul 2009 11:17:00 -0700 Subject: Fix for DEV-35401 that makes the copy linux only and doesn't hurt mac build To be reviewed by Mani --- indra/llcommon/CMakeLists.txt | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/indra/llcommon/CMakeLists.txt b/indra/llcommon/CMakeLists.txt index 2ecd4ee5d4..3ac2f6f80d 100644 --- a/indra/llcommon/CMakeLists.txt +++ b/indra/llcommon/CMakeLists.txt @@ -246,18 +246,20 @@ if(LLCOMMON_LINK_SHARED) set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR}) endif(SHARED_LIB_STAGING_DIR) - get_target_property(LLCOMMON_PATH llcommon LOCATION) - get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME) - add_custom_command( - TARGET llcommon POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS - -E - copy_if_different - ${LLCOMMON_FILE} - ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE} - COMMENT "Copying llcommon to the staging folder." - ) + if(LINUX) + get_target_property(LLCOMMON_PATH llcommon LOCATION) + get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME) + add_custom_command( + TARGET llcommon POST_BUILD + COMMAND ${CMAKE_COMMAND} + ARGS + -E + copy_if_different + ${LLCOMMON_FILE} + ${SHARED_LIB_STAGING_DIR}/${CMAKE_CFG_INTDIR}/${LLCOMMON_FILE} + COMMENT "Copying llcommon to the staging folder." + ) + endif(LINUX) else(LLCOMMON_LINK_SHARED) add_library (llcommon ${llcommon_SOURCE_FILES}) -- cgit v1.2.3 From 0ac96fd8e61e402840bf2788ed4f34487f780567 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Fri, 31 Jul 2009 16:13:46 -0400 Subject: DEV-34837: fix viewer_manifest.py to continue supporting static llcommon build --- indra/newview/viewer_manifest.py | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7b8a64e3b4..c0a5ab5526 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -473,29 +473,25 @@ class DarwinManifest(ViewerManifest): 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) + dylibs = {} # 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('../%s/%s/%s' % - (lib, self.args['configuration'], libfile), - os.path.join(libdir, libfile)), - dst=libfile) - pass - except: - 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) + for lib in "llkdu", "llcommon": + libfile = "lib%s.dylib" % lib + try: + self.path(self.find_existing_file('../%s/%s/%s' % + (lib, self.args['configuration'], libfile), + os.path.join(libdir, libfile)), + dst=libfile) + except RuntimeError: + print "Skipping %s" % libfile + dylibs[lib] = False + else: + dylibs[lib] = True + + if dylibs["llcommon"]: + for libfile in ("libapr-1.0.3.7.dylib", "libaprutil-1.0.3.8.dylib"): + self.path(os.path.join(libdir, libfile), libfile) #libfmodwrapper.dylib self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib") -- cgit v1.2.3