Finish the pyexpat rework for Windows: builders needn't suck down the
Expat installer from SF anymore, and the installer shouldn't install
expat.dll anymore.
diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 0932e65..721e4e6 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1832,17 +1832,6 @@
item: Remark
end
item: Remark
- Text=More DLLs
-end
-item: Install File
- Source=..\..\expat\libs\expat.dll
- Destination=%MAINDIR%\DLLs\expat.dll
- Description=Expat library
- Flags=0000000000000010
-end
-item: Remark
-end
-item: Remark
Text=Main Python DLL
end
item: Remark
diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 8680e7d..efec1bb 100644
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -52,6 +52,9 @@
mmapmodule.c
parser
the parser module
+pyexpat
+ Python wrapper for accelerated XML parsing, which incorporates stable
+ code from the Expat project: http://sourceforge.net/projects/expat/
select
selectmodule.c
unicodedata
@@ -99,16 +102,6 @@
TODO: make this work like zlib (in particular, MSVC runs the prelink
step in an enviroment that already has the correct envars set up).
-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).
-
NOTE ON CONFIGURATIONS
----------------------