Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv2189/python/dist/src/PCbuild
Modified Files:
pyexpat.dsp python.iss python20.wse readme.txt
Log Message:
Move Windows to Expat 1.95.2. CAUTION: Your Windows build won't work
until you download the new expat and install it; see PCbuild\readme.txt.
Index: pyexpat.dsp
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pyexpat.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** pyexpat.dsp 2000/08/13 22:59:26 1.5
--- pyexpat.dsp 2001/07/28 07:56:38 1.6
***************
*** 46,50 ****
CPP=cl.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 "..\PC" /I "..\..\expat\xmlparse" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 46,50 ----
CPP=cl.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 "..\PC" /I "..\..\expat\Source\lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_EXPAT_H" /YX /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 77,81 ****
CPP=cl.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 "..\PC" /I "..\..\expat\xmlparse" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 77,81 ----
CPP=cl.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 "..\PC" /I "..\..\expat\Source\lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "HAVE_EXPAT_H" /YX /FD /c
MTL=midl.exe
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 180,189 ****
# End Source File
# Begin Source File
-
- SOURCE=..\..\expat\lib\xmltok.lib
- # End Source File
- # Begin Source File
! SOURCE=..\..\expat\lib\xmlparse.lib
# End Source File
# End Target
--- 180,185 ----
# End Source File
# Begin Source File
! SOURCE=..\..\expat\Libs\expat.lib
# End Source File
# End Target
Index: python.iss
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python.iss,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** python.iss 2001/07/26 21:34:59 1.3
--- python.iss 2001/07/28 07:56:38 1.4
***************
*** 161,166 ****
Source: PCbuild\python22.lib; DestDir: "{app}\libs"; CopyMode: alwaysoverwrite; Components: main
! Source: ..\expat\bin\xmlparse.dll; DestDir: "{app}\DLLs"; CopyMode: alwaysoverwrite; Components: main
! Source: ..\expat\bin\xmltok.dll; DestDir: "{app}\DLLs"; CopyMode: alwaysoverwrite; Components: main
Source: Lib\*.py; DestDir: "{app}\Lib"; CopyMode: alwaysoverwrite; Components: main
--- 161,165 ----
Source: PCbuild\python22.lib; DestDir: "{app}\libs"; CopyMode: alwaysoverwrite; Components: main
! Source: ..\expat\Libs\expat.dll; DestDir: "{app}\DLLs"; CopyMode: alwaysoverwrite; Components: main
Source: Lib\*.py; DestDir: "{app}\Lib"; CopyMode: alwaysoverwrite; Components: main
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** python20.wse 2001/07/26 13:41:05 1.43
--- python20.wse 2001/07/28 07:56:38 1.44
***************
*** 838,849 ****
end
item: Install File
! Source=%_SRC_%\..\expat\bin\xmlparse.dll
! Destination=%MAINDIR%\DLLs\xmlparse.dll
! Description=Expat library
! Flags=0000000000000010
! end
! item: Install File
! Source=%_SRC_%\..\expat\bin\xmltok.dll
! Destination=%MAINDIR%\DLLs\xmltok.dll
Description=Expat library
Flags=0000000000000010
--- 838,843 ----
end
item: Install File
! Source=%_SRC_%\..\expat\Libs\expat.dll
! Destination=%MAINDIR%\DLLs\expat.dll
Description=Expat library
Flags=0000000000000010
Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** readme.txt 2001/02/04 03:09:53 1.20
--- readme.txt 2001/07/28 07:56:38 1.21
***************
*** 101,107 ****
pyexpat
! Python wrapper for accelerated XML parsing. Requires
! ftp://ftp.jclark.com/pub/xml/expat.zip
! Unpack into dist\expat.
--- 101,112 ----
pyexpat
! Python wrapper for accelerated XML parsing. Requires the Windows
! expat_win32bin installer from
! http://sourceforge.net/projects/expat/
! Currently using version 1.95.2.
! Install into dist\expat.
! You should also copy expat\Libs\expat.dll into your PCbuild directory,
! else at least two tests will fail (test_pyexpat and test_sax), and
! others will erroneously get skipped (at least test_minidom).