[Python-3000-checkins] r64205 - in python/branches/py3k: PC/VC6/pythoncore.dsp PC/VS7.1/pythoncore.vcproj PC/VS8.0/pythoncore.vcproj PC/config.c PCbuild/pythoncore.vcproj

[amaury.forgeotdarc]

Author: amaury.forgeotdarc
Date: Fri Jun 13 00:27:27 2008
New Revision: 64205

Log:
On Windows, repair compilation of builtin modules _stringio and _pickle.

(Alexandre, the MSVC build files are in PCBuild.
the PC/Vxxx directories try to support older compilers)


Modified:
   python/branches/py3k/PC/VC6/pythoncore.dsp
   python/branches/py3k/PC/VS7.1/pythoncore.vcproj
   python/branches/py3k/PC/VS8.0/pythoncore.vcproj
   python/branches/py3k/PC/config.c
   python/branches/py3k/PCbuild/pythoncore.vcproj

Modified: python/branches/py3k/PC/VC6/pythoncore.dsp
==============================================================================
--- python/branches/py3k/PC/VC6/pythoncore.dsp	(original)
+++ python/branches/py3k/PC/VC6/pythoncore.dsp	Fri Jun 13 00:27:27 2008
@@ -161,6 +161,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_pickle.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_randommodule.c
 # End Source File
 # Begin Source File
@@ -169,6 +173,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_stringio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_struct.c
 # End Source File
 # Begin Source File

Modified: python/branches/py3k/PC/VS7.1/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS7.1/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS7.1/pythoncore.vcproj	Fri Jun 13 00:27:27 2008
@@ -389,12 +389,18 @@
 			RelativePath="..\..\Modules\_lsprof.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_pickle.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\_randommodule.c">
 		</File>
 		<File
 			RelativePath="..\..\Modules\_sre.c">
 		</File>
 		<File
+			RelativePath="..\..\Modules\_stringio.c">
+		</File>
+		<File
 			RelativePath="..\..\Modules\_struct.c">
 		</File>
 		<File

Modified: python/branches/py3k/PC/VS8.0/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PC/VS8.0/pythoncore.vcproj	(original)
+++ python/branches/py3k/PC/VS8.0/pythoncore.vcproj	Fri Jun 13 00:27:27 2008
@@ -1011,6 +1011,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\_pickle.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\_randommodule.c"
 				>
 			</File>
@@ -1019,6 +1023,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\Modules\_stringio.c"
+				>
+			</File>
+			<File
 				RelativePath="..\..\Modules\_struct.c"
 				>
 			</File>

Modified: python/branches/py3k/PC/config.c
==============================================================================
--- python/branches/py3k/PC/config.c	(original)
+++ python/branches/py3k/PC/config.c	Fri Jun 13 00:27:27 2008
@@ -60,6 +60,8 @@
 extern PyObject* PyInit__ast(void);
 extern PyObject* PyInit__fileio(void);
 extern PyObject* PyInit__bytesio(void);
+extern PyObject* PyInit__stringio(void);
+extern PyObject* PyInit__pickle(void);
 extern PyObject* PyInit_atexit(void);
 extern PyObject* _PyWarnings_Init(void);
 
@@ -151,6 +153,7 @@
         {"_fileio", PyInit__fileio},
         {"_bytesio", PyInit__bytesio},
         {"_stringio", PyInit__stringio},
+        {"_pickle", PyInit__pickle},
         {"atexit", PyInit_atexit},
 
         /* Sentinel */

Modified: python/branches/py3k/PCbuild/pythoncore.vcproj
==============================================================================
--- python/branches/py3k/PCbuild/pythoncore.vcproj	(original)
+++ python/branches/py3k/PCbuild/pythoncore.vcproj	Fri Jun 13 00:27:27 2008
@@ -1015,6 +1015,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Modules\_pickle.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Modules\_randommodule.c"
 				>
 			</File>
@@ -1023,6 +1027,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\Modules\_stringio.c"
+				>
+			</File>
+			<File
 				RelativePath="..\Modules\_struct.c"
 				>
 			</File>