All: Committing to llqtwebkit2 and the future. Updating all libraries.

Updating SDL to 290561, c-ares to 290399, Boost to 290566, colladadom
to 290576, curl to 290567, fontconfig to 290569, freetype to 290557,
google-mock to 290574, libpng to 290558, libxml2 to 290562, llqtwebkit
to 290578, openssl to 290560, PCRE to 290406, zlib to 290556.  Document
compiling and linking in new 00-COMPILE-LINK-RUN.txt in indra/cmake.  It
is the README for the building process based on things learned during
this library project.  Switch building process back to style used for
new llqtwebkit2 repo.  This builds shared libraries for Qt4 products
on all platforms using current build machines and TC task templates.
All platforms are building.  All have comparable FPS rates.  Builds are
getting quieter.  Forward, comrades!

1 files changed, 61 insertions, 15 deletions

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6729cd617a..2c173d9aaa 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -795,15 +795,42 @@ class Darwin_i386_Manifest(ViewerManifest):
                     for libfile in dylibs:
                         symlinkf(os.path.join(os.pardir, os.pardir, os.pardir, libfile),
                                  os.path.join(resource_path, libfile))
-
-                # plugins
+                # SLPlugin.app/Contents/Resources gets those Qt4 libraries it needs.
+                if self.prefix(src="", dst="SLPlugin.app/Contents/Resources"):
+                    for libfile in ('libQtCore.4.dylib',
+                                    'libQtCore.4.7.1.dylib',
+                                    'libQtGui.4.dylib',
+                                    'libQtGui.4.7.1.dylib',
+                                    'libQtNetwork.4.dylib',
+                                    'libQtNetwork.4.7.1.dylib',
+                                    'libQtOpenGL.4.dylib',
+                                    'libQtOpenGL.4.7.1.dylib',
+                                    'libQtSvg.4.dylib',
+                                    'libQtSvg.4.7.1.dylib',
+                                    'libQtWebKit.4.dylib',
+                                    'libQtWebKit.4.7.1.dylib',
+                                    'libQtXml.4.dylib',
+                                    'libQtXml.4.7.1.dylib'):
+                        self.path2basename("../packages/lib/release", libfile)
+                    self.end_prefix("SLPlugin.app/Contents/Resources")
+
+                # Qt4 codecs go to llplugin.  Not certain why but this is the first
+                # location probed according to dtruss so we'll go with that.
+                if self.prefix(src="../packages/plugins/codecs/", dst="llplugin/codecs"):
+                    self.path("libq*.dylib")
+                    self.end_prefix("llplugin/codecs")
+
+                # Similarly for imageformats.
+                if self.prefix(src="../packages/plugins/imageformats/", dst="llplugin/imageformats"):
+                    self.path("libq*.dylib")
+                    self.end_prefix("llplugin/imageformats")
+
+                # SLPlugin plugins proper
                 if self.prefix(src="", dst="llplugin"):
                     self.path2basename("../media_plugins/quicktime/" + self.args['configuration'],
                                        "media_plugin_quicktime.dylib")
                     self.path2basename("../media_plugins/webkit/" + self.args['configuration'],
                                        "media_plugin_webkit.dylib")
-                    self.path2basename("../packages/lib/release", "libllqtwebkit.dylib")
-
                     self.end_prefix("llplugin")
 
                 self.end_prefix("Resources")
@@ -1074,20 +1101,9 @@ class Linux_i686_Manifest(LinuxManifest):
             self.path("libaprutil-1.so")
             self.path("libaprutil-1.so.0")
             self.path("libaprutil-1.so.0.4.1")
-            self.path("libboost_context-mt.so.*")
-            self.path("libboost_filesystem-mt.so.*")
-            self.path("libboost_program_options-mt.so.*")
-            self.path("libboost_regex-mt.so.*")
-            self.path("libboost_signals-mt.so.*")
-            self.path("libboost_system-mt.so.*")
-            self.path("libboost_thread-mt.so.*")
-            self.path("libcollada14dom.so")
             self.path("libdb*.so")
-            self.path("libcrypto.so.*")
             self.path("libexpat.so.*")
-            self.path("libssl.so.1.0.0")
             self.path("libGLOD.so")
-            self.path("libminizip.so")
             self.path("libuuid.so*")
             self.path("libSDL-1.2.so.*")
             self.path("libdirectfb-1.*.so.*")
@@ -1119,7 +1135,10 @@ class Linux_i686_Manifest(LinuxManifest):
             # previous call did, without having to explicitly state the
             # version number.
             self.path("libfontconfig.so.*.*")
+
+            # Include libfreetype.so. but have it work as libfontconfig does.
             self.path("libfreetype.so.*.*")
+
             try:
                 self.path("libtcmalloc.so*") #formerly called google perf tools
                 pass
@@ -1149,6 +1168,33 @@ class Linux_i686_Manifest(LinuxManifest):
                 self.path("libvivoxplatform.so")
                 self.end_prefix("lib")
 
+            # plugin runtime
+            if self.prefix(src="../packages/lib/release", dst="lib"):
+                self.path("libQtCore.so*")
+                self.path("libQtGui.so*")
+                self.path("libQtNetwork.so*")
+                self.path("libQtOpenGL.so*")
+                self.path("libQtWebKit.so*")
+                self.end_prefix("lib")
+
+            # For WebKit/Qt plugin runtimes (image format plugins)
+            if self.prefix(src="../packages/plugins/imageformats", dst="bin/llplugin/imageformats"):
+                self.path("libqgif.so")
+                self.path("libqico.so")
+                self.path("libqjpeg.so")
+                self.path("libqmng.so")
+                self.path("libqsvg.so")
+                self.path("libqtiff.so")
+                self.end_prefix("bin/llplugin/imageformats")
+
+            # For WebKit/Qt plugin runtimes (codec/character encoding plugins)
+            if self.prefix(src="../packages/plugins/codecs", dst="bin/llplugin/codecs"):
+                self.path("libqcncodecs.so")
+                self.path("libqjpcodecs.so")
+                self.path("libqkrcodecs.so")
+                self.path("libqtwcodecs.so")
+                self.end_prefix("bin/llplugin/codecs")
+
             self.strip_binaries()