aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-11-17 22:03:08 +0000
committermarha <marha@users.sourceforge.net>2009-11-17 22:03:08 +0000
commit67c6a9832ddc1494822837936b629f638f37dae0 (patch)
tree77cab1fd15dc2aacd631dc1d84379a5180d56543
parent95409718940881cd7c1eb9b20c76973d27ce221c (diff)
downloadvcxsrv-67c6a9832ddc1494822837936b629f638f37dae0.tar.gz
vcxsrv-67c6a9832ddc1494822837936b629f638f37dae0.tar.bz2
vcxsrv-67c6a9832ddc1494822837936b629f638f37dae0.zip
Solved problem when debug and release runtimes have not the same versions installed.
-rw-r--r--tools/genruntimemanifest.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/genruntimemanifest.py b/tools/genruntimemanifest.py
index 3ab6b89e7..ba0352525 100644
--- a/tools/genruntimemanifest.py
+++ b/tools/genruntimemanifest.py
@@ -17,9 +17,13 @@ Template=r"""<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
import glob,re,sys
-Files=glob.glob(r"c:\windows\winsxs\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.*")
+if len(sys.argv)==3 and sys.argv[2]=="1":
+ Files=glob.glob(r"c:\windows\winsxs\x86_Microsoft.VC90.DebugCRT_1fc8b3b9a1e18e3b_9.0.*")
+ SearchRe=re.compile(r"c:\\windows\\winsxs\\x86_Microsoft\.VC90\.DebugCRT_1fc8b3b9a1e18e3b_9\.0\.([0-9]+)\.([0-9]+)_",re.I)
+else:
+ Files=glob.glob(r"c:\windows\winsxs\x86_Microsoft.VC90.CRT_1fc8b3b9a1e18e3b_9.0.*")
+ SearchRe=re.compile(r"c:\\windows\\winsxs\\x86_Microsoft\.VC90\.CRT_1fc8b3b9a1e18e3b_9\.0\.([0-9]+)\.([0-9]+)_",re.I)
-SearchRe=re.compile(r"c:\\windows\\winsxs\\x86_Microsoft\.VC90\.CRT_1fc8b3b9a1e18e3b_9\.0\.([0-9]+)\.([0-9]+)_",re.I)
MajorVersion=0
MinorVersion=0