Projects September 2011

projects@lrde.epita.fr

2 participants
9 discussions

by Olena Trac

#205: Repair the TracNav bar ------------------------+--------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: defect | Status: new Priority: minor | Milestone: Component: Trac | Version: 1.0 Keywords: system web | ------------------------+--------------------------------------------------- Since the update of Trac, many Wiki pages using the !TracNav plug-in won't display the !TracNav bar (menu on the right of some pages), and show this error instead : {{{ Error: Failed to load processor TracNav No macro or processor named 'TracNav' found }}} The curious thing is, the !TracNav bar is working ''sometimes''!! To see this in action, try reloading a page several times (e.g. CodingStyle): sometimes you'll see the bar, other times you'll get the error. I assume other Tracs ([https://trac.lrde.org/vaucanson/ Vaucanson's], [https://trac.lrde.org/transformers/ Transfomers'], etc.) face the same problem; we should discuss this issue with their maintainers. Therefore I (Roland) am cc'ing this ticket to the `projects` mailing list as well. -- Ticket URL: <https://trac.lrde.org/olena/ticket/205> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

9 years, 11 months

Flux RSS des News du site Web d'Olena

by Roland Levillain

J'ai hacké une page TWiki cette après-midi pour engendrer un flux RSS à partir d'une page de news. Le flux RSS en question est ici : http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/NewsRss?skin=rss Il est produit à partir de la page de news suivante : http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/News (Note : les cinq premiers items (= les cinq dernières nouvelles) de cette page de news sont aussi automatiquement affichés sur la home page du site Web d'Olena, à l'instar de ce qui est fait sur la page d'accueil du labo.) Cette solution me semble plus pratique que ce que TWiki proposait jusqu'ici, à savoir produire un flux RSS produisant un item par page modifiée (avec la possibilité de restreindre l'ensemble des pages considérées). Vous pouvez jeter un oeil à la page proposée par défaut par TWiki ici : http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/WebRss?skin=rss Concrètement, obtenir un flux de news avec ce système implique d'écrire une page par item ! Trop lourd IMHO. Concernant ma proposition, celle-ci est cependant fragile et contraignante. En effet, la page `NewsRss' attend de la part de la page `News' qu'elle respecte un certain format (notamment, la présence d'une date au format YYYY-MM-DD-THH:MMZ dans une ancre <a>). Le format RSS (1.0) est également contraignant : il refuse des choses comme ` '. Malgré tout, ça me semble être une solution acceptable vu notre TWiki antédiluvien (mais qui ne marche pas si mal après tout). Il faudra juste faire attention lorsque nous irons éditer `News' et vérifier que `NewsRss' fonctionne toujours. À ce sujet, il est utile de s'aider d'un les vérificateur RSS, comme ceux-ci : http://feedvalidator.org/ http://validator.w3.org/feed/ Je vous laisse tester le flux RSS (http://www.lrde.epita.fr/cgi-bin/twiki/view/Olena/NewsRss?skin=rss) avec vos agrégateurs avant de diffuser son URL. En effet, celui-ci n'est pas encore référencé sur le site Web d'Olena, ni dans les en-têtes/méta-données des pages du site. (Je mets en copie la liste des projets du labo, car d'autres projets sont susceptibles d'être intéressés par ce message.)

12 years, 7 months

lrde-tools branch master updated: 4ee9cfba6fc9ad34703c516a5bd951f918841f1f

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch master has been updated via 4ee9cfba6fc9ad34703c516a5bd951f918841f1f (commit) from 8eac80027f46e013c5dd06d1a22865b6512dcf8b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 4ee9cfb Remove build master for the old Subversion branch cleanup-2008. ----------------------------------------------------------------------- Summary of changes: buildbot/masters/ChangeLog | 6 + buildbot/masters/oln-cleanup-2008_master.cfg | 191 -------------------------- 2 files changed, 6 insertions(+), 191 deletions(-) delete mode 100644 buildbot/masters/oln-cleanup-2008_master.cfg hooks/post-receive -- UNNAMED PROJECT

12 years, 7 months

4ee9cfb Remove build master for the old Subversion branch cleanup-2008.

by Roland Levillain

* oln-cleanup-2008_master.cfg: Remove. --- buildbot/masters/ChangeLog | 6 + buildbot/masters/oln-cleanup-2008_master.cfg | 191 -------------------------- 2 files changed, 6 insertions(+), 191 deletions(-) delete mode 100644 buildbot/masters/oln-cleanup-2008_master.cfg diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index 5011ba9..372f78d 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,9 @@ +2011-09-13 Roland Levillain <roland(a)lrde.epita.fr> + + Remove build master for the old Subversion branch cleanup-2008. + + * oln-cleanup-2008_master.cfg: Remove. + 2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> Use Python 2.5 in all Olena builds. diff --git a/buildbot/masters/oln-cleanup-2008_master.cfg b/buildbot/masters/oln-cleanup-2008_master.cfg deleted file mode 100644 index d762f77..0000000 --- a/buildbot/masters/oln-cleanup-2008_master.cfg +++ /dev/null @@ -1,191 +0,0 @@ -# -*- python -*- -# ex: set syntax=python: -# vi: set ft=python: -# Doc @ http://buildbot.sourceforge.net/manual-0.7.4.html#Config-File-Format - -c = BuildmasterConfig = {} - -####### PROJECT IDENTITY -# http://buildbot.sourceforge.net/manual-0.7.4.html#Defining-the-Project - -c['projectName'] = 'Olena' -c['projectURL'] = 'https://oln.lrde.org/' - -# the 'buildbotURL' string should point to the location where the buildbot's -# internal web server (usually the html.Waterfall page) is visible. This -# typically uses the port number set in the Waterfall 'status' entry, but -# with an externally-visible host name which the buildbot cannot figure out -# without some help. - -c['buildbotURL'] = 'https://build.lrde.org/buildfarm/oln-cleanup-2008/' - -# 'slavePortnum' defines the TCP port to listen on. This must match the value -# configured into the buildslaves (with their --master option) - -c['slavePortnum'] = 9946 - -####### CHANGESOURCES -# http://buildbot.sourceforge.net/manual-0.7.4.html#Listing-Change-Sources-an… -# http://buildbot.sourceforge.net/manual-0.7.4.html#Getting-Source-Code-Chang… - -# the 'change_source' list tells the buildmaster how it should find out about -# source code changes. Any class which implements IChangeSource can be added -# to this list: there are several in buildbot/changes/*.py to choose from. - -import buildbot.changes.pb -c['change_source'] = [buildbot.changes.pb.PBChangeSource()] - -####### SCHEDULERS -# http://buildbot.sourceforge.net/manual-0.7.4.html#Listing-Change-Sources-an… - -## configure the Schedulers - -from buildbot.scheduler import AnyBranchScheduler -c['schedulers'] = [] -c['schedulers'].append(AnyBranchScheduler(name='all', branches=None, - treeStableTimer=10*60, - # When a change occurs, wait 10 minutes before - # lunching the build. - builderNames=['i486-linux-gnu-gcc-4.2'])) - - -####### BUILDSLAVES -# http://buildbot.sourceforge.net/manual-0.7.4.html#Buildslave-Specifiers - -# the 'slaves' list defines the set of allowable buildslaves. Each element is a -# tuple of bot-name and bot-password. These correspond to values given to the -# buildslave's mktap invocation. -from buildbot.buildslave import BuildSlave -c['slaves'] = [BuildSlave('bot-linux-gcc4', '^*M,OC.f[)a;Tn'), - ] - -####### BUILDERS -# http://buildbot.sourceforge.net/manual-0.7.4.html#Defining-Builders - -# the 'builders' list defines the Builders. Each one is configured with a -# dictionary, using the following keys: -# name (required): the name used to describe this bilder -# slavename (required): which slave to use, must appear in c['slaves'] -# builddir (required): which subdirectory to run the builder in -# factory (required): a BuildFactory to define how the build is run - -# buildbot/process/factory.py provides several BuildFactory classes you can -# start with, which implement build processes for common targets (GNU -# autoconf projects, CPAN perl modules, etc). The factory.BuildFactory is the -# base class, and is configured with a series of BuildSteps. When the build -# is run, the appropriate buildslave is told to execute each Step in turn. - -# the first BuildStep is typically responsible for obtaining a copy of the -# sources. There are source-obtaining Steps in buildbot/process/step.py for -# CVS, SVN, and others. - -builders = [] -from buildfactory import GNUBuildSystem - -mybranch='branches/cleanup-2008' - -f_oln_unix = GNUBuildSystem(project_repos='oln', - project_name='oln-cleanup-2008', - branch=mybranch, - upload_cmd=None, - copy_mode='clobber') - -# f_oln_unix_gcc3 = GNUBuildSystem(project_repos='oln', -# project_name='oln-cleanup-2008', -# branch=mybranch, -# extra_configure_args='CC=gcc-3.3 CXX=g++-3.3', -# install_dir='oln-cleanup-2008_gcc3') -# -# f_oln_mingw = GNUBuildSystem(project_repos='oln', -# project_name='oln-cleanup-2008', -# branch=mybranch, -# extra_configure_args='--host=mingw32 --build=i686-pc-cygwin') -# -# f_oln_vcxx = GNUBuildSystem(project_repos='oln', -# project_name='oln-cleanup-2008', -# branch=mybranch, -# extra_configure_args='''CC=cccl CXX=cccl LD=cccl \\ -# && sed "s/^host=.*/host=\'i686-pc-msvc++8\'/" -i config.log''') -# -# builder_oln_winxp_mingw = {'name': 'mingw32-gcc-3.4.5', -# 'slavename': 'bot-winxp-mingw', -# 'builddir': 'oln_winxp_mingw', -# 'factory': f_oln_mingw -# } -# builder_oln_winxp_vcxx = {'name': 'winxp-vcxx8', -# 'slavename': 'bot-winxp-vcxx', -# 'builddir': 'oln_winxp_vcxx', -# 'factory': f_oln_vcxx -# } -# builder_oln_macppc = {'name': 'powerpc-apple-darwin8-gcc-4.0.1', -# 'slavename': 'bot-macppc', -# 'builddir': 'oln_macppc', -# 'factory': f_oln_unix -# } -# builder_oln_macx86 = {'name': 'i686-apple-darwin8-gcc-4.0.1', -# 'slavename': 'bot-macx86', -# 'builddir': 'oln_macx86', -# 'factory': f_oln_unix -# } -builder_oln_linux_gcc4 = {'name': 'i486-linux-gnu-gcc-4.2', - 'slavename': 'bot-linux-gcc4', - 'builddir': 'oln_linux_gcc4', - 'factory': f_oln_unix - } -# builder_oln_linux_gcc3 = {'name': 'i486-linux-gnu-gcc-3.3', -# 'slavename': 'bot-linux-gcc3', -# 'builddir': 'oln_linux_gcc3', -# 'factory': f_oln_unix_gcc3 -# } -# -c['builders'] = [builder_oln_linux_gcc4, - ] - -####### STATUS TARGETS -# http://buildbot.sourceforge.net/manual-0.7.4.html#Status-Delivery - -# 'status' is a list of Status Targets. The results of each build will be -# pushed to these targets. buildbot/status/*.py has a variety to choose from, -# including web pages, email senders, and IRC bots. - -c['status'] = [] - -from buildbot.status import html -from buildbot.status.web.authentication import LDAPAuth -c['status'].append(html.WebStatus(http_port="tcp:8046:interface=127.0.0.1", - allowForce=True, - auth=LDAPAuth('beyrouth.lrde.epita.fr', - 'ou=people,dc=lrde,dc=epita,dc=fr'))) - -from buildbot.status import mail -c['status'].append(mail.MailNotifier(fromaddr="buildbot(a)lrde.epita.fr", - lookup="lrde.epita.fr", - mode="problem", - sendToInterestedUsers=True)) -# -# from buildbot.status import words -# c['status'].append(words.IRC(host="irc.example.com", nick="bb", -# channels=["#example"])) -# -# from buildbot.status import client -# c['status'].append(client.PBListener(9988)) - - -####### DEBUGGING OPTIONS - -# if you set 'debugPassword', then you can connect to the buildmaster with -# the diagnostic tool in contrib/debugclient.py . From this tool, you can -# manually force builds and inject changes, which may be useful for testing -# your buildmaster without actually commiting changes to your repository (or -# before you have a functioning 'change_source' set up). The debug tool uses the -# same port number as the slaves do: 'slavePortnum'. - -#c['debugPassword'] = "debugpassword" - -# if you set 'manhole', you can ssh into the buildmaster and get an -# interactive python shell, which may be useful for debugging buildbot -# internals. It is probably only useful for buildbot developers. You can also -# use an authorized_keys file, or plain telnet. -#from buildbot import manhole -#c['manhole'] = manhole.PasswordManhole("tcp:9999:interface=127.0.0.1", -# "admin", "password") -- 1.7.2.5

12 years, 7 months

lrde-tools branch master updated: 8eac80027f46e013c5dd06d1a22865b6512dcf8b

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch master has been updated via 8eac80027f46e013c5dd06d1a22865b6512dcf8b (commit) from a3a51b0c60ab7bc6ad94ba89c20c1bc7b6834d6a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 8eac800 Use Python 2.5 in all Olena builds. ----------------------------------------------------------------------- Summary of changes: buildbot/masters/ChangeLog | 6 ++++++ buildbot/masters/oln_master.cfg | 14 ++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) hooks/post-receive -- UNNAMED PROJECT

12 years, 7 months

8eac800 Use Python 2.5 in all Olena builds.

by Roland Levillain

* 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

12 years, 7 months

lrde-tools branch master updated: a3a51b0c60ab7bc6ad94ba89c20c1bc7b6834d6a

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "UNNAMED PROJECT". The branch master has been updated via a3a51b0c60ab7bc6ad94ba89c20c1bc7b6834d6a (commit) via 75d58963963889c68a7e630a169256fe2241e6eb (commit) from c2af7744895206f9460ce2927c7ed7238a7161a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- a3a51b0 Replace the Olena build using GCC 4.1 by a build using GCC 4.4. 75d5896 Support the generation of SCM statistics. ----------------------------------------------------------------------- Summary of changes: buildbot/masters/ChangeLog | 14 ++++++++++++++ buildbot/masters/buildfactory.py | 22 ++++++++++++++++++++-- buildbot/masters/oln_master.cfg | 17 +++++++++-------- 3 files changed, 43 insertions(+), 10 deletions(-) hooks/post-receive -- UNNAMED PROJECT

12 years, 7 months

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

by Roland Levillain

* 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

12 years, 7 months

75d5896 Support the generation of SCM statistics.

by Roland Levillain

* buildfactory.py (GNUBuildSystem.__init__) (QMakeBuildSystem.__init__): Here. --- buildbot/masters/ChangeLog | 7 +++++++ buildbot/masters/buildfactory.py | 22 ++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/buildbot/masters/ChangeLog b/buildbot/masters/ChangeLog index f7990fb..b27b032 100644 --- a/buildbot/masters/ChangeLog +++ b/buildbot/masters/ChangeLog @@ -1,3 +1,10 @@ +2011-09-12 Roland Levillain <roland(a)lrde.epita.fr> + + Support the generation of SCM statistics. + + * buildfactory.py (GNUBuildSystem.__init__) + (QMakeBuildSystem.__init__): Here. + 2011-01-13 Roland Levillain <roland(a)lrde.epita.fr> Help seattle find Qt4 tools (qmake, moc, uic). diff --git a/buildbot/masters/buildfactory.py b/buildbot/masters/buildfactory.py index 632ea03..5e30e6f 100644 --- a/buildbot/masters/buildfactory.py +++ b/buildbot/masters/buildfactory.py @@ -52,7 +52,7 @@ class GNUBuildSystem(BuildFactory): def __init__ (self, project_repos, project_name="", kernel_path=None, extra_configure_args="", - scm_step="", bootstrap_cmd="", configure_cmd="", + scm_step="", scmstats_cmd="", bootstrap_cmd="", configure_cmd="", compile_cmd="", check_cmd="", install_cmd="", install_dir=None, upload_cmd="", distcheck_cmd="", distcheck_configure_args="", dist_cmd="", extra_path=None, @@ -122,6 +122,15 @@ class GNUBuildSystem(BuildFactory): self.install_dir = install_dir home_inst_path = '$HOME/built/' + self.install_dir + if scmstats_cmd == "": + self.scmstats_cmd = None + else: + self.scmstats_cmd = scmstats_cmd + if self.scmstats_cmd is not None: + self.addStep(step.ShellCommand, command=self.scmstats_cmd, + description='Updating SCM Stats', + descriptionDone='SCM Stats Updated', name='scmstats_update') + if bootstrap_cmd == "": self.bootstrap_cmd = './bootstrap' else: @@ -303,7 +312,7 @@ class QMakeBuildSystem(BuildFactory): """ def __init__ (self, project_repos, - project_name="", extra_qmake_args="", scm_step="", + project_name="", extra_qmake_args="", scm_step="", scmstats_cmd=None, bootstrap_cmd=None, configure_cmd="", compile_cmd="", check_cmd=None, install_cmd=None, install_dir=None, upload_cmd=None, extra_path=None, branch=""): @@ -356,6 +365,15 @@ class QMakeBuildSystem(BuildFactory): description='bootstrapping', descriptionDone='bootstrap', name='bootstrap') + if scmstats_cmd == "": + self.scmstats_cmd = None + else: + self.scmstats_cmd = ['lrde-scmstats.sh', '/tmp/built/' + self.install_dir] + if self.scmstats_cmd is not None: + self.addStep(step.ShellCommand, command=self.scmstats_cmd, + description='Updating SCM Stats', + descriptionDone='SCM Stats Updated', name='scmstats_update') + if configure_cmd == "": self.configure_cmd = 'echo Using *.pro; qmake *.pro ' + self.extra_qmake_args else: -- 1.7.2.5

12 years, 7 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Projects September 2011