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 0ede011..662cd9b 100644
--- a/PC/VC6/_bsddb.dsp
+++ b/PC/VC6/_bsddb.dsp
@@ -54,7 +54,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# 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"
+# 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"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "_bsddb - Win32 Debug"
diff --git a/PC/VC6/_sqlite3.dsp b/PC/VC6/_sqlite3.dsp
index a48ef72..a8f3329 100644
--- a/PC/VC6/_sqlite3.dsp
+++ b/PC/VC6/_sqlite3.dsp
@@ -44,7 +44,7 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# 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
+# 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
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -72,7 +72,7 @@
# PROP Target_Dir ""
F90=df.exe
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# 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
+# 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
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
diff --git a/PC/VC6/python.dsp b/PC/VC6/python.dsp
index c94746d..fa8b772 100644
--- a/PC/VC6/python.dsp
+++ b/PC/VC6/python.dsp
@@ -75,13 +75,8 @@
# ADD BSC32 /nologo
LINK32=link.exe
# 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
-# 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
+# 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
# SUBTRACT LINK32 /pdb:none
-# Begin Special Build Tool
-SOURCE="$(InputPath)"
-PostBuild_Desc=Changing stack size...
-PostBuild_Cmds=editbin /STACK:0x200000 python_d.exe
-# End Special Build Tool
!ENDIF
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 80d0220..a3ea6bd 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -185,11 +185,15 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\_weakref.c
+SOURCE=..\..\Modules\_threadmodule.c
# End Source File
# Begin Source File
-SOURCE=..\winreg.c
+SOURCE=..\..\Python\_warnings.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\_weakref.c
# End Source File
# Begin Source File
@@ -209,10 +213,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Python\_warnings.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Python\asdl.c
# End Source File
# Begin Source File
@@ -313,14 +313,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\zlib\gzio.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Modules\zlib\infback.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Objects\descrobject.c
# End Source File
# Begin Source File
@@ -442,6 +434,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\zlib\gzio.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Python\import.c
# End Source File
# Begin Source File
@@ -455,6 +451,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\zlib\infback.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\zlib\inffast.c
# End Source File
# Begin Source File
@@ -503,11 +503,11 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Parser\metagrammar.c
+SOURCE=..\..\Objects\memoryobject.c
# End Source File
# Begin Source File
-SOURCE=..\..\Objects\memoryobject.c
+SOURCE=..\..\Parser\metagrammar.c
# End Source File
# Begin Source File
@@ -631,6 +631,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\sha1module.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\sha256module.c
# End Source File
# Begin Source File
@@ -639,10 +643,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\sha1module.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Modules\signalmodule.c
# End Source File
# Begin Source File
@@ -675,10 +675,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\_threadmodule.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Modules\timemodule.c
# End Source File
# Begin Source File
@@ -695,10 +691,6 @@
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\zlib\uncompr.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Objects\tupleobject.c
# End Source File
# Begin Source File
@@ -707,6 +699,10 @@
# End Source File
# Begin Source File
+SOURCE=..\..\Modules\zlib\uncompr.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Objects\unicodectype.c
# End Source File
# Begin Source File
@@ -719,6 +715,10 @@
# End Source File
# Begin Source File
+SOURCE=..\winreg.c
+# End Source File
+# Begin Source File
+
SOURCE=..\..\Modules\xxsubtype.c
# End Source File
# Begin Source File
diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 79262ab..c1b94af 100644
--- 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 @@
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 @@
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 @@
.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 @@
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.