Reverted last transaction. It's the wrong branch.

diff --git a/PC/VC6/_msi.dsp b/PC/VC6/_msi.dsp
deleted file mode 100644 (file)
index 38e4ac5..0000000
--- a/PC/VC6/_msi.dsp
+++ /dev/null
@@ -1,99 +0,0 @@
-# Microsoft Developer Studio Project File - Name="_msi" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=_msi - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "_msi.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "_msi.mak" CFG="_msi - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "_msi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "_msi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName "_msi"\r
-# PROP Scc_LocalPath ".."\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "_msi - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-release\_msi"\r
-# PROP Ignore_Export_Lib 0\r
-# 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" /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
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# 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 fci.lib msi.lib rpcrt4.lib /nologo /subsystem:windows /dll /machine:I386\r
-# ADD 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 fci.lib msi.lib rpcrt4.lib /nologo /base:"0x1d1a0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_msi.pyd"\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ELSEIF  "$(CFG)" == "_msi - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "."\r
-# PROP Intermediate_Dir "x86-temp-debug\_msi"\r
-# PROP Ignore_Export_Lib 0\r
-# 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 "WIN32" /D "_WINDOWS" /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
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# 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 fci.lib msi.lib rpcrt4.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD 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 fci.lib msi.lib rpcrt4.lib /nologo /base:"0x1d1a0000" /subsystem:windows /dll /debug /machine:I386 /out:"./_msi_d.pyd" /pdbtype:sept\r
-# SUBTRACT LINK32 /pdb:none\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "_msi - Win32 Release"\r
-# Name "_msi - Win32 Debug"\r
-# Begin Source File\r
-\r
-SOURCE=..\..\PC\_msi.c\r
-# End Source File\r
-# End Target\r
-# End Project\r

diff --git a/PC/VC6/build_ssl.py b/PC/VC6/build_ssl.py
index 737b39766af6811089c376e75b69103690032577..74f03831de610566a0dc4cb88d793128e82b575e 100644 (file)
--- a/PC/VC6/build_ssl.py
+++ b/PC/VC6/build_ssl.py
@@ -8,7 +8,7 @@
 #   directory.  It is likely you will already find the zlib library and
 #   any other external packages there.
 # * Install ActivePerl and ensure it is somewhere on your path.
-# * Run this script from the PC/VC6 directory.
+# * Run this script from the PCBuild directory.
 #
 # it should configure and build SSL, then build the ssl Python extension
 # without intervention.

diff --git a/PC/VC6/pcbuild.dsw b/PC/VC6/pcbuild.dsw
index e236a6ce2c4b2b2574014290707141b81dc9a7d2..bd3718d11e981495b6f069b33a567baa2785632b 100644 (file)
--- a/PC/VC6/pcbuild.dsw
+++ b/PC/VC6/pcbuild.dsw
@@ -57,21 +57,6 @@ Package=<4>
 \r
 ###############################################################################\r
 \r
-Project: "_msi"=".\_msi.dsp" - Package Owner=<4>\r
-\r
-Package=<5>\r
-{{{\r
-}}}\r
-\r
-Package=<4>\r
-{{{\r
-    Begin Project Dependency\r
-    Project_Dep_Name pythoncore\r
-    End Project Dependency\r
-}}}\r
-\r
-###############################################################################\r
-\r
 Project: "_socket"=".\_socket.dsp" - Package Owner=<4>\r
 \r
 Package=<5>\r
@@ -303,4 +288,3 @@ Package=<3>
 \r
 ###############################################################################\r
 \r
-\r

diff --git a/PC/VC6/python.dsp b/PC/VC6/python.dsp
index c94746d54fd2b6ccac49dc3ddcfbc80787eb3cd7..91353484fb305be82fa6ac8cb605c45428c83d51 100644 (file)
--- a/PC/VC6/python.dsp
+++ b/PC/VC6/python.dsp
@@ -77,11 +77,6 @@ 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\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
 # 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 858619c8aef3f6717b467ecb5d8ece0dfd039aea..ca504d644aef7f1ad0d8fa3aceb9ed59758cfc96 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.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 largeint.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x1e000000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./python30.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
@@ -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:"./python30_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,15 +129,15 @@ SOURCE=..\..\Modules\_csv.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_fileio.c\r
+SOURCE=..\..\Modules\_functoolsmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_functoolsmodule.c\r
+SOURCE=..\..\Modules\_heapqmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_heapqmodule.c\r
+SOURCE=..\..\Modules\_hotshot.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -201,10 +201,6 @@ SOURCE=..\..\Python\ast.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\atexitmodule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Modules\audioop.c\r
 # End Source File\r
 # Begin Source File\r
@@ -225,11 +221,7 @@ SOURCE=..\..\Objects\boolobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Objects\bytes_methods.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=..\..\Objects\bytesobject.c\r
+SOURCE=..\..\Objects\bufferobject.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -261,7 +253,7 @@ SOURCE=..\..\Objects\codeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\_collectionsmodule.c\r
+SOURCE=..\..\Modules\collectionsmodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -281,6 +273,10 @@ SOURCE=..\config.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\cPickle.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\zlib\crc32.c\r
 # End Source File\r
 # Begin Source File\r
@@ -297,14 +293,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
@@ -341,10 +329,6 @@ SOURCE=..\..\Objects\fileobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Parser\firstsets.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\floatobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -353,10 +337,6 @@ SOURCE=..\..\Objects\frameobject.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\formatter_unicode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\frozen.c\r
 # End Source File\r
 # Begin Source File\r
@@ -418,11 +398,11 @@ SOURCE=..\..\Python\graminit.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Parser\grammar.c\r
+SOURCE=..\..\Parser\grammar1.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Parser\grammar1.c\r
+SOURCE=..\..\Modules\imageop.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -451,6 +431,10 @@ SOURCE=..\..\Modules\zlib\inftrees.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Objects\intobject.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Objects\iterobject.c\r
 # End Source File\r
 # Begin Source File\r
@@ -483,15 +467,15 @@ SOURCE=..\..\Modules\mathmodule.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\md5module.c\r
+SOURCE=..\..\Modules\md5.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Parser\metagrammar.c\r
+SOURCE=..\..\Modules\md5module.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
@@ -579,10 +563,6 @@ SOURCE=..\..\Python\pystate.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Python\pystrcmp.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Python\pystrtod.c\r
 # End Source File\r
 # Begin Source File\r
@@ -603,6 +583,10 @@ SOURCE=..\..\Objects\rangeobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\rgbimgmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\rotatingtree.c\r
 # End Source File\r
 # Begin Source File\r
@@ -619,7 +603,7 @@ SOURCE=..\..\Modules\sha512module.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\sha1module.c\r
+SOURCE=..\..\Modules\shamodule.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -635,6 +619,10 @@ SOURCE=..\..\Objects\stringobject.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\stropmodule.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Python\structmember.c\r
 # End Source File\r
 # Begin Source File\r
@@ -679,10 +667,6 @@ SOURCE=..\..\Modules\zlib\trees.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\zlib\uncompr.c\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\Objects\tupleobject.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VC6/readme.txt b/PC/VC6/readme.txt
index 79262ab95d6c9ede31e343de047da6fb2f636053..cfa549f6361e724bfb204486111e2a70309a9a13 100644 (file)
--- a/PC/VC6/readme.txt
+++ b/PC/VC6/readme.txt
@@ -199,10 +199,12 @@ _ssl
         http://www.activestate.com/Products/ActivePerl/
     as this is used by the OpenSSL build process.  Complain to them <wink>.
 
-    The MSVC project simply invokes PC/VC6/build_ssl.py to perform
+    The MSVC project simply invokes PCBuild/build_ssl.py to perform
     the build.  This Python script locates and builds your OpenSSL
     installation, then invokes a simple makefile to build the final .pyd.
 
+    Win9x users:  see "Win9x note" below.
+
     build_ssl.py attempts to catch the most common errors (such as not
     being able to find OpenSSL sources, or not being able to find a Perl
     that works with OpenSSL) and give a reasonable error message.
@@ -214,6 +216,30 @@ _ssl
     build_ssl.py/MSVC isn't clever enough to clean OpenSSL - you must do
     this by hand.
 
+    Win9x note:  If, near the start of the build process, you see
+    something like
+
+        C:\Code\openssl-0.9.6g>set OPTS=no-asm
+        Out of environment space
+
+    then you're in trouble, and will probably also see these errors near
+    the end of the process:
+
+        NMAKE : fatal error U1073: don't know how to make
+            'crypto\md5\asm\m5_win32.asm'
+        Stop.
+        NMAKE : fatal error U1073: don't know how to make
+            'C:\Code\openssl-0.9.6g/out32/libeay32.lib'
+        Stop.
+
+    You need more environment space.  Win9x only has room for 256 bytes
+    by default, and especially after installing ActivePerl (which fiddles
+    the PATH envar), you're likely to run out.  KB Q230205
+
+        http://support.microsoft.com/default.aspx?scid=KB;en-us;q230205
+
+    explains how to edit CONFIG.SYS to cure this.
+
 
 YOUR OWN EXTENSION DLLs
 -----------------------