From f670360d45d10c12f8146c2041efa438f69146d7 Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Fri, 15 Oct 2010 19:29:31 -0400
Subject: SH-329 WIP get branch ready for open source release

updated build config to strip havok debug symbols
also added mac convex decomp stub lib.
---
 indra/newview/viewer_manifest.py | 4 +++-
 install.xml                      | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 6a5518fb20..a3f9babf09 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -713,6 +713,8 @@ class DarwinManifest(ViewerManifest):
         # This may be desirable for the final release.  Or not.
         if ("package" in self.args['actions'] or 
             "unpacked" in self.args['actions']):
+            self.run_command('strip -w -N hk* %(viewer_binary)r' %
+                             { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
             self.run_command('strip -S %(viewer_binary)r' %
                              { 'viewer_binary' : self.dst_path_of('Contents/MacOS/Second Life')})
 
@@ -931,7 +933,6 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libexpat.so.1")
             self.path("libglod.so")
             self.path("libssl.so.0.9.7")
-            self.path("libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
@@ -968,6 +969,7 @@ class Linux_i686Manifest(LinuxManifest):
 
         if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer():
             print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build"
+            self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -w -N hk* " % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure
             self.run_command("find %(d)r/bin %(d)r/lib -type f | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure
 
 ################################################################
diff --git a/install.xml b/install.xml
index 4fe6c6a783..b3c798cc03 100644
--- a/install.xml
+++ b/install.xml
@@ -1088,6 +1088,13 @@ anguage Infrstructure (CLI) international standard</string>
         <string>LGPL</string>
         <key>packages</key>
         <map>
+          <key>darwin</key>
+          <map>
+            <key>md5sum</key>
+            <string>349fa0e287fb275bbee43ced194a1db1</string>
+            <key>url</key>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-darwin-20101015.tar.bz</uri>
+          </map>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-- 
cgit v1.2.3