From 04404b68b56638171bc200f9a22a660257370d5d Mon Sep 17 00:00:00 2001
From: Monty Brandenberg <monty@lindenlab.com>
Date: Mon, 14 Apr 2014 17:59:00 -0400
Subject: All/Mac:  Update libraries to new template builds.  Package for
 static libz/libpng/openssl. Update library dependencies to reference builds
 using new templates and modern build hosts for:  SDL, c-ares, boost, curl,
 libpng, llqtwebkit2, openssl and zlib.  Update manifest, library copying and
 'test_apps' setup to reflect that zlib and openssl are now always static (on
 Mac and Linux).  Viewer and test_apps now functional on 10.7 Mac.

---
 indra/cmake/Copy3rdPartyLibs.cmake             | 11 -----------
 indra/test_apps/llfbconnecttest/CMakeLists.txt |  3 ---
 indra/test_apps/llfbconnecttest/README.Linden  | 20 ++++++++++++++++++++
 indra/test_apps/llplugintest/CMakeLists.txt    |  3 ---
 indra/test_apps/llplugintest/README.Linden     | 21 +++++++++++++++++++++
 5 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 indra/test_apps/llfbconnecttest/README.Linden
 create mode 100644 indra/test_apps/llplugintest/README.Linden

(limited to 'indra')

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 5dfa6ea4fb..068f1e9af7 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -206,10 +206,6 @@ elseif(DARWIN)
        )
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
     set(debug_files
-        libcrypto.dylib
-        libcrypto.1.0.0.dylib
-        libssl.dylib
-        libssl.1.0.0.dylib
        )
     set(release_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(release_files
@@ -218,8 +214,6 @@ elseif(DARWIN)
         libaprutil-1.0.dylib
         libaprutil-1.dylib
         libcollada14dom.dylib
-        libcrypto.dylib
-        libcrypto.1.0.0.dylib
         libexception_handler.dylib
         libexpat.1.5.2.dylib
         libexpat.dylib
@@ -227,8 +221,6 @@ elseif(DARWIN)
         libhunspell-1.3.0.dylib
         libminizip.a
         libndofdev.dylib
-        libssl.dylib
-        libssl.1.0.0.dylib
        )
 
     if (FMODEX)
@@ -275,7 +267,6 @@ elseif(LINUX)
         libboost_system-mt.so.${BOOST_VERSION}.0
         libboost_thread-mt.so.${BOOST_VERSION}.0
         libcollada14dom.so
-        libcrypto.so.1.0.0
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
@@ -291,10 +282,8 @@ elseif(LINUX)
         libminizip.so
         libopenal.so
         libopenjpeg.so
-        libssl.so
         libuuid.so.16
         libuuid.so.16.0.22
-        libssl.so.1.0.0
         libfontconfig.so.1.8.0
        )
 
diff --git a/indra/test_apps/llfbconnecttest/CMakeLists.txt b/indra/test_apps/llfbconnecttest/CMakeLists.txt
index 800f3f6f56..e598124924 100644
--- a/indra/test_apps/llfbconnecttest/CMakeLists.txt
+++ b/indra/test_apps/llfbconnecttest/CMakeLists.txt
@@ -300,9 +300,6 @@ if (DARWIN)
     libaprutil-1.0.dylib
     libapr-1.0.dylib
     libexpat.1.5.2.dylib
-    libz.1.dylib
-    libssl.1.0.0.dylib
-    libcrypto.1.0.0.dylib
     libQtCore.4.7.1.dylib
     libQtCore.4.dylib
     libQtGui.4.7.1.dylib
diff --git a/indra/test_apps/llfbconnecttest/README.Linden b/indra/test_apps/llfbconnecttest/README.Linden
new file mode 100644
index 0000000000..7488ce680a
--- /dev/null
+++ b/indra/test_apps/llfbconnecttest/README.Linden
@@ -0,0 +1,20 @@
+
+1.  Description
+
+    Exercises SLPlugin.  Specific functions and goals aren't clear
+    from the source.
+
+2.  Running
+
+  2.1  Mac
+
+    Make certain '.' is included in PATH.  E.g.:
+
+       PATH=.:"$PATH" open build-darwin-i386/test_apps/llfbconnecttest/RelWithDebInfo/llfbconnecttest.app
+
+    Otherwise the program won't find SLPlugin and will timeout and
+    fail after 30 seconds and give you little information as to why.
+
+    Running 'dtruss' on plugin test applications will give you a great
+    deal of insight into why they aren't activating.
+
diff --git a/indra/test_apps/llplugintest/CMakeLists.txt b/indra/test_apps/llplugintest/CMakeLists.txt
index 60ac806740..9d9f9a6a2b 100755
--- a/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/indra/test_apps/llplugintest/CMakeLists.txt
@@ -545,9 +545,6 @@ if (DARWIN)
     libaprutil-1.0.dylib
     libapr-1.0.dylib
     libexpat.1.5.2.dylib
-    libz.1.dylib
-    libssl.1.0.0.dylib
-    libcrypto.1.0.0.dylib
     libQtCore.4.7.1.dylib
     libQtCore.4.dylib
     libQtGui.4.7.1.dylib
diff --git a/indra/test_apps/llplugintest/README.Linden b/indra/test_apps/llplugintest/README.Linden
new file mode 100644
index 0000000000..4a9f223c21
--- /dev/null
+++ b/indra/test_apps/llplugintest/README.Linden
@@ -0,0 +1,21 @@
+
+1.  Description
+
+    Exercises SLPlugin.  Demonstrates mediakit plugin reuse and
+    switchover as MIME type changes (web, quicktime, flash).
+
+
+2.  Running
+
+  2.1  Mac
+
+    Make certain '.' is included in PATH.  E.g.:
+
+       PATH=.:"$PATH" open build-darwin-i386/test_apps/llmediaplugintest/RelWithDebInfo/llmediaplugintest.app
+
+    Otherwise the program won't find SLPlugin and will timeout and
+    fail after 30 seconds and give you little information as to why.
+
+    Running 'dtruss' on plugin test applications will give you a great
+    deal of insight into why they aren't activating.
+
-- 
cgit v1.2.3