1 files changed, 95 insertions, 77 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index a053861..81811a9 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -65,6 +65,9 @@ class ViewerManifest(LLManifest):
             self.path("shaders")
             # ... and the entire windlight directory
             self.path("windlight")
+            # ...and the entire dictionaries directory
+            self.path("dictionaries")
+                  
             self.end_prefix("app_settings")
 
         if self.prefix(src="character"):
@@ -134,7 +137,6 @@ class ViewerManifest(LLManifest):
             self.path("README.txt")
             self.path("MANIFESTO.txt")
             self.path("CONTRIBUTE.txt")
-            self.path("RELEASE_NOTES.txt")
             self.path("ChangeLog.txt", required=False)
             self.end_prefix("../../..")
 
@@ -280,6 +282,11 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
+
+        # Media plugins - GStreamer
+        if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"):
+            self.path("media_plugin_gstreamer010.dll")
+            self.end_prefix()            
  
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
@@ -303,9 +310,6 @@ class WindowsManifest(ViewerManifest):
             self.path("qtiff4.dll")
             self.end_prefix()
 
-        # Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
-        self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
-
         # These need to be installed as a SxS assembly, currently a 'private' assembly.
         # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
         if self.prefix(src=self.args['configuration'], dst=""):
@@ -346,64 +350,74 @@ class WindowsManifest(ViewerManifest):
             self.path("ortp.dll")
 
             self.end_prefix()
-# Gstreamer is not used in webkit_plugins. The librries are never delivered/extracted to
-# ../../libraries/i686-win32/lib/release . Commented out until decision made to use or drop.
+
         # Gstreamer plugins
-        #if self.prefix(src="lib/gstreamer-plugins", dst=""):
-        #    self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
-        #    self.end_prefix()
+        if self.prefix(src="lib/gstreamer-plugins", dst=""):
+            self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
+            self.end_prefix()
 
         # Gstreamer libs
-        #if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-        #    self.path("iconv.dll")
-        #    self.path("libxml2.dll")
-        #    self.path("libcairo-2.dll")
-        #    self.path("libgio-2.0-0.dll")
-        #    self.path("libglib-2.0-0.dll")
-        #    self.path("libgmodule-2.0-0.dll")
-        #    self.path("libgobject-2.0-0.dll")
-        #    self.path("libgthread-2.0-0.dll")
-        #    self.path("charset.dll")
-        #    self.path("intl.dll")
-        #    self.path("libgcrypt-11.dll")
-        #    self.path("libgnutls-26.dll")
-        #    self.path("libgpg-error-0.dll")
-        #    self.path("libgstapp.dll")
-        #    self.path("libgstaudio.dll")
-        #    self.path("libgstbase-0.10.dll")
-        #    self.path("libgstcdda.dll")
-        #    self.path("libgstcontroller-0.10.dll")
-        #    self.path("libgstdataprotocol-0.10.dll")
-        #    self.path("libgstdshow.dll")
-        #    self.path("libgstfft.dll")
-        #    self.path("libgstinterfaces.dll")
-        #    self.path("libgstnet-0.10.dll")
-        #    self.path("libgstnetbuffer.dll")
-        #    self.path("libgstpbutils.dll")
-        #    self.path("libgstreamer-0.10.dll")
-        #    self.path("libgstriff.dll")
-        #    self.path("libgstrtp.dll")
-        #    self.path("libgstrtsp.dll")
-        #    self.path("libgstsdp.dll")
-        #    self.path("libgsttag.dll")
-        #    self.path("libgstvideo.dll")
-        #    self.path("libjpeg.dll")
-        #    self.path("libmp3lame-0.dll")
-        #    self.path("libneon-27.dll")
-        #    self.path("libogg-0.dll")
-        #    self.path("liboil-0.3-0.dll")
-        #    self.path("libopenjpeg-2.dll")
-        #    self.path("libpng12-0.dll")
-        #    self.path("libschroedinger-1.0-0.dll")
-        #    self.path("libspeex-1.dll")
-        #    self.path("libtheora-0.dll")
-        #    self.path("libvorbis-0.dll")
-        #    self.path("libvorbisenc-2.dll")
-        #    self.path("libxml2-2.dll")
-        #    self.path("glew32.dll")
-        #    self.path("xvidcore.dll")
-        #    self.path("zlib1.dll")
-        #    self.end_prefix()
+        if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+            self.path("avcodec-gpl-52.dll")
+            self.path("avdevice-gpl-52.dll")
+            self.path("avfilter-gpl-1.dll")
+            self.path("avformat-gpl-52.dll")
+            self.path("avutil-gpl-50.dll")
+            self.path("iconv.dll")
+            self.path("liba52-0.dll")
+            self.path("libbz2.dll")
+            self.path("libcelt-0.dll")
+            self.path("libdca-0.dll")
+            self.path("libexpat-1.dll")
+            self.path("libfaad-2.dll")
+            self.path("libFLAC-8.dll")
+            self.path("libgcrypt-11.dll")
+            self.path("libgio-2.0-0.dll")
+            self.path("libglib-2.0-0.dll")
+            self.path("libgmodule-2.0-0.dll")
+            self.path("libgnutls-26.dll")
+            self.path("libgobject-2.0-0.dll")
+            self.path("libgpg-error-0.dll")
+            self.path("libgstapp-0.10.dll")
+            self.path("libgstaudio-0.10.dll")
+            self.path("libgstbase-0.10.dll")
+            self.path("libgstcontroller-0.10.dll")
+            self.path("libgstdataprotocol-0.10.dll")
+            self.path("libgstfft-0.10.dll")
+            self.path("libgstinterfaces-0.10.dll")
+            self.path("libgstnet-0.10.dll")
+            self.path("libgstnetbuffer-0.10.dll")
+            self.path("libgstpbutils-0.10.dll")
+            self.path("libgstphotography-0.10.dll")
+            self.path("libgstreamer-0.10.dll")
+            self.path("libgstriff-0.10.dll")
+            self.path("libgstrtp-0.10.dll")
+            self.path("libgstrtsp-0.10.dll")
+            self.path("libgstsdp-0.10.dll")
+            self.path("libgstsignalprocessor-0.10.dll")
+            self.path("libgsttag-0.10.dll")
+            self.path("libgstvideo-0.10.dll")
+            self.path("libgthread-2.0-0.dll")
+            self.path("libmms-0.dll")
+            self.path("libmpeg2-0.dll")
+            self.path("libneon-27.dll")
+            self.path("libogg-0.dll")
+            self.path("liboil-0.3-0.dll")
+            self.path("libsoup-2.4-1.dll")
+            self.path("libtasn1-3.dll")
+            self.path("libtheora-0.dll")
+            self.path("libtheoradec-1.dll")
+            self.path("libvorbis-0.dll")
+            self.path("libvorbisenc-2.dll")
+            self.path("libvorbisfile-3.dll")
+            self.path("libwavpack-1.dll")
+            self.path("libx264-67.dll")
+            self.path("libxml2-2.dll")
+            self.path("libxml2.dll")
+            self.path("SDL.dll")
+            self.path("xvidcore.dll")
+            self.path("z.dll")
+            self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
@@ -543,11 +557,16 @@ class WindowsManifest(ViewerManifest):
         # We use the Unicode version of NSIS, available from
         # http://www.scratchpaper.com/
         try:
-            NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
-            self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+          import _winreg as reg
+          NSIS_path = reg.QueryValue(reg.HKEY_LOCAL_MACHINE, r"SOFTWARE\NSIS\Unicode") + '\\makensis.exe'
+          self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         except:
-            NSIS_path = 'C:\\Program Files (x86)\\NSIS\\Unicode\\makensis.exe'
+          try:
+            NSIS_path = os.environ['ProgramFiles'] + '\\NSIS\\Unicode\\makensis.exe'
             self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+          except:
+            NSIS_path = os.environ['ProgramFiles(X86)'] + '\\NSIS\\Unicode\\makensis.exe'
+        self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
         sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
@@ -577,10 +596,10 @@ class DarwinManifest(ViewerManifest):
                 self.path("libopenal.1.dylib")
                 self.path("libalut.0.dylib")
 
-                self.path("libglib-2.0.dylib")
-                self.path("libgmodule-2.0.dylib")
-                self.path("libgobject-2.0.dylib")
-                self.path("libgthread-2.0.dylib")
+                # self.path("libglib-2.0.dylib")
+                # self.path("libgmodule-2.0.dylib")
+                # self.path("libgobject-2.0.dylib")
+                # self.path("libgthread-2.0.dylib")
                 
                 # self.path("libgstreamer-0.10.dylib")
                 # self.path("libgstapp-0.10.dylib")
@@ -601,15 +620,15 @@ class DarwinManifest(ViewerManifest):
                 # self.path("libgsttag-0.10.dylib")
                 # self.path("libgstvideo-0.10.dylib")
 
-                self.path("libxml2.2.dylib")
+                # self.path("libxml2.2.dylib")
                 # self.path("libfaad.2.dylib")
                 # self.path("libFLAC.8.dylib")
-                self.path("libintl.3.dylib")
+                # self.path("libintl.3.dylib")
                 self.path("libjpeg.62.dylib")
                 self.path("libpng12.0.dylib")
-                self.path("libneon.27.dylib")
+                # self.path("libneon.27.dylib")
                 self.path("libogg.0.dylib")
-                self.path("liboil-0.3.0.dylib")
+                # self.path("liboil-0.3.0.dylib")
                 self.path("libopenjpeg.1.4.dylib")
                 # self.path("libtheora.0.dylib")
                 self.path("libvorbis.0.dylib")
@@ -999,11 +1018,12 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
+            self.path("libz.so")
             self.path("libz.so.1")
 
             # OpenAL
-            self.path("libopenal.so.1")
-            self.path("libalut.so.0")
+            self.path("libopenal.so.1.12.854", "libopenal.so.1")
+            self.path("libalut.so.0.1.0", "libalut.so.0")
 
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
@@ -1135,17 +1155,15 @@ class Linux_x86_64Manifest(LinuxManifest):
             #self.path("libz.so.1") #not needed
 
             # OpenAL
-            self.path("libopenal.so.1")
-            self.path("libalut.so.0")
-
+            self.path("libopenal.so.1.12.854", "libopenal.so.1")
+            self.path("libalut.so.0.1.0", "libalut.so.0")
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
             ##self.path("libatk-1.0.so.0")
             ##self.path("libcairo.so.2")
             ##self.path("libfontconfig.so.1")
             ##self.path("libfreetype.so.6")
-            self.path("libgdk_pixbuf-2.0.so.0") # was commented to use systems gdk pixbufs instead -
-                                                # but seems webkit needs it o_O . Packaging for testing now.
+            #self.path("libgdk_pixbuf-2.0.so.0")
             ##self.path("libgdk-x11-2.0.so.0")
             ##self.path("libgtk-x11-2.0.so.0")
 #            self.path("libpango-1.0.so.0")             # use systems pango instead