Rev 4593: Switch back to using 'make python-installer'. in http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot

------------------------------------------------------------
revno: 4593
revision-id: john at arbash-meinel.com-20090803201338-cfrdbp2v0fyvc93o
parent: john at arbash-meinel.com-20090803200453-i19urkvaron40u60
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-win32-buildbot
timestamp: Mon 2009-08-03 15:13:38 -0500
message:
  Switch back to using 'make python-installer'.
  
  Also, move that call to before we install any plugins. We don't
  want to bundle plugins into the python installers, because we
  don't also bundle their dependencies.
-------------- next part --------------
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-07-31 21:28:31 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-03 20:13:38 +0000
@@ -53,6 +53,13 @@
 %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 include any of the 3rd-party plugins, because we don't bundle
+rem their dependencies.
+cd %TARGET%
+make python-installer PYTHON24=${settings:python24} PYTHON25=${settings:python25} PYTHON26=${settings:python26}
+rem @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
+
 cd %ROOT%/subvertpy/%PLUGIN_TARGET%
 %PYTHON% setup.py install -O1 --install-lib=%TARGET%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
@@ -82,19 +89,6 @@
 make installer PYTHON=%CYG_PYTHON%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
-rem Enable this when this branch is merged.
-rem make python-installer PYTHON24=${settings:python24} PYTHON25=${settings:python25} PYTHON26=${settings:python26}
-rem @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
-
-${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 .
- at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
-
 %PYTHON% %ROOT%/ostools.py copytodir %TARGET%/bzr*.exe %INSTALLERS%
 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End