[Projects] a3a51b0 Replace the Olena build using GCC 4.1 by a build using GCC 4.4.

* oln_master.cfg: Here. Enable SCM statistics generation for this build. --- buildbot/masters/ChangeLog | 7 +++++++ buildbot/masters/oln_master.cfg | 17 +++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index b27b032..8d68dea 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,5 +1,12 @@ 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. + Enable SCM statistics generation for this build. + +2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + Support the generation of SCM statistics. * buildfactory.py (GNUBuildSystem.__init__) diff --git a/buildbot/masters/oln_master.cfg b/buildbot/masters/oln_master.cfg index 1b2ddfd..99036d6 100644 --- a/buildbot/masters/oln_master.cfg +++ b/buildbot/masters/oln_master.cfg @@ -50,7 +50,7 @@ c['schedulers'].append(AnyBranchScheduler(name='all', branches=None, # 2010-07-30: Disabled. # 'powerpc-apple-darwin8-gcc-4.0.1', 'i486-linux-gnu-gcc-3.3', - 'i486-linux-gnu-gcc-4.1', + 'i486-linux-gnu-gcc-4.4', 'i486-linux-gnu-gcc-4.2', 'i486-linux-gnu-icc-11.0', 'i486-linux-gnu-icc-10.1', @@ -110,11 +110,11 @@ mybranch = "master" # milena/tests/io/magick fail with a SEGV. Hence the addition of the # `--without-magickxx' flag to most configurations below. -f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', +f_oln_unix_gcc_4_4 = GNUBuildSystem(project_repos='olena', project_name='olena', scm_step=checkout, branch=mybranch, - extra_configure_args='CXX="ccache g++-4.1" CC="ccache gcc-4.1" \ + extra_configure_args='CXX="ccache g++-4.4" CC="ccache gcc-4.4" \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -125,7 +125,7 @@ f_oln_unix_gcc_4_1 = GNUBuildSystem(project_repos='olena', upload_cmd=None, extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib', check_cmd='make -k check', - distcheck_configure_args='CCX=\'ccache g++-4.1\' CC=\'ccache gcc-4.1\' \ + distcheck_configure_args='CCX=\'ccache g++-4.4\' CC=\'ccache gcc-4.4\' \ QMAKE=/usr/bin/qmake-qt4 MOC=/usr/bin/moc-qt4 \ UIC=/usr/bin/uic-qt4 \ --with-gdcm=/lrde/dev/linux-x86/stable/gdcm \ @@ -171,6 +171,7 @@ f_oln_unix_gcc_4_2 = GNUBuildSystem(project_repos='olena', install_cmd=None, dist_cmd=None, extra_ld_library_path='/lrde/dev/linux-x86/stable/gdcm/lib', + scmstats_cmd=['./lrde-scmstats.sh', WithProperties('%(branch)s')], upload_cmd=['./lrde-upload.sh', WithProperties('%(branch)s')], check_cmd='make -k check', distcheck_configure_args='CXX=\'ccache g++-4.2\' \ @@ -296,10 +297,10 @@ builder_oln_linux_gcc3 = {'name': 'i486-linux-gnu-gcc-3.3', 'factory': f_oln_unix_gcc3 } -builder_oln_linux_gcc4_1 = {'name': 'i486-linux-gnu-gcc-4.1', +builder_oln_linux_gcc4_4 = {'name': 'i486-linux-gnu-gcc-4.4', 'slavename': 'bot-linux-gcc4', - 'builddir': 'oln_linux_gcc4_1', - 'factory': f_oln_unix_gcc_4_1 + 'builddir': 'oln_linux_gcc4_4', + 'factory': f_oln_unix_gcc_4_4 } builder_oln_linux_gcc4_2 = {'name': 'i486-linux-gnu-gcc-4.2', @@ -330,7 +331,7 @@ c['builders'] = [ # 2010-07-30: Disabled. # builder_oln_macppc, builder_oln_linux_gcc3, - builder_oln_linux_gcc4_1, + builder_oln_linux_gcc4_4, builder_oln_linux_gcc4_2, builder_oln_linux_icc_10, builder_oln_linux_icc_11, -- 1.7.2.5