EXT-295 - Added script to generate application config file. Reviewed by Poppy

2 files changed, 60 insertions, 3 deletions

diff --git a/indra/newview/build_win32_appConfig.py b/indra/newview/build_win32_appConfig.py
new file mode 100644
index 0000000000..2ac0e17dc1
--- /dev/null
+++ b/indra/newview/build_win32_appConfig.py
@@ -0,0 +1,57 @@
+# @file build_win32_appConfig.py
+# @brief Create the windows app.config file to redirect crt linkage.
+#
+# $LicenseInfo:firstyear=2009&license=viewergpl$
+# 
+# Copyright (c) 2009, Linden Research, Inc.
+# 
+# Second Life Viewer Source Code
+# The source code in this file ("Source Code") is provided by Linden Lab
+# to you under the terms of the GNU General Public License, version 2.0
+# ("GPL"), unless you have obtained a separate licensing agreement
+# ("Other License"), formally executed by you and Linden Lab.  Terms of
+# the GPL can be found in doc/GPL-license.txt in this distribution, or
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+# 
+# There are special exceptions to the terms and conditions of the GPL as
+# it is applied to this Source Code. View the full text of the exception
+# in the file doc/FLOSS-exception.txt in this software distribution, or
+# online at
+# http://secondlifegrid.net/programs/open_source/licensing/flossexception
+# 
+# By copying, modifying or distributing this software, you acknowledge
+# that you have read and understood your obligations described above,
+# and agree to abide by those obligations.
+# 
+# ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+# WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+# COMPLETENESS OR PERFORMANCE.
+# $/LicenseInfo$
+
+import sys, os
+from xml.dom.minidom import parse
+
+def main():
+    src_manifest_name = sys.argv[1]
+    src_config_name = sys.argv[2]
+    dst_config_name = sys.argv[3]
+ 
+    manifest_dom = parse(src_manifest_name)
+    node = manifest_dom.getElementsByTagName('assemblyIdentity')[0]
+    manifest_assm_ver = node.getAttribute('version')
+    
+    config_dom = parse(src_config_name)
+    node = config_dom.getElementsByTagName('bindingRedirect')[0]
+    node.setAttribute('newVersion', manifest_assm_ver)
+    node.setAttribute('oldVersion', node.getAttribute('oldVersion') + manifest_assm_ver)
+    comment = config_dom.createComment("This file is automatically generated by the build. see indra/newview/build_win32_appConfig.py")
+    config_dom.insertBefore(comment, config_dom.childNodes[0])
+    
+    f = open(dst_config_name, 'w')
+    config_dom.writexml(f)
+    f.close()
+        
+    return 0
+
+if __name__ == "__main__":
+    main()
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 5dc8efba4a..54095f866f 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -207,6 +207,9 @@ class WindowsManifest(ViewerManifest):
                 self.path("Microsoft.VC80.CRT.manifest")
             self.end_prefix()
 
+        # The config file name needs to match the exe's name.
+        self.path(src="%s/secondlife-bin.exe.config" % self.args['configuration'], dst=self.final_exe() + ".config")
+
         # Mozilla runtime DLLs (CP)
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
             self.path("freebl3.dll")
@@ -235,9 +238,6 @@ class WindowsManifest(ViewerManifest):
 
         # Mozilla hack to get it to accept newer versions of msvc*80.dll than are listed in manifest
         # necessary as llmozlib2-vc80.lib refers to an old version of msvc*80.dll - can be removed when new version of llmozlib is built - Nyx
-        # The config file name needs to match the exe's name.
-        self.path("SecondLife.exe.config", dst=self.final_exe() + ".config")
-
         # Vivox runtimes
         if self.prefix(src="vivox-runtime/i686-win32", dst=""):
             self.path("SLVoice.exe")