From 81ca7c784c4dd58dde691284321e3e220550a75c Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Sun, 18 Nov 2007 18:18:41 +0000
Subject: [PATCH] Updates to the msi builder and PCbuild9 directory. msi.py can
 now create installers from the PCbuild9 directory with MSVCR90.dll. PCbuild
 and MSVCR71.dll are still the default.

---
 PCbuild9/installer.bmp | Bin 0 -> 58806 bytes
 PCbuild9/pyd.vsprops   |   8 +++-
 PCbuild9/pyd_d.vsprops |   6 ++-
 Tools/msi/msi.py       | 101 +++++++++++++++++++++++++++++------------
 4 files changed, 83 insertions(+), 32 deletions(-)
 create mode 100644 PCbuild9/installer.bmp

diff --git a/PCbuild9/installer.bmp b/PCbuild9/installer.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..1875e194ba2720cf25541c20e0459f16f3f96d72
GIT binary patch
literal 58806
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

literal 0
HcmV?d00001

diff --git a/PCbuild9/pyd.vsprops b/PCbuild9/pyd.vsprops
index 3a3030e7a4..173a78a34c 100644
--- a/PCbuild9/pyd.vsprops
+++ b/PCbuild9/pyd.vsprops
@@ -7,13 +7,17 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		RuntimeLibrary="2"
 		PreprocessorDefinitions="NDEBUG"
+		RuntimeLibrary="2"
 	/>
 	<Tool
 		Name="VCLinkerTool"
 		OutputFile="$(OutDir)\$(ProjectName).pyd"
-		ImportLibrary="$(IntDir)\$(TargetName).lib"
 		ProgramDatabaseFile="$(OutDir)\$(ProjectName).pdb"
+		ImportLibrary="$(IntDir)\$(TargetName).lib"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+		CommandLine="copy $(IntDir)\$(ProjectName).lib $(OutDir)"
 	/>
 </VisualStudioPropertySheet>
diff --git a/PCbuild9/pyd_d.vsprops b/PCbuild9/pyd_d.vsprops
index 03933bbd8e..c29d563d72 100644
--- a/PCbuild9/pyd_d.vsprops
+++ b/PCbuild9/pyd_d.vsprops
@@ -16,7 +16,11 @@
 		Name="VCLinkerTool"
 		OutputFile="$(OutDir)\$(ProjectName)_d.pyd"
 		LinkIncremental="1"
-		ImportLibrary="$(IntDir)\$(TargetName).lib"
 		ProgramDatabaseFile="$(OutDir)\$(ProjectName)_d.pdb"
+		ImportLibrary="$(IntDir)\$(TargetName).lib"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+		CommandLine="copy $(IntDir)\$(ProjectName)_d.lib $(OutDir)"
 	/>
 </VisualStudioPropertySheet>
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index c179fd74f5..42cb3fd6f8 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1,7 +1,7 @@
 # Python MSI Generator
 # (C) 2003 Martin v. Loewis
 # See "FOO" in comments refers to MSDN sections with the title FOO.
-import msilib, schema, sequence, os, glob, time, re
+import msilib, schema, sequence, os, glob, time, re, shutil
 from msilib import Feature, CAB, Directory, Dialog, Binary, add_data
 import uisample
 from win32com.client import constants
@@ -26,6 +26,12 @@ full_current_version = None
 have_tcl = True
 # Where is sqlite3.dll located, relative to srcdir?
 sqlite_dir = "../sqlite-source-3.3.4"
+# path to PCbuild directory
+PCBUILD="PCbuild"
+#PCBUILD="PCbuild9"
+# msvcrt version
+MSVCR = "71"
+#MSVCR = "90"
 
 try:
     from config import *
@@ -101,6 +107,7 @@ extensions = [
 # Using the same UUID is fine since these files are versioned,
 # so Installer will always keep the newest version.
 msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}"
+msvcr90_uuid = "" # XXX
 pythondll_uuid = {
     "24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}",
     "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}",
@@ -147,15 +154,15 @@ def build_mingw_lib(lib_file, def_file, dll_file, mingw_lib):
     return True
 
 # Target files (.def and .a) go in PCBuild directory
-lib_file = os.path.join(srcdir, "PCBuild", "python%s%s.lib" % (major, minor))
-def_file = os.path.join(srcdir, "PCBuild", "python%s%s.def" % (major, minor))
+lib_file = os.path.join(srcdir, PCBUILD, "python%s%s.lib" % (major, minor))
+def_file = os.path.join(srcdir, PCBUILD, "python%s%s.def" % (major, minor))
 dll_file = "python%s%s.dll" % (major, minor)
-mingw_lib = os.path.join(srcdir, "PCBuild", "libpython%s%s.a" % (major, minor))
+mingw_lib = os.path.join(srcdir, PCBUILD, "libpython%s%s.a" % (major, minor))
 
 have_mingw = build_mingw_lib(lib_file, def_file, dll_file, mingw_lib)
 
 # Determine the target architechture
-dll_path = os.path.join(srcdir, "PCBuild", dll_file)
+dll_path = os.path.join(srcdir, PCBUILD, dll_file)
 msilib.set_arch_from_file(dll_path)
 if msilib.pe_type(dll_path) != msilib.pe_type("msisupport.dll"):
     raise SystemError("msisupport.dll for incorrect architecture")
@@ -327,7 +334,7 @@ def add_ui(db):
     if not os.path.exists(srcdir+r"\PC\python_icon.exe"):
         raise "Run icons.mak in PC directory"
     add_data(db, "Binary",
-             [("PythonWin", msilib.Binary(srcdir+r"\PCbuild\installer.bmp")), # 152x328 pixels
+             [("PythonWin", msilib.Binary(r"%s\%s\installer.bmp" % (srcdir, PCBUILD))), # 152x328 pixels
               ("py.ico",msilib.Binary(srcdir+r"\PC\py.ico")),
              ])
     add_data(db, "Icon",
@@ -816,19 +823,45 @@ def extract_msvcr71():
         r"Software\Microsoft\VisualStudio\7.1\Setup\VS")
     dir = _winreg.QueryValueEx(k, "MSMDir")[0]
     _winreg.CloseKey(k)
-    files = glob.glob1(dir, "*CRT71*")
-    assert len(files) == 1
-    file = os.path.join(dir, files[0])
+    files = glob.glob1(dir, "*VCR71*.dll")
+    assert len(files) > 0, (dir, files)
     # Extract msvcr71.dll
-    m = msilib.MakeMerge2()
-    m.OpenModule(file, 0)
-    m.ExtractFiles(".")
-    m.CloseModule()
+    #m = msilib.MakeMerge2()
+    #m.OpenModule(file, 0)
+    #m.ExtractFiles(".")
+    #m.CloseModule()
+    for file in files:
+        shutil.copy(os.path.join(dir, file), '.')
     # Find the version/language of msvcr71.dll
     installer = msilib.MakeInstaller()
     return installer.FileVersion("msvcr71.dll", 0), \
            installer.FileVersion("msvcr71.dll", 1)
 
+def extract_msvcr90():
+    import _winreg
+    # Find the location of the merge modules
+    k = _winreg.OpenKey(
+        _winreg.HKEY_LOCAL_MACHINE,
+        r"Software\Microsoft\VisualStudio\9.0\Setup\VS")
+    prod_dir = _winreg.QueryValueEx(k, "ProductDir")[0]
+    _winreg.CloseKey(k)
+
+    # Copy msvcr90*
+    dir = os.path.join(prod_dir, r'VC\redist\x86\Microsoft.VC90.CRT')
+    files = glob.glob1(dir, "*CRT*.dll") + glob.glob1(dir, "*VCR*.dll")
+    for file in files:
+        shutil.copy(os.path.join(dir, file), '.')
+
+    dir = os.path.join(prod_dir, r'VC\redist\Debug_NonRedist\x86\Microsoft.VC90.DebugCRT')
+    files = glob.glob1(dir, "*CRT*.dll") + glob.glob1(dir, "*VCR*.dll")
+    for file in files:
+        shutil.copy(os.path.join(dir, file), '.')
+
+    # Find the version/language of msvcr90.dll
+    installer = msilib.MakeInstaller()
+    return installer.FileVersion("msvcr90.dll", 0), \
+           installer.FileVersion("msvcr90.dll", 1)
+
 class PyDirectory(Directory):
     """By default, all components in the Python installer
     can run from source."""
@@ -846,19 +879,19 @@ def add_files(db):
     root = PyDirectory(db, cab, None, srcdir, "TARGETDIR", "SourceDir")
     default_feature.set_current()
     if not msilib.Win64:
-        root.add_file("PCBuild/w9xpopen.exe")
+        root.add_file("%s/w9xpopen.exe" % PCBUILD)
     root.add_file("README.txt", src="README")
     root.add_file("NEWS.txt", src="Misc/NEWS")
     root.add_file("LICENSE.txt", src="LICENSE")
     root.start_component("python.exe", keyfile="python.exe")
-    root.add_file("PCBuild/python.exe")
+    root.add_file("%s/python.exe" % PCBUILD)
     root.start_component("pythonw.exe", keyfile="pythonw.exe")
-    root.add_file("PCBuild/pythonw.exe")
+    root.add_file("%s/pythonw.exe" % PCBUILD)
 
     # msidbComponentAttributesSharedDllRefCount = 8, see "Component Table"
     dlldir = PyDirectory(db, cab, root, srcdir, "DLLDIR", ".")
     pydll = "python%s%s.dll" % (major, minor)
-    pydllsrc = srcdir + "/PCBuild/" + pydll
+    pydllsrc = os.path.join(srcdir, PCBUILD, pydll)
     dlldir.start_component("DLLDIR", flags = 8, keyfile = pydll, uuid = pythondll_uuid)
     installer = msilib.MakeInstaller()
     pyversion = installer.FileVersion(pydllsrc, 0)
@@ -866,18 +899,28 @@ def add_files(db):
         # For releases, the Python DLL has the same version as the
         # installer package.
         assert pyversion.split(".")[:3] == current_version.split(".")
-    dlldir.add_file("PCBuild/python%s%s.dll" % (major, minor),
+    dlldir.add_file("%s/python%s%s.dll" % (PCBUILD, major, minor),
                     version=pyversion,
                     language=installer.FileVersion(pydllsrc, 1))
     # XXX determine dependencies
-    version, lang = extract_msvcr71()
-    dlldir.start_component("msvcr71", flags=8, keyfile="msvcr71.dll", uuid=msvcr71_uuid)
-    dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
-                    version=version, language=lang)
-    tmpfiles.append("msvcr71.dll")
+    if MSVCR == "90":
+        version, lang = extract_msvcr90()
+        dlldir.start_component("msvcr90", flags=8, keyfile="msvcr90.dll",
+                               uuid=msvcr90_uuid)
+        dlldir.add_file("msvcr90.dll", src=os.path.abspath("msvcr90.dll"),
+                        version=version, language=lang)
+        tmpfiles.append("msvcr90.dll")
+    else:
+        version, lang = extract_msvcr71()
+        dlldir.start_component("msvcr71", flags=8, keyfile="msvcr71.dll",
+                               uuid=msvcr71_uuid)
+        dlldir.add_file("msvcr71.dll", src=os.path.abspath("msvcr71.dll"),
+                        version=version, language=lang)
+        tmpfiles.append("msvcr71.dll")
+
 
     # Check if _ctypes.pyd exists
-    have_ctypes = os.path.exists(srcdir+"/PCBuild/_ctypes.pyd")
+    have_ctypes = os.path.exists(srcdir+"/%s/_ctypes.pyd" % PCBUILD)
     if not have_ctypes:
         print("WARNING: _ctypes.pyd not found, ctypes will not be included")
         extensions.remove("_ctypes.pyd")
@@ -963,7 +1006,7 @@ def add_files(db):
                 pydirs.append((lib, f))
     # Add DLLs
     default_feature.set_current()
-    lib = PyDirectory(db, cab, root, srcdir+"/PCBuild", "DLLs", "DLLS|DLLs")
+    lib = PyDirectory(db, cab, root, srcdir + "/" + PCBUILD, "DLLs", "DLLS|DLLs")
     lib.add_file("py.ico", src="../PC/py.ico")
     lib.add_file("pyc.ico", src="../PC/pyc.ico")
     dlls = []
@@ -971,7 +1014,7 @@ def add_files(db):
     for f in extensions:
         if f=="_tkinter.pyd":
             continue
-        if not os.path.exists(srcdir+"/PCBuild/"+f):
+        if not os.path.exists(srcdir + "/" + PCBUILD + "/" + f):
             print("WARNING: Missing extension", f)
             continue
         dlls.append(f)
@@ -985,7 +1028,7 @@ def add_files(db):
         sqlite_arch = ""
     lib.add_file(srcdir+"/"+sqlite_dir+sqlite_arch+"/sqlite3.dll")
     if have_tcl:
-        if not os.path.exists(srcdir+"/PCBuild/_tkinter.pyd"):
+        if not os.path.exists("%s/%s/_tkinter.pyd" % (srcdir, PCBUILD)):
             print("WARNING: Missing _tkinter.pyd")
         else:
             lib.start_component("TkDLLs", tcltk)
@@ -995,7 +1038,7 @@ def add_files(db):
             for f in glob.glob1(tcldir, "*.dll"):
                 lib.add_file(f, src=os.path.join(tcldir, f))
     # check whether there are any unknown extensions
-    for f in glob.glob1(srcdir+"/PCBuild", "*.pyd"):
+    for f in glob.glob1(srcdir+"/"+PCBUILD, "*.pyd"):
         if f.endswith("_d.pyd"): continue # debug version
         if f in dlls: continue
         print("WARNING: Unknown extension", f)
@@ -1006,7 +1049,7 @@ def add_files(db):
     lib.glob("*.h")
     lib.add_file("pyconfig.h", src="../PC/pyconfig.h")
     # Add import libraries
-    lib = PyDirectory(db, cab, root, "PCBuild", "libs", "LIBS|libs")
+    lib = PyDirectory(db, cab, root, PCBUILD, "libs", "LIBS|libs")
     for f in dlls:
         lib.add_file(f.replace('pyd','lib'))
     lib.add_file('python%s%s.lib' % (major, minor))
-- 
2.49.0