Rev 46: Add ZLIB to the build process. in http://bazaar.launchpad.net/~bzr/bzr-windows-installers/2.0

[John Arbash Meinel]

At http://bazaar.launchpad.net/~bzr/bzr-windows-installers/2.0

------------------------------------------------------------
revno: 46
revision-id: john at arbash-meinel.com-20091105201524-4a3xn5xtb4rnmpeu
parent: john at arbash-meinel.com-20091105182549-5xe171mrvkeerdcu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.0
timestamp: Thu 2009-11-05 14:15:24 -0600
message:
  Add ZLIB to the build process.
  
  It seems that on all the test locations, zlib's devel libraries were already
  in the PATH, so the build routines didn't need to correctly
  install it themselves.
  This should fix that.
-------------- next part --------------
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-10-20 14:53:27 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-11-05 20:15:24 +0000
@@ -15,6 +15,7 @@
 set SVN_DEV=${buildout:directory}/${svn-dev:destination}
 set SVN_BDB=${buildout:directory}/${svn-db4:destination}
 set SVN_LIBINTL=${buildout:directory}/${svn-libintl:destination}
+set ZLIB_BASE=${buildout:directory}/${zlib:destination}
 set INSTALLERS=%ROOT%\installers
 set PYTHON=${buildout:executable}
 
@@ -128,7 +129,7 @@
 echo Building the C extensions
 cd %TARGET%
 %PYTHON% tools/win32/ostools.py remove bzrlib/*.pyd
-%PYTHON% setup.py build_ext -i -f %PYTHON_BUILDFLAGS%
+%PYTHON% setup.py build_ext -i -f %PYTHON_BUILDFLAGS% -I%ZLIB_BASE%/include -L%ZLIB_BASE%/lib
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
 echo Generating "bzr.exe"