Merged Nat and Palmers latest build fixes with the big...

Merged Nat and Palmers latest build fixes with the big viewer-2.0.0-3/login-api merge work (changeset 486d51877332)

indra/llcommon/CMakeLists.txt

@@ -246,6 +246,7 @@ if(LLCOMMON_LINK_SHARED)
         set_target_properties(llcommon PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${SHARED_LIB_STAGING_DIR})
     endif(SHARED_LIB_STAGING_DIR)
 
+    if(LINUX)
         get_target_property(LLCOMMON_PATH llcommon LOCATION)
         get_filename_component(LLCOMMON_FILE ${LLCOMMON_PATH} NAME)
         add_custom_command(
@@ -258,6 +259,7 @@ if(LLCOMMON_LINK_SHARED)
               ${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})

indra/newview/viewer_manifest.py

@@ -476,15 +476,26 @@ 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"
+                dylibs = {}
+
                 # need to get the kdu dll from any of the build directories as well
+                for lib in "llkdu", "llcommon":
+                    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')
-                    pass
-                except:
-                    print "Skipping libllkdu.dylib"
-                    pass
+                        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")

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>