Rev 4602: Switch to just calling out to python setup.py directly, rather than passing the paths to Makefile. in http://bazaar.launchpad.net/~jameinel/bzr/windows-installer

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/windows-installer

------------------------------------------------------------
revno: 4602
revision-id: john at arbash-meinel.com-20090812220306-1vwfc5wr7jpc3jdp
parent: john at arbash-meinel.com-20090812211906-gjnjkdglben2zr5j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: windows-installer
timestamp: Wed 2009-08-12 17:03:06 -0500
message:
  Switch to just calling out to python setup.py directly, rather than passing the paths to Makefile.
-------------- next part --------------
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-12 21:19:06 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-12 22:03:06 +0000
@@ -53,11 +53,21 @@
 %COMSPEC% /c bzr co %ROOT%/bzr/%BZR_TARGET% %TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
-rem Build the python-installer first, because we don't want to
+rem Build the python installers first, because we don't want to
 rem include any of the 3rd-party plugins, because we don't bundle
 rem their dependencies.
 cd %TARGET%
-make python-installer PYTHON=%CYG_PYTHON% PYTHON24=${settings:python24} PYTHON25=${settings:python25} PYTHON26=${settings:python26}
+
+rem This is slightly redundant with 'make installer-all'
+rem except in that case we have to do cygwin path translations for all the
+rem different versions of python
+${settings:python24} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+ at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
+
+${settings:python25} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+ at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
+
+${settings:python26} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
 cd %ROOT%/subvertpy/%PLUGIN_TARGET%