Backport of changes to PCbuild9 from the py3k branch

PCbuild9/_tkinter.vcproj

@@ -104,7 +104,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(tcltkDir)\include"
+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"
 				PreprocessorDefinitions="WITH_APPINIT"
 			/>
 			<Tool
@@ -118,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+				AdditionalDependencies="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -229,7 +229,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(tcltkDir)\include"
+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"
 				PreprocessorDefinitions="WITH_APPINIT"
 			/>
 			<Tool
@@ -243,7 +243,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+				AdditionalDependencies="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -354,7 +354,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(tcltkDir)\include"
+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"
 				PreprocessorDefinitions="WITH_APPINIT"
 			/>
 			<Tool
@@ -368,7 +368,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+				AdditionalDependencies="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -480,7 +480,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(tcltkDir)\include"
+				AdditionalIncludeDirectories="&quot;$(tcltk64Dir)\include&quot;"
 				PreprocessorDefinitions="WITH_APPINIT"
 			/>
 			<Tool
@@ -494,7 +494,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="$(tcltkDir)\lib\tcl84.lib $(tcltkDir)\lib\tk84.lib $(tcltkDir)\lib\tix8.4\tix84.lib"
+				AdditionalDependencies="$(tcltk64Dir)\lib\tcl84.lib $(tcltk64Dir)\lib\tk84.lib $(tcltk64Dir)\lib\tix8.4\tix84.lib"
 				TargetMachine="17"
 			/>
 			<Tool

PCbuild9/build_tkinter.py

+"""Script to compile the dependencies of _tkinter
+
+Copyright (c) 2007 by Christian Heimes <christian@cheimes.de>
+
+Licensed to PSF under a Contributor Agreement.
+"""
+
+import os
+import sys
+import shutil
+
+here = os.path.abspath(os.path.dirname(__file__))
+par = os.path.pardir
+
+#TCL = "tcl8.4.16"
+#TIX = "Tix8.4.2"
+#TK = "tk8.4.16"
+TCL = "tcl8.4.12"
+TIX = "Tix8.4.0"
+TK = "tk8.4.12"
+ROOT = os.path.abspath(os.path.join(here, par, par))
+NMAKE = "nmake /nologo "
+
+def system(cmd):
+    if os.system(cmd) != 0:
+        raise RuntimeError(cmd)
+
+def build(platform, clean):
+    if platform == "Win32":
+        dest = os.path.join(ROOT, "tcltk")
+        machine = "X86"
+    elif platform == "x64":
+        dest = os.path.join(ROOT, "tcltk64")
+        machine = "X64"
+    else:
+        raise ValueError(platform)
+
+    # TCL
+    tcldir = os.path.join(ROOT, TCL)
+    if True:
+        os.chdir(os.path.join(tcldir, "win"))
+        if clean:
+            system(NMAKE + "/f makefile.vc clean")
+        system(NMAKE + "/f makefile.vc")
+        system(NMAKE + "/f makefile.vc INSTALLDIR=%s install" % dest)
+
+    # TK
+    if True:
+        os.chdir(os.path.join(ROOT, TK, "win"))
+        if clean:
+            system(NMAKE + "/f makefile.vc clean")
+        system(NMAKE + "/f makefile.vc TCLDIR=%s" % tcldir)
+        system(NMAKE + "/f makefile.vc TCLDIR=%s INSTALLDIR=%s install" %
+            (tcldir, dest))
+
+    # TIX
+    if True:
+        os.chdir(os.path.join(ROOT, TIX, "win"))
+        if clean:
+            system(NMAKE + "/f makefile.vc clean")
+        system(NMAKE + "/f makefile.vc MACHINE=%s" % machine)
+        system(NMAKE + "/f makefile.vc INSTALL_DIR=%s install" % dest)
+
+
+def main():
+    if len(sys.argv) < 2 or sys.argv[1] not in ("Win32", "x64"):
+        print("%s Win32|x64" % sys.argv[0])
+        sys.exit(1)
+
+    if "-c" in sys.argv:
+        clean = True
+    else:
+        clean = False
+
+    build(sys.argv[1], clean)
+
+
+if __name__ == '__main__':
+    main()

PCbuild9/pyd.vsprops

@@ -20,8 +20,4 @@
 		Name="VCPostBuildEventTool"
 		CommandLine=""
 	/>
-	<UserMacro
-		Name="PythonExe"
-		Value="$(OutDir)python.exe"
-	/>
 </VisualStudioPropertySheet>

PCbuild9/pyd_d.vsprops

@@ -26,6 +26,6 @@
 	/>
 	<UserMacro
 		Name="PythonExe"
-		Value="$(OutDir)python_d.exe"
+		Value="$(SolutionDir)python_d.exe"
 	/>
 </VisualStudioPropertySheet>

PCbuild9/pyproject.vsprops

@@ -40,6 +40,10 @@
 		Name="PyDllName"
 		Value="python26"
 	/>
+	<UserMacro
+		Name="PythonExe"
+		Value="$(SolutionDir)\python.exe"
+	/>
 	<UserMacro
 		Name="bsddbDir"
 		Value="..\..\db-4.4.20\build_win32\"
@@ -60,4 +64,8 @@
 		Name="tcltkDir"
 		Value="..\..\tcltk\"
 	/>
+	<UserMacro
+		Name="tcltk64Dir"
+		Value="..\..\tcltk64"
+	/>
 </VisualStudioPropertySheet>