From: Kimmo Varis <kimmov@gmail.com>
Date: Fri, 5 Jun 2009 12:48:47 +0000 (+0000)
Subject: Run manifest fix when updating project files.
X-Git-Tag: 2.16.5~2260
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=494714929990df72f86c2720f14853b53ac02c4e;p=winmerge-jp%2Fwinmerge-jp.git

Run manifest fix when updating project files.
---

diff --git a/Tools/Scripts/UpgradeProjects.py b/Tools/Scripts/UpgradeProjects.py
index b1cdc9401..17a7bf4c4 100644
--- a/Tools/Scripts/UpgradeProjects.py
+++ b/Tools/Scripts/UpgradeProjects.py
@@ -31,6 +31,8 @@ import os
 import subprocess
 import sys
 
+import fix_manifest
+
 # The version of the script
 script_version = 0.2
 
@@ -40,6 +42,9 @@ solutions = [r'Externals\expat\expat.sln',
 
 projects = [r'Externals\scew\win32\scew.vcproj',
     r'ShellExtension\ShellExtension.vcproj']
+    
+# These projects need the manifest file fix
+manifest_projects = [r'Src\Merge.vcproj']
 
 # TODO: read this from Tools.ini
 vs_path = r'C:\Program Files\Microsoft Visual Studio 9.0'
@@ -58,6 +63,11 @@ def upgrade_projects(root_path):
         print 'Upgrading project file: ' + proj_file
         subprocess.call([vs_binary, proj_file, '/Upgrade'], shell = True)
 
+def fix_proj_manifests(root_path):
+    for project in manifest_projects:
+        proj_file = os.path.join(root_path, project)
+        fix_manifest.process_project_file(proj_file)
+
 def usage():
     '''Print script usage information.'''
 
@@ -94,6 +104,7 @@ def main(argv):
     
     print 'Upgrading VS solution- and project-file in folder: ' + root_path
     upgrade_projects(root_path)
+    fix_proj_manifests(root_path)
 
 # MAIN #
 if __name__ == "__main__":