From 883b2a6adff1f5496d01572b68a12a1fbadf14e7 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 13 Jul 2011 20:05:12 -0700
Subject: Removed packaging private assemblies since that's no longer how we
 distribute the CRT

---
 linden/indra/newview/viewer_manifest.py | 33 ++++++++++++---------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

(limited to 'linden/indra/newview/viewer_manifest.py')

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 5cae0c9..19344d5 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -323,31 +323,22 @@ class WindowsManifest(ViewerManifest):
             self.path("qtiff4.dll")
             self.end_prefix()
 
+        # We no longer use private assemblies in the viewer -- MC
         # 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=""):
-            if self.args['configuration'] == 'Debug':
-                self.path("msvcr80d.dll")
-                self.path("msvcp80d.dll")
-                self.path("Microsoft.VC80.DebugCRT.manifest")
-            else:
-                self.path("msvcr80.dll")
-                self.path("msvcp80.dll")
-                self.path("Microsoft.VC80.CRT.manifest")
-            self.end_prefix()
+        #if self.prefix(src=self.args['configuration'], dst=""):
+        #    if self.args['configuration'] == 'Debug':
+        #        self.path("msvcr80d.dll")
+        #        self.path("msvcp80d.dll")
+        #        self.path("Microsoft.VC80.DebugCRT.manifest")
+        #    else:
+        #        self.path("msvcr80.dll")
+        #        self.path("msvcp80.dll")
+        #        self.path("Microsoft.VC80.CRT.manifest")
+        #    self.end_prefix()
 
         # The config file name needs to match the exe's name.
-        self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
-
-        # We need this one too, so that llkdu loads at runtime - DEV-41194
-        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="llkdu.dll.2.config")
-        self.path("llkdu.dll.2.config")
-
-        # We need this one too, so that win_crash_logger.exe loads at runtime - DEV-19004
-        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="win_crash_logger.exe.config")
-
-        # same thing for auto-updater.
-        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst="updater.exe.config")
+        #self.path(src="%s/imprudence-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
 
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
-- 
cgit v1.1