[Python-checkins] python/dist/src/PCbuild readme.txt, 1.47, 1.48 zlib.vcproj, 1.1, 1.2

[jhylton at users.sourceforge.net]

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

Modified Files:
	readme.txt zlib.vcproj 
Log Message:
Update Windows build to use zlib 1.2.1

Index: readme.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/readme.txt,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** readme.txt	6 Jan 2004 04:04:01 -0000	1.47
--- readme.txt	9 Jan 2004 16:05:07 -0000	1.48
***************
*** 118,130 ****
  zlib
      Python wrapper for the zlib compression library.  Get the source code
!     for version 1.1.4 from a convenient mirror at:
          http://www.gzip.org/zlib/
!     Unpack into dist\zlib-1.1.4.
      A custom pre-link step in the zlib project settings should manage to
!     build zlib-1.1.4\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
      linked in PCbuild\.
      However, the zlib project is not smart enough to remove anything under
!     zlib-1.1.4\ when you do a clean, so if you want to rebuild zlib.lib
!     you need to clean up zlib-1.1.4\ by hand.
  
  bz2
--- 118,130 ----
  zlib
      Python wrapper for the zlib compression library.  Get the source code
!     for version 1.2.1 from a convenient mirror at:
          http://www.gzip.org/zlib/
!     Unpack into dist\zlib-1.2.1.
      A custom pre-link step in the zlib project settings should manage to
!     build zlib-1.2.1\zlib.lib by magic before zlib.pyd (or zlib_d.pyd) is
      linked in PCbuild\.
      However, the zlib project is not smart enough to remove anything under
!     zlib-1.2.1\ when you do a clean, so if you want to rebuild zlib.lib
!     you need to clean up zlib-1.2.1\ by hand.
  
  bz2

Index: zlib.vcproj
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/zlib.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** zlib.vcproj	2 Jan 2004 21:13:59 -0000	1.1
--- zlib.vcproj	9 Jan 2004 16:05:07 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  	Version="7.10"
  	Name="zlib"
+ 	RootNamespace="zlib"
  	SccProjectName="zlib"
  	SccLocalPath="..">
***************
*** 21,25 ****
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.1.4"
  				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
  				RuntimeLibrary="3"
--- 22,26 ----
  				Name="VCCLCompilerTool"
  				Optimization="0"
! 				AdditionalIncludeDirectories="..\Include,..\PC,..\..\zlib-1.2.1"
  				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS"
  				RuntimeLibrary="3"
***************
*** 37,41 ****
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="..\..\zlib-1.1.4\zlib.lib"
  				OutputFile="./zlib_d.pyd"
  				LinkIncremental="1"
--- 38,42 ----
  			<Tool
  				Name="VCLinkerTool"
! 				AdditionalDependencies="..\..\zlib-1.2.1\zlib.lib"
  				OutputFile="./zlib_d.pyd"
  				LinkIncremental="1"
***************
*** 63,68 ****
  				Name="VCPreLinkEventTool"
  				Description="Checking static zlib has been built"
! 				CommandLine="cd ..\..\zlib-1.1.4
! nmake -nologo -f msdos\makefile.w32 zlib.lib
  "/>
  			<Tool
--- 64,69 ----
  				Name="VCPreLinkEventTool"
  				Description="Checking static zlib has been built"
! 				CommandLine="cd ..\..\zlib-1.2.1
! nmake -nologo -f win32\Makefile.msc zlib.lib
  "/>
  			<Tool