The native bz2 tests worked fine for me under WinXP Pro + VC7.1, so

removed the comment saying they don't work, and changed the build step
to run them.  If they're failing for someone else, please give details
about what failed.

diff --git a/PCbuild/bz2.vcproj b/PCbuild/bz2.vcproj
index f3e170b984ed971ae2b48b7bdac64d5c509adff5..415f03abd6ed51819de1fcf3749fb4399ac3bdb2 100644 (file)
--- a/PCbuild/bz2.vcproj
+++ b/PCbuild/bz2.vcproj
@@ -3,6 +3,7 @@
        ProjectType="Visual C++"
        Version="7.10"
        Name="bz2"
+       RootNamespace="bz2"
        SccProjectName="bz2"
        SccLocalPath="..">
        <Platforms>
@@ -62,7 +63,7 @@
                        <Tool
                                Name="VCPreLinkEventTool"
                                CommandLine="cd ..\..\bzip2-1.0.2
-nmake /nologo /f makefile.msc lib
+nmake /nologo /f makefile.msc
 "/>
                        <Tool
                                Name="VCResourceCompilerTool"

diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt
index 043bfa4115656ed8b8037bc9e8d2a39d7f94f2db..bacd69ae77970f3640a13388085a391fc7baf90f 100644 (file)
--- a/PCbuild/readme.txt
+++ b/PCbuild/readme.txt
@@ -158,8 +158,6 @@ bz2
     If FC finds differences, see the warning abou WinZip above (when I
     first tried it, sample3.ref failed due to CRLF conversion).
 
-    # XXX: it fails with vc 7.1, so the tests are skipped for now.
-
     All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
     project links in.