diff options
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 | ||||
| -rw-r--r-- | install.xml | 34 |
2 files changed, 33 insertions, 5 deletions
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 b32b5a30e0..0b09c4b15c 100644 --- a/install.xml +++ b/install.xml @@ -266,16 +266,16 @@ <key>darwin</key> <map> <key>md5sum</key> - <string>786de8bfebb5df3a3b51a7832119f8d8</string> + <string>05d294cf7e0339466ba20938baa037b4</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-darwin-20090731.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-darwin-20101015.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>dde909f84fd2b7c56138f8fd193664c4</string> + <string>0ade2ec185318f08588b9a4a57fb24dc</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-linux-20091203.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1-linux-20101015.tar.bz2</uri> </map> <key>windows</key> <map> @@ -1078,6 +1078,32 @@ anguage Infrstructure (CLI) international standard</string> </map> </map> </map> + <key>llconvexdecompositionstub</key> + <map> + <key>copyright</key> + <string>on file</string> + <key>description</key> + <string>stub version of Convex decomposition utility for mesh</string> + <key>license</key> + <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> + <string>dbf4b15e74ce9042e8500720dffc461a</string> + <key>url</key> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llconvexdecompositionstub-0.3-linux-20101015a.tar.bz2</uri> + </map> + </map> + </map> <key>llqtwebkit</key> <map> <key>license</key> |