Patch #1576954: Update VC6 build directory; remove redundant

files in VC7. Will backport to 2.5.

diff --git a/Misc/NEWS b/Misc/NEWS
index 9800a9b396c6f493baac8b86906f2227e28a4441..1dcd6aad79626b2fadff02f15e2233921a23b803 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -211,6 +211,9 @@ Tools
 Build
 -----
 
+- Patch #1576954: Update VC6 build directory; remove redundant
+  files in VC7.
+
 - Bug #1568842: Fix test for uintptr_t.
 
 - Patch #1540470, for OpenBSD 4.0.

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index ec2ec3ea1dc9bdde71309894fe30818544194a22..ca504d644aef7f1ad0d8fa3aceb9ed59758cfc96 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c\r
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\modules\zlib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "USE_DL_EXPORT" /YX /FD /Zm200 /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
@@ -54,7 +54,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python25.dll"\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python26.dll"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "pythoncore - Win32 Debug"\r
@@ -72,7 +72,7 @@ LINK32=link.exe
 # PROP Target_Dir ""\r
 F90=df.exe\r
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c\r
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\modules\zlib" /D "_DEBUG" /D "USE_DL_EXPORT" /D "WIN32" /D "_WINDOWS" /YX /FD /Zm200 /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
@@ -82,7 +82,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo\r
 LINK32=link.exe\r
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python25_d.dll" /pdbtype:sept\r
+# ADD LINK32 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python26_d.dll" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ENDIF \r
@@ -129,6 +129,10 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_functoolsmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_heapqmodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -141,6 +145,10 @@ SOURCE=..\..\Modules\_localemodule.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_lsprof.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_randommodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -149,10 +157,18 @@ SOURCE=..\..\Modules\_sre.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_struct.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\PC\_subprocess.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_typesmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_weakref.c\r
 # End Source File\r
 # Begin Source File\r
@@ -169,6 +185,10 @@ SOURCE=..\..\Parser\acceler.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\adler32.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\arraymodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -245,6 +265,10 @@ SOURCE=..\..\Objects\complexobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\compress.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\config.c\r
 # End Source File\r
 # Begin Source File\r
@@ -253,6 +277,10 @@ SOURCE=..\..\Modules\cPickle.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\crc32.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\cStringIO.c\r
 # End Source File\r
 # Begin Source File\r
@@ -261,6 +289,10 @@ SOURCE=..\..\Modules\datetimemodule.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\deflate.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\descrobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -289,7 +321,7 @@ SOURCE=..\..\Python\errors.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\exceptions.c\r
+SOURCE=..\..\Objects\exceptions.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -313,10 +345,6 @@ SOURCE=..\..\Objects\funcobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_functoolsmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\future.c\r
 # End Source File\r
 # Begin Source File\r
@@ -391,6 +419,18 @@ SOURCE=..\..\Python\importdl.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\inffast.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\inflate.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\inftrees.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\intobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -427,7 +467,7 @@ SOURCE=..\..\Modules\mathmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\md5c.c\r
+SOURCE=..\..\Modules\md5.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -503,10 +543,18 @@ SOURCE=..\..\Parser\parsetok.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Python\peephole.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\posixmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Python\pyarena.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Python\pyfpe.c\r
 # End Source File\r
 # Begin Source File\r
@@ -519,11 +567,11 @@ SOURCE=..\..\Python\pystrtod.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\python_nt.rc\r
+SOURCE="..\..\Python\Python-ast.c"\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\Python-ast.c\r
+SOURCE=..\python_nt.rc\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -539,11 +587,11 @@ SOURCE=..\..\Modules\rgbimgmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\setobject.c\r
+SOURCE=..\..\Modules\rotatingtree.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\shamodule.c\r
+SOURCE=..\..\Objects\setobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -555,6 +603,10 @@ SOURCE=..\..\Modules\sha512module.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\shamodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\signalmodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -575,10 +627,6 @@ SOURCE=..\..\Python\structmember.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\structmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\structseq.c\r
 # End Source File\r
 # Begin Source File\r
@@ -615,6 +663,10 @@ SOURCE=..\..\Python\traceback.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\trees.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\tupleobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -645,5 +697,13 @@ SOURCE=..\..\Modules\yuvconvert.c
 \r
 SOURCE=..\..\Modules\zipimport.c\r
 # End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlibmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\zutil.c\r
+# End Source File\r
 # End Target\r
 # End Project\r

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index b8d78c09ee2a0c303b6ab0aed9433471d2c06b73..ebaa78f7cf6a423d74354ccbef07ec2d05c3056e 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -463,9 +463,6 @@
                <File
                        RelativePath="..\Python\compile.c">
                </File>
-               <File
-                       RelativePath="..\Python\peephole.c">
-               </File>
                <File
                        RelativePath="..\Objects\complexobject.c">
                </File>
@@ -685,6 +682,9 @@
                <File
                        RelativePath="..\Parser\parsetok.c">
                </File>
+               <File
+                       RelativePath="..\Python\peephole.c">
+               </File>
                <File
                        RelativePath="..\Modules\posixmodule.c">
                </File>
@@ -727,18 +727,12 @@
                <File
                        RelativePath="..\Modules\sha512module.c">
                </File>
-               <File
-                       RelativePath="..\Modules\sha512module.c">
-               </File>
                <File
                        RelativePath="..\Modules\shamodule.c">
                </File>
                <File
                        RelativePath="..\Modules\signalmodule.c">
                </File>
-               <File
-                       RelativePath="..\Modules\signalmodule.c">
-               </File>
                <File
                        RelativePath="..\Objects\sliceobject.c">
                </File>