Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Peters 2001-07-28 07:56:38 +00:00
parent 63ce5af496
commit faa7f116f2
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PCbuild/pyexpat.dsp
View File

@ -45,7 +45,7 @@ CFG=pyexpat - Win32 Alpha Debug
F90=df.exe
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
# 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
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@ -76,7 +76,7 @@ LINK32=link.exe
F90=df.exe
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
# 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
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@ -180,11 +180,7 @@ SOURCE=..\Modules\pyexpat.c
# End Source File
# Begin Source File
SOURCE=..\..\expat\lib\xmltok.lib
# End Source File
# Begin Source File
SOURCE=..\..\expat\lib\xmlparse.lib
SOURCE=..\..\expat\Libs\expat.lib
# End Source File
# End Target
# End Project

3
PCbuild/python.iss
View File

@ -160,8 +160,7 @@ Source: PCbuild\zlib.lib; DestDir: "{app}\libs"; CopyMode: alwaysoverwrit
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: ..\expat\Libs\expat.dll; DestDir: "{app}\DLLs"; CopyMode: alwaysoverwrite; Components: main
Source: Lib\*.py; DestDir: "{app}\Lib"; CopyMode: alwaysoverwrite; Components: main
Source: Lib\lib-tk\*.py; DestDir: "{app}\Lib\lib-tk"; CopyMode: alwaysoverwrite; Components: main

10
PCbuild/python20.wse
View File

@ -837,14 +837,8 @@ item: Remark
Text=*** More DLLs ***
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
Source=%_SRC_%\..\expat\Libs\expat.dll
Destination=%MAINDIR%\DLLs\expat.dll
Description=Expat library
Flags=0000000000000010
end

11
PCbuild/readme.txt
View File

@ -100,9 +100,14 @@ bsddb
step in an enviroment that already has the correct envars set up).
pyexpat
Python wrapper for accelerated XML parsing. Requires
ftp://ftp.jclark.com/pub/xml/expat.zip
Unpack into dist\expat.
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).
NOTE ON CONFIGURATIONS