[Python-checkins] python/dist/src/PCbuild bz2.dsp,NONE,1.1 pcbuild.dsw,1.26,1.27 readme.txt,1.24,1.25

tim_one@users.sourceforge.net tim_one@users.sourceforge.net
Fri, 08 Nov 2002 20:49:00 -0800 

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv14224/python/PCbuild

Modified Files:
	pcbuild.dsw readme.txt 
Added Files:
	bz2.dsp 
Log Message:
Start building the bz2 module on Windows.

CAUTION:  The Python test still has many failures, but I'm out of time
for this now (already took much longer than hoped to get this far).
The base bz2 library does pass its own tests (see next).

CAUTION:  People building on Windows have to download and build tne
bz2 compression libraries now.  See PCbuild\readme.txt for complete
instructions.


--- NEW FILE: bz2.dsp ---
# Microsoft Developer Studio Project File - Name="bz2" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** DO NOT EDIT **

# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

CFG=bz2 - Win32 Debug
!MESSAGE This is not a valid makefile. To build this project using NMAKE,
!MESSAGE use the Export Makefile command and run
!MESSAGE 
!MESSAGE NMAKE /f "bz2.mak".
!MESSAGE 
!MESSAGE You can specify a configuration when running NMAKE
!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE 
!MESSAGE NMAKE /f "bz2.mak" CFG="bz2 - Win32 Debug"
!MESSAGE 
!MESSAGE Possible choices for configuration are:
!MESSAGE 
!MESSAGE "bz2 - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "bz2 - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE 

# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName "bz2"
# PROP Scc_LocalPath ".."
CPP=cl.exe
MTL=midl.exe
RSC=rc.exe

!IF  "$(CFG)" == "bz2 - Win32 Release"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "."
# PROP Intermediate_Dir "x86-temp-release\bz2"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.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 "..\..\bzip2-1.0.2" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
# ADD LINK32 ..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"libc" /out:"./bz2.pyd"
# SUBTRACT LINK32 /pdb:none /nodefaultlib

!ELSEIF  "$(CFG)" == "bz2 - Win32 Debug"

# PROP BASE Use_MFC 0
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "."
# PROP Intermediate_Dir "x86-temp-debug\bz2"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
F90=df.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 "..\..\bzip2-1.0.2" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
# ADD LINK32 ..\..\bzip2-1.0.2\libbz2.lib /nologo /base:"0x1D170000" /subsystem:windows /dll /debug /machine:I386 /nodefaultlib:"msvcrt" /nodefaultlib:"libc" /out:"./bz2_d.pyd" /pdbtype:sept
# SUBTRACT LINK32 /pdb:none

!ENDIF 

# Begin Target

# Name "bz2 - Win32 Release"
# Name "bz2 - Win32 Debug"
# Begin Source File

SOURCE=..\Modules\bz2module.c
# End Source File
# End Target
# End Project

Index: pcbuild.dsw
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/pcbuild.dsw,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** pcbuild.dsw	4 Feb 2001 03:09:53 -0000	1.26
--- pcbuild.dsw	9 Nov 2002 04:48:58 -0000	1.27
***************
*** 94,97 ****
--- 94,109 ----
  ###############################################################################
  
+ Project: "bz2"=.\bz2.dsp - Package Owner=<4>
+ 
+ Package=<5>
+ {{{
+ }}}
+ 
+ Package=<4>
+ {{{
+ }}}
+ 
+ ###############################################################################
+ 
  Project: "mmap"=.\mmap.dsp - Package Owner=<4>
  

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** readme.txt	10 Jul 2002 17:05:14 -0000	1.24
--- readme.txt	9 Nov 2002 04:48:58 -0000	1.25
***************
*** 89,92 ****
--- 89,120 ----
      you need to clean up zlib-1.1.4\ by hand.
  
+ bz2
+     Python wrapper for the libbz2 compression library.  Homepage
+         http://sources.redhat.com/bzip2/
+     Download the source tarball, bzip2-1.0.2.tar.gz.
+     Unpack into dist\bzip2-1.0.2.  WARNING:  If you using WinZip, you
+     must disable its "TAR file smart CR/LF conversion" feature (under
+     Options -> Configuration -> Miscellaneous -> Other) for the duration.
+     Don't bother trying to use libbz2.dsp with MSVC.  After 10 minutes
+     of fiddling, I couldn't get it to work.  Perhaps it works with
+     MSVC 5 (I used MSVC 6).  It's better to run the by-hand makefile
+     anyway, because it runs a  helpful test step at the end.
+     cd into dist\bzip2-1.0.2, and run
+         nmake -f makefile.msc
+     [Note that if you're running Win9X, you'll need to run vcvars32.bat
+      before running nmake (this batch file is in your MSVC installation).
+      TODO:  make this work like zlib (in particular, MSVC runs the prelink
+      step in an enviroment that already has the correct envars set up).
+     ]
+     The make step should yield any warnings or errors, and should end
+     by displaying 6 blocks each terminated with
+         FC: no differences encountered
+     If FC finds differences, see the warning abou WinZip above (when I
+     first tried it, sample3.ref failed due to CRLF conversion).
+     All of this managed to build bzip2-1.0.2\libbz2.lib, which the Python
+     project links in.
+ 
+ 
+ 
  bsddb
      Python wrapper for the BSD database 1.85.  Requires db.1.85.win32.zip,