Rev 4581: Try to update the buildout rules for the newest versions of everything. in http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot
John Arbash Meinel
john at arbash-meinel.com
Fri Jul 31 20:09:48 BST 2009
At http://bazaar.launchpad.net/~jameinel/bzr/1.18-win32-buildbot
------------------------------------------------------------
revno: 4581
revision-id: john at arbash-meinel.com-20090731190931-uv3yk1zpmb2wxh5r
parent: pqm at pqm.ubuntu.com-20090731162211-zvddnooijve9nbmu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.18-win32-buildbot
timestamp: Fri 2009-07-31 14:09:31 -0500
message:
Try to update the buildout rules for the newest versions of everything.
-------------- next part --------------
=== modified file 'Makefile'
--- a/Makefile 2009-07-22 14:07:56 +0000
+++ b/Makefile 2009-07-31 19:09:31 +0000
@@ -23,6 +23,7 @@
PYTHON=python
PYTHON24=python24
PYTHON25=python25
+PYTHON26=python26
BZR_TARGET=release
PLUGIN_TARGET=plugin-release
PYTHON_BUILDFLAGS=
@@ -277,7 +278,7 @@
$(PYTHON25) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
py-inst-26: docs
- python26 setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
+ $(PYTHON26) setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
python-installer: py-inst-24 py-inst-25 py-inst-26
=== modified file 'tools/win32/build_release.py'
--- a/tools/win32/build_release.py 2009-07-14 15:00:14 +0000
+++ b/tools/win32/build_release.py 2009-07-31 19:09:31 +0000
@@ -7,8 +7,8 @@
'bzr': '1.17',
'qbzr': '0.12',
'bzrtools': '1.17.0',
- 'bzr-svn': '0.6.3-win32-1',
- 'bzr-rewrite': '0.5.1',
+ 'bzr-svn': '0.6.3',
+ 'bzr-rewrite': '0.5.2',
'subvertpy': '0.6.8',
}
@@ -85,9 +85,10 @@
bzr_dir = get_bzr_dir()
if not os.path.isdir(bzr_dir):
bzr_version = VERSIONS['bzr']
- bzr_url = 'http://bazaar-vcs.org/bzr/bzr.' + bzr_version
+ # bzr_url = 'http://bazaar-vcs.org/bzr/bzr.' + bzr_version
+ bzr_url = 'lp:bzr/' + bzr_version
print "Getting bzr release %s from %s" % (bzr_version, bzr_url)
- call_or_fail([bzr(), 'co', bzr_url])
+ call_or_fail([bzr(), 'co', bzr_url, bzr_dir])
else:
print "Ensuring %s is up-to-date" % (bzr_dir,)
call_or_fail([bzr(), 'update', bzr_dir])
=== modified file 'tools/win32/buildout-templates/bin/build-installer.bat.in'
--- a/tools/win32/buildout-templates/bin/build-installer.bat.in 2009-07-04 03:03:46 +0000
+++ b/tools/win32/buildout-templates/bin/build-installer.bat.in 2009-07-31 19:09:31 +0000
@@ -82,7 +82,7 @@
@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}
+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 .
@@ -91,6 +91,9 @@
${settings:python25} setup.py bdist_wininst --install-script="bzr-win32-bdist-postinstall.py" -d .
@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
=== modified file 'tools/win32/buildout.cfg'
--- a/tools/win32/buildout.cfg 2009-07-04 02:16:06 +0000
+++ b/tools/win32/buildout.cfg 2009-07-31 19:09:31 +0000
@@ -15,7 +15,7 @@
tbzr
bzrtools
bzr-svn
- bzr-rebase
+ bzr-rewrite
subvertpy
templates
@@ -25,11 +25,12 @@
zc.buildout = 1.2.1
setuptools = 0.6c9
z3c.recipe.filetemplate = 2.0.3
-gf.recipe.bzr = 1.0rc5
+gf.recipe.bzr = 1.0rc6
[settings]
python24=c:\Python24\python.exe
python25=c:\Python25\python.exe
+python26=c:\Python26\python.exe
download-ignore-existing = false
svn-dev-url =
http://subversion.tigris.org/files/documents/15/45228/svn-win32-1.5.6_dev.zip
@@ -44,15 +45,16 @@
zlib-url =
http://www.zlatkovic.com/pub/libxml/zlib-1.2.3.win32.zip
-bzr-release = 1.15
-bzr-release-url = http://bazaar-vcs.org/bzr/bzr.${settings:bzr-release}
+bzr-release = 1.17
+# 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.12.0
+bzrtools-release = 1.17.0
bzrtools-release-tag = tag:release-${settings:bzrtools-release}
bzrtools-trunk-url = lp:bzrtools
-qbzr-release = 0.9.8
+qbzr-release = 0.12
qbzr-release-tag = tag:release-${settings:qbzr-release}
qbzr-trunk-url = lp:qbzr
@@ -60,15 +62,17 @@
tbzr-release-tag = tag:release-${settings:tbzr-release}
tbzr-trunk-url = lp:tortoisebzr
-bzr-svn-release = 0.5.2
+bzr-svn-release = 0.6.3
bzr-svn-release-tag = tag:bzr-svn-${settings:bzr-svn-release}
bzr-svn-trunk-url = lp:bzr-svn
-bzr-rebase-release = 0.4.4
-bzr-rebase-release-tag = tag:bzr-rebase-${settings:bzr-rebase-release}
-bzr-rebase-trunk-url = lp:bzr-rebase
+# This isn't a typo, as of last release, the branch is lp:bzr-rewrite but the
+# tag is bzr-rebase-0.5.2
+bzr-rewrite-release = 0.5.2
+bzr-rewrite-release-tag = tag:bzr-rebase-${settings:bzr-rebase-release}
+bzr-rewrite-trunk-url = lp:bzr-rewrite
-subvertpy-release = 0.6.4
+subvertpy-release = 0.6.8
subvertpy-release-tag = tag:subvertpy-${settings:subvertpy-release}
subvertpy-trunk-url = lp:subvertpy
@@ -128,7 +132,7 @@
download-only = true
[bzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = false
format = 1.9
urls =
@@ -137,16 +141,16 @@
develop = false
[bzrtools]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = true
-format = 1.9-rich-root
+format = 2a
urls =
${settings:bzrtools-trunk-url} trunk
${buildout:directory}/bzrtools/trunk@${settings:bzrtools-release-tag} release
develop = false
[qbzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = true
format = 1.9
urls =
@@ -155,7 +159,7 @@
develop = false
[tbzr]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = true
format = 1.9
urls =
@@ -164,16 +168,16 @@
develop = false
[bzr-svn]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = true
-format = 1.9-rich-root
+format = 2a
urls =
${settings:bzr-svn-trunk-url} trunk
${buildout:directory}/bzr-svn/trunk@${settings:bzr-svn-release-tag} release
develop = false
-[bzr-rebase]
-recipe = gf.recipe.bzr
+[bzr-rewrite]
+recipe = gf.recipe.bzr#strict
shared-repo = true
format = 1.9-rich-root
urls =
@@ -182,7 +186,7 @@
develop = false
[subvertpy]
-recipe = gf.recipe.bzr
+recipe = gf.recipe.bzr#strict
shared-repo = true
format = 1.9-rich-root
urls =
More information about the bazaar-commits
mailing list