* oln_master.cfg: Here. --- buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 8d68dea..5011ba9 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,5 +1,11 @@ 2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Use Python 2.5 in all Olena builds. + + * oln_master.cfg: Here. + +2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Replace the Olena build using GCC 4.1 by a build using GCC 4.4. * oln_master.cfg: Here. diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 99036d6..7888833 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -115,6 +115,7 @@ f_oln_unix_gcc_4_4 = GNUBuildSystem(project_repos='olena', scm_step=checkout, branch=mybranch, extra_configure_args='CXX="ccache g++-4.4" CC="ccache gcc-4.4" \ + PYTHON=python2.5 \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -126,6 +127,7 @@ f_oln_unix_gcc_4_4 = GNUBuildSystem(project_repos='olena', extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib', check_cmd='make -k check', distcheck_configure_args='CCX=\'ccache g++-4.4\' CC=\'ccache gcc-4.4\' \ + PYTHON=python2.5 \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -163,6 +165,7 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', branch=mybranch, extra_configure_args='CXX="ccache g++-4.2" \ CC="ccache gcc-4.2" \ + PYTHON=python2.5 \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -176,6 +179,7 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', check_cmd='make -k check', distcheck_configure_args='CXX=\'ccache g++-4.2\' \ CC=\'ccache gcc-4.2\' \ + PYTHON=python2.5 \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --enable-all \ @@ -192,7 +196,8 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', # this very version will be used. configure_cmd='source /lrde/dev/linux-x86/intel/icc10.1/bin/iccvars.sh\ && CC="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ - CXX="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + CXX="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + PYTHON=python2.5 \ ./configure \ --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -208,6 +213,7 @@ f_oln_unix_icc_10 = GNUBuildSystem(project_repos='olena', '/lrde/dev/linux-x86/intel/icc10.1//lib']), distcheck_configure_args='CC="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icc" \ CXX="ccache /lrde/dev/linux-x86/intel/icc10.1//bin/icpc" \ + PYTHON=python2.5 \ --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ @@ -222,7 +228,8 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', # very version will be used. configure_cmd='source /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/iccvars.sh ia32 \ && CC="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icc" \ - CXX="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ + CXX="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ + PYTHON=python2.5 \ ./configure \ --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -240,6 +247,7 @@ f_oln_unix_icc_11 = GNUBuildSystem(project_repos='olena', '/lrde/dev/linux-x86/intel/Compiler/11.0/081/tbb/ia32/cc4.1.0_libc2.4_kernel2.6.16.21/lib']), distcheck_configure_args='CC="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icc" \ CXX="ccache /lrde/dev/linux-x86/intel/Compiler/11.0/081/bin/ia32/icpc" \ + PYTHON=python2.5 \ --disable-dependency-tracking \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ @@ -269,6 +277,7 @@ f_oln_unix_gcc3 = GNUBuildSystem(project_repos='olena', branch=mybranch, extra_configure_args='CC="ccache gcc-3.3" \ CXX="ccache g++-3.3" \ + PYTHON=python2.5 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all --disable-scribo', @@ -279,6 +288,7 @@ f_oln_unix_gcc3 = GNUBuildSystem(project_repos='olena', extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib', distcheck_configure_args='CC=\'ccache gcc-3.3\' \ CXX=\'ccache g++-3.3\' \ + PYTHON=python2.5 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ --without-magickxx \ --enable-all --disable-scribo' -- 1.7.2.5