Rev 56: Bring in the updates for the zlib dirs. in http://bazaar.launchpad.net/~bzr/bzr-windows-installers/trunk

John Arbash Meinel john at arbash-meinel.com
Thu Nov 5 20:17:17 GMT 2009


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

------------------------------------------------------------
revno: 56 [merge]
revision-id: john at arbash-meinel.com-20091105201644-jljzogwnaaauw0ui
parent: john at arbash-meinel.com-20091105182750-b4nywz73p7kmh969
parent: john at arbash-meinel.com-20091105201524-4a3xn5xtb4rnmpeu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: trunk
timestamp: Thu 2009-11-05 14:16:44 -0600
message:
  Bring in the updates for the zlib dirs.
modified:
  tools/win32/buildout-templates/bin/build-installer.bat.in buildinstaller.bat.i-20090908072411-6y2hzf4zqck94plw-22
-------------- next part --------------
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-11-05 18:21:29 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-11-05 20:16:44 +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}
 
@@ -136,7 +137,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"



More information about the bazaar-commits mailing list