Complete revamp of PCBuild8 directory. Use subdirectories for each project under the main pcbuild solution. Now make extensive use of property sheets to simplify project configuration. x64 build fully supported, and the process for building PGO version (Profiler Guided Optimization) simplified. All projects are now present, except _ssl, which needs to be reimplemented. Also, some of the projects that require external libraries need extra work to fully compile on x64.

git-svn-id: http://svn.python.org/projects/python/trunk@55024 6015fed2-1504-0410-9fe1-9d1591cc4771

Author: kristjan.jonsson

Modules/datetimemodule.c

@@ -13,7 +13,9 @@
 /* Differentiate between building the core module and building extension
  * modules.
  */
+#ifndef Py_BUILD_CORE
 #define Py_BUILD_CORE
+#endif
 #include "datetime.h"
 #undef Py_BUILD_CORE
 

Modules/getbuildinfo.c

@@ -20,10 +20,7 @@
 #endif
 #endif
 
-#ifdef SUBWCREV
 #define SVNVERSION "$WCRANGE$$WCMODS?M:$"
-#endif
-
 const char *
 Py_GetBuildInfo(void)
 {
@@ -40,9 +37,9 @@ Py_GetBuildInfo(void)
 const char *
 _Py_svnversion(void)
 {
-#ifdef SVNVERSION
-	return SVNVERSION;
-#else
+	/* the following string can be modified by subwcrev.exe */
+	static const char svnversion[] = SVNVERSION;
+	if (!strstr(svnversion, "$"))
+		return svnversion; /* it was interpolated */
 	return "exported";
-#endif
 }

PC/make_versioninfo.c

@@ -27,7 +27,12 @@ int main(int argc, char **argv)
 		PY_MICRO_VERSION*1000 + PY_RELEASE_LEVEL*10 + PY_RELEASE_SERIAL);
 	printf("#define MS_DLL_ID \"%d.%d\"\n",
 	       PY_MAJOR_VERSION, PY_MINOR_VERSION);
+	printf("#ifndef _DEBUG\n");
 	printf("#define PYTHON_DLL_NAME \"python%d%d.dll\"\n",
 	       PY_MAJOR_VERSION, PY_MINOR_VERSION);
+	printf("#else\n");
+	printf("#define PYTHON_DLL_NAME \"python%d%d_d.dll\"\n",
+	       PY_MAJOR_VERSION, PY_MINOR_VERSION);
+	printf("#endif\n");
 	return 0;
 }

PCbuild8/PGInstrument.vsprops

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="PGInstrument"
+	OutputDirectory="$(SolutionDir)$(PlatformName)PGO"
+	IntermediateDirectory="$(PlatformName)PGO"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		LinkTimeCodeGeneration="2"
+	/>
+</VisualStudioPropertySheet>

PCbuild8/PGUpdate.vsprops

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioPropertySheet
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="PGUpdate"
+	InheritedPropertySheets=".\PGInstrument.vsprops"
+	>
+	<Tool
+		Name="VCLinkerTool"
+		LinkTimeCodeGeneration="4"
+	/>
+</VisualStudioPropertySheet>