* oln_master.cfg (f_oln_unix_gcc_4_1_64): Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 3381712..042dda9 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2010-11-05 Roland Levillain roland@lrde.epita.fr + + Tell seattle to use Python 2.5 in Olena builds. + + * oln_master.cfg (f_oln_unix_gcc_4_1_64): Here. + 2010-11-04 Roland Levillain roland@lrde.epita.fr

Use the default g++ for Olena builds on on seattle. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 328dbe7..88238ca 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -140,6 +140,7 @@ f_oln_unix_gcc_4_1_64 = GNUBuildSystem(project_repos='olena', scm_step=checkout, branch=mybranch, extra_configure_args='CXX="ccache g++" CC="ccache gcc" \ + PYTHON=python2.5 \ --without-magickxx \ --enable-all', install_cmd=None, @@ -147,6 +148,7 @@ f_oln_unix_gcc_4_1_64 = GNUBuildSystem(project_repos='olena', upload_cmd=None, check_cmd='make -k check', distcheck_configure_args='CXX='ccache g++' CC='ccache gcc' \ + PYTHON=python2.5 \ --without-magickxx \ --enable-all' )