Rev 4603: (jam) Updates to the windows installers. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4603 [merge]
revision-id: pqm at pqm.ubuntu.com-20090813142003-3x748ymw3avzmme7
parent: pqm at pqm.ubuntu.com-20090813025005-k2k8pa2o38b8m0l8
parent: john at arbash-meinel.com-20090813030732-2y91siksskplqsh5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-08-13 15:20:03 +0100
message:
  (jam) Updates to the windows installers.
modified:
  tools/win32/buildout-templates/bin/build-installer.bat.in buildinstaller.bat.i-20090605013541-8oqmqjw1he033eoj-3
  tools/win32/buildout.cfg       buildout.cfg-20090529141919-d4paovt3buwxgjpd-1
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-03 20:41:39 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in	2009-08-12 22:03:06 +0000
@@ -53,12 +53,22 @@
 %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 @if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
+
+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 .
+ at if %ERRORLEVEL% NEQ 0 (set BUILD_ERROR=%ERRORLEVEL%) & goto End
 
 cd %ROOT%/subvertpy/%PLUGIN_TARGET%
 %PYTHON% setup.py install -O1 --install-lib=%TARGET%

=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg	2009-08-03 20:38:39 +0000
+++ b/tools/win32/buildout.cfg	2009-08-13 03:07:32 +0000
@@ -45,18 +45,18 @@
 zlib-url =
   http://www.zlib.net/zlib123-dll.zip
 
-bzr-release = 1.17
+bzr-release = 1.18
 # Older releases were @ http://bazaar-vcs.org, new releases are hosted directly
 # on Launchpad
 # bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
 bzr-release-url = lp:bzr/${settings:bzr-release}
 bzr-trunk-url = http://bazaar-vcs.org/bzr/bzr.dev
 
-bzrtools-release = 1.17.0
+bzrtools-release = 1.18.0-win32-1
 bzrtools-release-tag = tag:release-${settings:bzrtools-release}
 bzrtools-trunk-url = lp:bzrtools
 
-qbzr-release = 0.12
+qbzr-release = 0.13.1
 qbzr-release-tag = tag:release-${settings:qbzr-release}
 qbzr-trunk-url = lp:qbzr
 
@@ -64,7 +64,7 @@
 tbzr-release-tag = tag:release-${settings:tbzr-release}
 tbzr-trunk-url = lp:tortoisebzr
 
-bzr-svn-release = 0.6.3
+bzr-svn-release = 0.6.4
 bzr-svn-release-tag = tag:bzr-svn-${settings:bzr-svn-release}
 bzr-svn-trunk-url = lp:bzr-svn