diff options
author | Tim Peters <tim.peters@gmail.com> | 2001-07-28 07:56:38 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2001-07-28 07:56:38 (GMT) |
commit | faa7f116f2660c2dca8c7cc87951d0da691b2258 (patch) | |
tree | 7825a6663f53c5f248b8150c21ae2e0f47ee982a | |
parent | 63ce5af49660181d129aabb9c096cab07807b54b (diff) | |
download | cpython-faa7f116f2660c2dca8c7cc87951d0da691b2258.zip cpython-faa7f116f2660c2dca8c7cc87951d0da691b2258.tar.gz cpython-faa7f116f2660c2dca8c7cc87951d0da691b2258.tar.bz2 |
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.
-rwxr-xr-x | PCbuild/pyexpat.dsp | 10 | ||||
-rw-r--r-- | PCbuild/python.iss | 3 | ||||
-rw-r--r-- | PCbuild/python20.wse | 10 | ||||
-rw-r--r-- | PCbuild/readme.txt | 11 |
4 files changed, 14 insertions, 20 deletions
diff --git a/PCbuild/pyexpat.dsp b/PCbuild/pyexpat.dsp index 1754737..32a34e6 100755 --- a/PCbuild/pyexpat.dsp +++ b/PCbuild/pyexpat.dsp @@ -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
diff --git a/PCbuild/python.iss b/PCbuild/python.iss index 80b43c7..e42fa10 100644 --- a/PCbuild/python.iss +++ b/PCbuild/python.iss @@ -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 diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse index 0ebcd8f..6ec142c 100644 --- a/PCbuild/python20.wse +++ b/PCbuild/python20.wse @@ -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 diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index c6033f1..8680e7d 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -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 |