Add script to merge msvcr90.

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
new file mode 100644 (file)
index 0000000..aa26122
--- /dev/null
+++ b/Tools/msi/merge.py
@@ -0,0 +1,70 @@
+import msilib,os,win32com,tempfile\r
+PCBUILD="PCBuild"\r
+from config import *\r
+\r
+Win64 = "amd64" in PCBUILD\r
+\r
+mod_dir = os.path.join(os.environ["ProgramFiles"], "Common Files", "Merge Modules")\r
+if Win64:\r
+    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]\r
+    msi = "python-%s.amd64.msi" % full_current_version\r
+else:\r
+    modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]\r
+    msi = "python-%s.msi" % full_current_version\r
+for i, n in enumerate(modules):\r
+    modules[i] = os.path.join(mod_dir, n)\r
+\r
+def merge(msi, feature, rootdir, modules):\r
+    cab_and_filecount = []\r
+    # Step 1: Merge databases, extract cabfiles\r
+    m = msilib.MakeMerge2()\r
+    m.OpenLog("merge.log")\r
+    print "Opened Log"\r
+    m.OpenDatabase(msi)\r
+    print "Opened DB"\r
+    for module in modules:\r
+        print module\r
+        m.OpenModule(module,0)\r
+        print "Opened Module",module\r
+        m.Merge(feature, rootdir)\r
+        print "Errors:"\r
+        for e in m.Errors:\r
+            print e.Type, e.ModuleTable, e.DatabaseTable\r
+            print "   Modkeys:",\r
+            for s in e.ModuleKeys: print s,\r
+            print\r
+            print "   DBKeys:",\r
+            for s in e.DatabaseKeys: print s,\r
+            print\r
+        cabname = tempfile.mktemp(suffix=".cab")\r
+        m.ExtractCAB(cabname)\r
+        cab_and_filecount.append((cabname, len(m.ModuleFiles)))\r
+        m.CloseModule()\r
+    m.CloseDatabase(True)\r
+    m.CloseLog()\r
+\r
+    # Step 2: Add CAB files\r
+    i = msilib.MakeInstaller()\r
+    db = i.OpenDatabase(msi, win32com.client.constants.msiOpenDatabaseModeTransact)\r
+\r
+    v = db.OpenView("SELECT LastSequence FROM Media")\r
+    v.Execute(None)\r
+    maxmedia = -1\r
+    while 1:\r
+        r = v.Fetch()\r
+        if not r: break\r
+        seq = r.IntegerData(1)\r
+        if seq > maxmedia:\r
+            maxmedia = seq\r
+    print "Start of Media", maxmedia\r
+\r
+    for cabname, count in cab_and_filecount:\r
+        stream = "merged%d" % maxmedia\r
+        msilib.add_data(db, "Media",\r
+                [(maxmedia+1, maxmedia+count, None, "#"+stream, None, None)])\r
+        msilib.add_stream(db, stream,  cabname)\r
+        os.unlink(cabname)\r
+        maxmedia += count\r
+    db.Commit()\r
+\r
+merge(msi, "SharedCRT", "TARGETDIR", modules)\r