Issue #2065: VC6 related fix.

- PC/VC6/_bsddb.dsp:
    removed '/nodefaultlib:"msvcrt"' to fix linker error.

- PC/VC6/_sqlite3.dsp:
    /D "MODULE_NAME=\"sqlite3\""
    caused extra leading space like
    #define MODULE_NAME " sqlite3"
    so uses
    /D MODULE_NAME=\"sqlite3\"
    instead.

- PC/VC6/python.dsp:
    changed the way of modifying stack size

diff --git a/PC/VC6/_bsddb.dsp b/PC/VC6/_bsddb.dsp
index 0ede011064b5e6448a241692f80caee2b6db3fe2..662cd9b681d5ff92ae9161db49cdefb4b56a6aab 100644 (file)
--- a/PC/VC6/_bsddb.dsp
+++ b/PC/VC6/_bsddb.dsp
@@ -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 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\db-4.4.20\build_win32\Release\libdb44s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /out:"./_bsddb.pyd"\r
+# ADD LINK32 user32.lib kernel32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ..\..\..\db-4.4.20\build_win32\Release\libdb44s.lib /nologo /base:"0x1e180000" /subsystem:windows /dll /debug /machine:I386 /out:"./_bsddb.pyd"\r
 # SUBTRACT LINK32 /pdb:none\r
 \r
 !ELSEIF  "$(CFG)" == "_bsddb - Win32 Debug"\r

diff --git a/PC/VC6/_sqlite3.dsp b/PC/VC6/_sqlite3.dsp
index a48ef72790102a4a3a86b34e96a6557ed50f7779..a8f3329f8194a4f1dc940a784485b7cca1e4f74e 100644 (file)
--- a/PC/VC6/_sqlite3.dsp
+++ b/PC/VC6/_sqlite3.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 ".." /I "..\..\..\sqlite-source-3.3.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "MODULE_NAME=\"sqlite3\"" /YX /FD /c\r
+# ADD CPP /nologo /MD /W3 /GX /Zi /O2 /I "..\..\Include" /I ".." /I "..\..\..\sqlite-source-3.3.4" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D MODULE_NAME=\"sqlite3\" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\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 ".." /I "..\..\..\sqlite-source-3.3.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "MODULE_NAME=\"sqlite3\"" /YX /FD /c\r
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\Include" /I ".." /I "..\..\..\sqlite-source-3.3.4" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D MODULE_NAME=\"sqlite3\" /YX /FD /c\r
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r

diff --git a/PC/VC6/python.dsp b/PC/VC6/python.dsp
index c94746d54fd2b6ccac49dc3ddcfbc80787eb3cd7..fa8b772a09aa95f9078eb93672952c70e0421973 100644 (file)
--- a/PC/VC6/python.dsp
+++ b/PC/VC6/python.dsp
@@ -75,13 +75,8 @@ 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:console /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept\r
+# ADD LINK32 odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib /nologo /base:"0x1d000000" /stack:0x200000 /subsystem:console /debug /machine:I386 /out:"./python_d.exe" /pdbtype:sept\r
 # SUBTRACT LINK32 /pdb:none\r
-# Begin Special Build Tool\r
-SOURCE="$(InputPath)"\r
-PostBuild_Desc=Changing stack size...\r
-PostBuild_Cmds=editbin /STACK:0x200000 python_d.exe\r
-# End Special Build Tool\r
 \r
 !ENDIF \r
 \r

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 80d0220a72dcfa88bccb506e5c0ecea5eec9d746..a3ea6bdf5c5500f1a9962420d24d0045c21ddb38 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -185,11 +185,15 @@ SOURCE=..\..\PC\_subprocess.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_weakref.c\r
+SOURCE=..\..\Modules\_threadmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\winreg.c\r
+SOURCE=..\..\Python\_warnings.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\_weakref.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -209,10 +213,6 @@ SOURCE=..\..\Modules\arraymodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\_warnings.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\asdl.c\r
 # End Source File\r
 # Begin Source File\r
@@ -313,14 +313,6 @@ SOURCE=..\..\Modules\zlib\deflate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\zlib\gzio.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\Modules\zlib\infback.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\descrobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -442,6 +434,10 @@ SOURCE=..\..\Parser\grammar1.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\gzio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Python\import.c\r
 # End Source File\r
 # Begin Source File\r
@@ -455,6 +451,10 @@ SOURCE=..\..\Python\importdl.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\zlib\infback.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\zlib\inffast.c\r
 # End Source File\r
 # Begin Source File\r
@@ -503,11 +503,11 @@ SOURCE=..\..\Modules\md5module.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Parser\metagrammar.c\r
+SOURCE=..\..\Objects\memoryobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\memoryobject.c\r
+SOURCE=..\..\Parser\metagrammar.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -631,15 +631,15 @@ SOURCE=..\..\Objects\setobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\sha256module.c\r
+SOURCE=..\..\Modules\sha1module.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\sha512module.c\r
+SOURCE=..\..\Modules\sha256module.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\sha1module.c\r
+SOURCE=..\..\Modules\sha512module.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -675,10 +675,6 @@ SOURCE=..\..\Python\thread.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_threadmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\timemodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -695,15 +691,15 @@ SOURCE=..\..\Modules\zlib\trees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\zlib\uncompr.c\r
+SOURCE=..\..\Objects\tupleobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\tupleobject.c\r
+SOURCE=..\..\Objects\typeobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\typeobject.c\r
+SOURCE=..\..\Modules\zlib\uncompr.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -719,6 +715,10 @@ SOURCE=..\..\Objects\weakrefobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\winreg.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\xxsubtype.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 79262ab95d6c9ede31e343de047da6fb2f636053..c1b94af240c944e387b056f83c2e952b5526c4d8 100644 (file)
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -1,7 +1,9 @@
 Building Python using VC++ 6.0 or 5.0
 -------------------------------------
 This directory is used to build Python for Win32 platforms, e.g. Windows
-95, 98 and NT.  It requires Microsoft Visual C++ 6.x or 5.x.
+2000 and XP.  It requires Microsoft Visual C++ 6.x or 5.x and Platform
+SDK February 2003 Edition (Core SDK). You can download this SDK from
+http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm.
 (For other Windows platforms and compilers, see ../readme.txt.)
 
 All you need to do is open the workspace "pcbuild.dsw" in MSVC++, select
@@ -11,9 +13,7 @@ and build the projects.
 The proper order to build subprojects:
 
 1) pythoncore (this builds the main Python DLL and library files,
-               python21.{dll, lib} in Release mode)
-              NOTE:  in previous releases, this subproject was
-              named after the release number, e.g. python20.
+               python30.{dll, lib} in Release mode)
 
 2) python (this builds the main Python executable,
            python.exe in Release mode)
@@ -24,7 +24,7 @@ The proper order to build subprojects:
    to the subsystems they implement; see SUBPROJECTS below)
 
 When using the Debug setting, the output files have a _d added to
-their name:  python21_d.dll, python_d.exe, parser_d.pyd, and so on.
+their name:  python30_d.dll, python_d.exe, pyexpat_d.pyd, and so on.
 
 SUBPROJECTS
 -----------
@@ -39,6 +39,8 @@ python
     .exe
 pythonw
     pythonw.exe, a variant of python.exe that doesn't pop up a DOS box
+_msi
+    _msi.c. You need to install Windows Installer SDK to build this module.
 _socket
     socketmodule.c
 _testcapi
@@ -177,6 +179,17 @@ _bsddb
     XXX threads are invisible to unittest).
 
 
+_sqlite3
+    Python wrapper for SQLite library.
+    
+    Get the source code through
+    
+    svn export http://svn.python.org/projects/external/sqlite-source-3.3.4
+    
+    To use the extension module in a Python build tree, copy sqlite3.dll into
+    the PC/VC6 folder.
+
+
 _ssl
     Python wrapper for the secure sockets library.