- Projects

fd781b3: Do the necessary adjustments for the production BF
by Benoit Sigoure 18 Nov '07

18 Nov '07

URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/buildbot Git branch: master (HEAD: 11b299d) ChangeLog: 2007-11-18 Benoit Sigoure <tsuna(a)lrde.epita.fr> Do the necessary adjustments for the production BF. * masters/apache_bf.conf: Adjust and add the various reverse proxies to access the WebStatus from buildfarm.lrde.org. * masters/buildfarm.sh (BUILDBOT_ROOT): Adjust. * masters/menu.html: Add a link to the home page. * masters/oln_master.cfg, * masters/vaucanson_master.cfg: Password protect the WebStatus. * masters/www/index.php: Adjust. --- masters/ChangeLog | 11 +++++++++++ masters/apache_bf.conf | 33 +++++++++++++++------------------ masters/buildfarm.sh | 2 +- masters/menu.html | 1 + masters/oln_master.cfg | 5 +++-- masters/vaucanson_master.cfg | 5 +++-- masters/www/index.php | 9 ++++----- 7 files changed, 38 insertions(+), 28 deletions(-) diff --git a/masters/ChangeLog b/masters/ChangeLog index daf1ffd..299f6ad 100644 --- a/masters/ChangeLog +++ b/masters/ChangeLog @@ -1,3 +1,14 @@ +2007-11-18 Benoit Sigoure <tsuna(a)lrde.epita.fr> + + Do the necessary adjustments for the production BF. + * masters/apache_bf.conf: Adjust and add the various reverse proxies + to access the WebStatus from buildfarm.lrde.org. + * masters/buildfarm.sh (BUILDBOT_ROOT): Adjust. + * masters/menu.html: Add a link to the home page. + * masters/oln_master.cfg, + * masters/vaucanson_master.cfg: Password protect the WebStatus. + * masters/www/index.php: Adjust. + 2007-11-12 Benoit Sigoure <tsuna(a)lrde.epita.fr> Adjust the default URLs. diff --git a/masters/apache_bf.conf b/masters/apache_bf.conf index 42d1474..a46b6b6 100644 --- a/masters/apache_bf.conf +++ b/masters/apache_bf.conf @@ -1,25 +1,22 @@ # vim:ft=apache -Alias /buildfarm FIXME -Alias /releases FIXME +Alias /releases /work/build/releases # Handle typos. -Redirect permanent /release https://FIXME.lrde.epita.fr/releases - -<LocationMatch "/buildfarm"> - AuthType Basic - AuthName "BuildFarm Authentication" - AuthUserFile FIXME - Require valid-user -</LocationMatch> - -<LocationMatch "/releases"> - AuthType Basic - AuthName "Pre-Releases Authentication" - AuthUserFile FIXME - Require valid-user -</LocationMatch> +#XXX Redirect permanent /release https://buildfarm.lrde.org/releases +Redirect permanent /release http://buildfarm.lrde.org/releases +# Do not put anything after this line <IfModule mod_proxy.c> ProxyRequests Off ProxyVia On -</IfModule> # Do not put anything after this line + <Proxy *> + Order deny,allow + Allow from all + </Proxy> + + ProxyPass /oln/ http://127.0.0.1:8042/ + ProxyPassReverse /oln/ http://127.0.0.1:8042/ + + ProxyPass /vaucanson/ http://127.0.0.1:8043/ + ProxyPassReverse /vaucanson/ http://127.0.0.1:8043/ +</IfModule> diff --git a/masters/buildfarm.sh b/masters/buildfarm.sh index 56ba166..3ad9352 100755 --- a/masters/buildfarm.sh +++ b/masters/buildfarm.sh @@ -15,7 +15,7 @@ case "$1" in ;; esac -BUILDBOT_ROOT=${BUILDBOT_ROOT-.} +BUILDBOT_ROOT=${BUILDBOT_ROOT-~/buildbot} # Space separated list of directories where we found build masters. buildmasters='' diff --git a/masters/menu.html b/masters/menu.html index b7ed1c8..d034431 100644 --- a/masters/menu.html +++ b/masters/menu.html @@ -36,6 +36,7 @@ body { <body> <div id="nav"> <ul> + <li><a href="/" target="top">Home</a></li> <li><a href="waterfall" target="content">Waterfall</a></li> <li><a href="one_box_per_builder" target="content">Latest Build</a></li> <li><a href="one_line_per_build" target="content">Recent Builds</a></li> diff --git a/masters/oln_master.cfg b/masters/oln_master.cfg index af145af..72657fc 100644 --- a/masters/oln_master.cfg +++ b/masters/oln_master.cfg @@ -151,8 +151,9 @@ c['status'] = [] import os from buildbot.status import html -c['status'].append(html.WebStatus(http_port="tcp:8042:interface=0.0.0.0", - allowForce=True)) +c['status'].append(html.WebStatus(http_port="tcp:8042:interface=127.0.0.1", + allowForce=True, + userpass=[('build', 'glopglop')])) from buildbot.status import mail c['status'].append(mail.MailNotifier(fromaddr="buildbot(a)lrde.epita.fr", diff --git a/masters/vaucanson_master.cfg b/masters/vaucanson_master.cfg index 30a9ff9..78c3230 100644 --- a/masters/vaucanson_master.cfg +++ b/masters/vaucanson_master.cfg @@ -151,8 +151,9 @@ c['status'] = [] import os from buildbot.status import html -c['status'].append(html.WebStatus(http_port="tcp:8043:interface=0.0.0.0", - allowForce=True)) +c['status'].append(html.WebStatus(http_port="tcp:8043:interface=127.0.0.1", + allowForce=True, + userpass=[('build', 'glopglop')])) from buildbot.status import mail c['status'].append(mail.MailNotifier(fromaddr="buildbot(a)lrde.epita.fr", diff --git a/masters/www/index.php b/masters/www/index.php index c1141e3..0a19e47 100644 --- a/masters/www/index.php +++ b/masters/www/index.php @@ -15,18 +15,17 @@ <h2>Latest builds</h2> <a href="/releases/"><strong>All releases</strong></a> -- Total number of files: <span style="color:green"><?php - die('FIXME: path to /srv/releases'); - echo `find /srv/releases -type f | wc -l`; ?></span> + echo `find /work/build/releases -type f | wc -l`; ?></span> (<span style="color:green"><?php - echo rtrim(`du -hs /srv/releases | awk '{print $1}'`) - . rtrim(`df -h | awk '$1 == "/dev/sda2" { print " / " $2 }'`) + echo rtrim(`du -hs /work/build/releases | awk '{print $1}'`) + . rtrim(`df -h | awk '$1 == "/dev/hda1" { print " / " $2 }'`) . '</span>)'; ?><br> Latest releases: <table> <tbody> <?php -echo `export LANG=C; exec 2>&1; find /srv/releases -type f \ +echo `export LANG=C; exec 2>&1; find /work/build/releases -type f \ | perl -w -e ' use strict; use File::stat;

1 0

Release: svn-wrapper 0.4
by Tsuna 16 Nov '07

16 Nov '07

Ça faisait longtemps qu'il n'y avait pas eu de release, la version 0.4 de svn-wrapper est maintenant dispo. Je n'ai pas maintenu de fichier NEWS donc voici en gros ce qui a changé: - Modif majeure: support de Git (cf. plus bas) - B0rkenage des signatures GPG (ne pas utiliser pour l'instant :D) - Corrections de problèmes de portabilité sur Ash (shell par défaut sur GNU/Debian). - svn ignore se comporte (a peu près) comme la commande ignore de VCS. - Pleins de bug fixes, de "Do The Right Thing" et "Do What I Mean"[1]. Le script est maintenant hosté sur Git (http://repo.or.cz/w/svn-wrapper.git) et la prochaine update (svn-wrapper.sh self-update) va sûrement se plaindre, un truc du genre: Wow, you're more up to date than the master copy :) Your version is r241 and the master copy is r8. Downgrade? [y/N] Ce à quoi il faut juste répondre 'y' :) Sinon, méthode bourrin: wget 'http://repo.or.cz/w/svn-wrapper.git?a=blob_plain;f=svn-wrapper.sh;hb=HEAD' -O svn-wrapper.sh chmod a+x svn-wrapper.sh Le support de Git: Je n'utilise (presque) plus SVN. Pour interagir avec les dépôts SVN, j'utilise git-svn qui s'avère être un client SVN largement supérieur à `svn' lui-même. J'avais donc besoin d'avoir les mêmes fonctionnalités que svn-wrapper mais pour Git. Le script détecte donc automatiquement les dépots Git et les dépots SVN, et "Does The Right Thing" en fonction du SCM utilisé. Les signatures GPG: Pour l'instant j'utilisais une signature GPG-inline ce qui est chiant car elle rends le patch dur à lire/extraire dans les mail readers qui ne décodent pas le mail correctement. J'ai donc tenté d'implémenter l'envois de signature en attachement PGP/MIME mais ça ne marche pas (la signature envoyée est invalide, pour une raison qui m'échappe). J'avoue que je ne me suis pas trop soucié de ce problème qui traîne depuis plus de 2 mois puisque Git gère les tags signés avec GPG, je ne m'embête plus à signer chaque commit. Let me know if you run in troubles :) [1] En parlant de DWIM, Jim Meyering a releasé la 1.0 de son vc-dwim: http://lists.gnu.org/archive/html/bug-gnulib/2007-10/msg00135.html « vc-dwim is a version-control-agnostic ChangeLog diff and commit tool. vc-chlog is a ChangeLog writing helper tool. » J'ai pas encore eu le temps de regarder, mais il se peut bien que j'arrête de maintenir svnw si vc-dwim fait tout mieux ;) -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "I think Git is definitely in the running /EPITA\ Promo 2008.CSI/ACU/YAKA to be the dominate version control system." -- Bob Proulx

3 5

Re: [Projects] buildfarm r446: Add a buildfarm for Vaucanson
by Alexandre Duret-Lutz 16 Nov '07

16 Nov '07

>>> "The" == The LRDE Buildbot <tsuna(a)lrde.epita.fr> writes: The> URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk/buildbot/masters The> ChangeLog: The> 2007-11-08 Benoit Sigoure <tsuna(a)lrde.epita.fr> The> Add a buildfarm for Vaucanson. The> * vaucanson_master.cfg: New. The> * www/index.php: Link to the new waterfall. C'est cool ! À quelle adresse peut-on lire le résultat ? -- Alexandre Duret-Lutz

3 5

Patch Vcs
by Roland Levillain 16 Nov '07

16 Nov '07

Bonjour, Je viens de tomber sur un vieux patch (février 2007 !) qui traînait dans ma copie de travail des lrde-tools, concernant Vcs. Je l'applique ? Index: vcs/lib/vcs/mail.rb =================================================================== --- vcs/lib/vcs/mail.rb (revision 454) +++ vcs/lib/vcs/mail.rb (working copy) @@ -12,6 +12,9 @@ @@mailer ||= Sendmail.new @@default_options ||= { :mime => true, + # Use Latin-1 by default. + :charset => 'iso-8859-1', + :encoding => 'quoted-printable', :header => { 'X-Mailer' => "Vcs.mail (#{Vcs::Version})" } } cattr_accessor :mail_options @@ -37,9 +40,13 @@ from = header['From'] options.from = from[/<(.*)>/, 1] || from options.header.merge! header - options.header.symbolize_keys! return if header['To'].nil? rev = header['Revision'] + options.header['X-svn-url'] = url.read.chomp + options.header['X-svn-revision'] = rev + options.charset = 'iso-8859-1' + options.encoding = 'quoted-printable' + options.header.symbolize_keys! unless MAIL.exist? print_body(MAIL, options, files) end Index: vcs/lib/vcs/form.rb =================================================================== --- vcs/lib/vcs/form.rb (revision 454) +++ vcs/lib/vcs/form.rb (working copy) @@ -56,7 +56,7 @@ @@subject_format ||= '<%= Revision %>: <%= Title %>' - @@message_line ||= '--text follow this line--' + @@message_line ||= '--text follows this line--' def mk_form! ( files=[], options={} ) with_cache! Form, 'complete form (title, subject, ChangeLog entry, diff)' do

2 3

Re: [Projects] [LrdeTools] r454: Tool for checking guards of header files of a project
by Roland Levillain 15 Nov '07

15 Nov '07

Simon Nivault <simon.nivault(a)lrde.epita.fr> writes: > URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk > > ChangeLog: > 2007-11-15 Simon Nivault <simon.nivault(a)lrde.epita.fr> > > Tool for checking guards of header files of a project. > > * README: Add description. > * src/check-guards: New. Cool! > Index: trunk/src/check-guards > =================================================================== > --- trunk/src/check-guards (revision 0) > +++ trunk/src/check-guards (revision 454) > @@ -0,0 +1,39 @@ > +#!/bin/sh > + > +# Utility to check guards of header files. > +# Usage : ./check-guards BASE SUB... > +# > +# - BASE : Specify the root of the project. > +# For example, here an header file : > +# /home/user/proj1/prj/module1/header.hh > +# The path '/home/user/proj1/' should be used > +# if the expected guard for this file is > +# "PRJ_MODULE1_HEADER_HH". > +# Warning! BASE must end with one '/' > +# > +# - SUB : Specify the element you want to verify. > +# Those element can be either directories or files > +# and are expected to be located in BASE. > +# > +############################################################ > + > +base_dir=$1 > +shift > +loc=$@ > + > +for sub in $loc In fact, you can just write for sub here, and get rid of `loc' (by default, for iterates on `$@' [1]). > + do > + for file in $(find ${base_dir}$sub -name '*.hh') > + do > + expr1=$(echo "${file##$base_dir}" | tr "[:lower:]" "[:upper:]" | tr "[:punct:]" "_") It's still nice to use lines smaller than 80 columns (even in shell scripts!). :) > + expr2=$(cat $file | grep "#ifndef" | grep HH | cut -d ' ' -f 2) > + expr3=$(cat $file | grep "# define" | grep HH | cut -d ' ' -f 3) > + expr4=$(cat $file | grep "#endif" | grep HH | cut -d ' ' -f 4) Instead of cat file | cmd ... you can just write cmd <file ... (it saves a fork). > + if [ "$expr1" = "$expr2" -a "$expr1" = "$expr2" -a "$expr1" = "$expr2" ]; then Likewise with the 80 columns. Moreover, this lines looks weird. Didn't you want to write if [ "$expr1" = "$expr2" -a \ "$expr1" = "$expr3" -a \ "$expr1" = "$expr4" ]; then instead ? > + res=OK > + else > + res="KO, should be $expr1" > + fi > + echo "${file##$base_dir} : $res" > + done > +done > \ No newline at end of file Text files shall end with a newline character. > Index: trunk/README > =================================================================== > --- trunk/README (revision 453) > +++ trunk/README (revision 454) > @@ -139,6 +139,9 @@ > ** src/apatche > Send patches to a mailing list. > > +** src/check-gards > +Check recursivly all the guards of header files. s/recursivly/recursively/ s/header/C and C++ header/ Thanks for this contribution! :) Notes: [1] See Bash's manual for instance: for name [ in word ] ; do list ; done The list of words following in is expanded, generating a list of items. The variable name is set to each element of this list in turn, and list is executed each time. If the in word is omit- ted, the for command executes list once for each positional parameter that is set (see PARAMETERS below). The return status is the exit status of the last command that executes. If the expansion of the items following in results in an empty list, no commands are executed, and the return status is 0.

1 0

[LrdeTools] 454: src/diff-r: Fix the documentation.
by Roland Levillain 15 Nov '07

15 Nov '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * src/diff-r: Fix the documentation. diff-r | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: src/diff-r --- src/diff-r (revision 454) +++ src/diff-r (working copy) @@ -1,6 +1,6 @@ #! /bin/sh -# rdiff FROM TO -- diff two directories/tarballs ignoring annoying files. +# diff-r FROM TO -- diff two directories/tarballs ignoring annoying files. tmp=/tmp/rdiff-$$

1 0

[LrdeTools] r454: Tool for checking guards of header files of a project
by Simon Nivault 15 Nov '07

15 Nov '07

URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk ChangeLog: 2007-11-15 Simon Nivault <simon.nivault(a)lrde.epita.fr> Tool for checking guards of header files of a project. * README: Add description. * src/check-guards: New. --- README | 3 +++ src/check-guards | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) Index: trunk/src/check-guards =================================================================== --- trunk/src/check-guards (revision 0) +++ trunk/src/check-guards (revision 454) @@ -0,0 +1,39 @@ +#!/bin/sh + +# Utility to check guards of header files. +# Usage : ./check-guards BASE SUB... +# +# - BASE : Specify the root of the project. +# For example, here an header file : +# /home/user/proj1/prj/module1/header.hh +# The path '/home/user/proj1/' should be used +# if the expected guard for this file is +# "PRJ_MODULE1_HEADER_HH". +# Warning! BASE must end with one '/' +# +# - SUB : Specify the element you want to verify. +# Those element can be either directories or files +# and are expected to be located in BASE. +# +############################################################ + +base_dir=$1 +shift +loc=$@ + +for sub in $loc + do + for file in $(find ${base_dir}$sub -name '*.hh') + do + expr1=$(echo "${file##$base_dir}" | tr "[:lower:]" "[:upper:]" | tr "[:punct:]" "_") + expr2=$(cat $file | grep "#ifndef" | grep HH | cut -d ' ' -f 2) + expr3=$(cat $file | grep "# define" | grep HH | cut -d ' ' -f 3) + expr4=$(cat $file | grep "#endif" | grep HH | cut -d ' ' -f 4) + if [ "$expr1" = "$expr2" -a "$expr1" = "$expr2" -a "$expr1" = "$expr2" ]; then + res=OK + else + res="KO, should be $expr1" + fi + echo "${file##$base_dir} : $res" + done +done \ No newline at end of file Property changes on: trunk/src/check-guards ___________________________________________________________________ Name: svn:executable + * Index: trunk/README =================================================================== --- trunk/README (revision 453) +++ trunk/README (revision 454) @@ -139,6 +139,9 @@ ** src/apatche Send patches to a mailing list. +** src/check-gards +Check recursivly all the guards of header files. + ** src/g2b Change the compression system from Gzip to Bzip2.

1 0

Re: [Projects] [LrdeTools] 452: Add a script making installations of PySyck easier.
by Akim Demaille 14 Nov '07

14 Nov '07

>>> "RL" == Roland Levillain <roland(a)lrde.epita.fr> writes: > https://svn.lrde.epita.fr/svn/lrde-tools/trunk > This should ease the transition to PySyck 0.61 (which supports > multiple YAML document in a single file/stream) for Mac OS X users. > TC's generators should run fine with the programs installed by this script. Youpi ! Merci !

1 0

[LrdeTools] 453: Update README.
by Roland Levillain 14 Nov '07

14 Nov '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * README: Update paths and descriptions. README | 147 +++++++++++++++++++++++++++++++++-------------------- ics2mail/weekly.sh | 5 + 2 files changed, 96 insertions(+), 56 deletions(-) Index: README --- README (revision 452) +++ README (working copy) @@ -1,136 +1,173 @@ --*- text -*- +LRDE Tools -*- outline -*- -* ChangeLog management +The LRDE Tools provide a collection of utilities aimed at making the +life of developers easier. -** cl-date + +* ChangeLog Management +** changelog/cl-count +Report the number of ChangeLog entries per author. + +** changelog/cl-date Change the date format in ChangeLogs. -** cl-first +** changelog/cl-first Extract the first entry from ChangeLogs. -** cl-merge +** changelog/cl-merge Merge several ChangeLogs into one, sorting the entry. -** cl-prefix +** changelog/cl-prefix Prefix the files of a ChangeLog with a directory. Useful when moving ChangeLogs. -** cl-single-header +** changelog/cl-single-header Some people issue one ChangeLog header (date & author) per patch, other simply issue an empty line between ChangeLog entries sharing the same date & author. This program replaces subsequent equal headers in ChangeLog by empty lines. -** clcnt -Report the number of ChangeLog entries per author. +** src/cl2patch +Prepare a patch for application: change the date for ChangeLog entries. +* Diff utilities +** src/diffed +Manipulate patches in the diff format. -* CVS Utilities -** cvapply +** src/diff-r +Recursive diff between two files/tarballs. + +** src/xdiff +A wrapper around "diff" that recognize files by their extension +to provide heading for diff hunks. It is meant to completely +replace "diff" (but slaving it). + + +* Version Control Utilities + +** (Near-) Agnostic Version Control Utilities +*** src/checkin +An ancestor of Vcs and svn-wrapper. + +*** vcs/ +An extensibe Version Control System wrapper for Subversion, CVS, and +other VCS, written in Ruby. As of now, Vcs mainly supports +Subversion, and some CVS features. + +** CVS Utilities +*** src/cvapply Apply a batch of patches to a CVS repository. -** cvsfiles +*** src/cvsfiles List CVS-controlled files in a tree. -** cvsldup +*** src/cvsldup Duplicate a CVS tree locally. -** cvssnap +*** src/cvssnap Build a tarball with all CVS-controlled files. +** PRCS Utilities +*** prcs/ +Miscellaneous scripts for PRCS. See prcs/README for more details. -* PRCS Utilities -** prcommit -As clcommit: commit a version of a PRCS controlled project, adjusting -the New-Version-Log from the ChangeLog. - -** prcs-back +*** src/prcs-back Run backwards in the history of the project until a property is met. Useful to find origin of bugs. -** prcs-checkout +*** src/prcs-checkout Make sure that when a file is checked out, its time stamp is updated, so that "make" does its job. -** prcs-diff-cb +*** src/prcs-commit +As clcommit: commit a version of a PRCS controlled project, adjusting +the New-Version-Log from the ChangeLog. + +*** src/prcs-diff-cb A call back for prcs diff that can use this information to provide information in various forms. -** prcs-list-nonignored +*** src/prcs-list-nonignored Simple list of files not in the repository, and not ignored. Useful to check for files to add to the repository. -** prcs2cl +*** src/prcs2cl Wrap a proto ChangeLog entry based on prcs diff. -** Prcs2svn +*** prcs2svn/ Export an archive from PRCS to Subversion. -** prcsin +*** src/prcsin Put a tarball under PRCS. -** prdiff +*** src/prdiff Make clean diff between revision of a PRCS controlled project. - ** Subversion Utilities -** svn-populate -Subversion adaptation of prcs populate command. - -** svn-ignore +*** src/svn-ignore Quickly add ignore entries in subversion. Automatically determine the concerned directory. -** svndiff +*** src/svn-populate +Subversion adaptation of prcs populate command. + +*** src/svndiff A better svn diff. -* Miscellaneous utilities -** apatche -Send patches to a mailing list. -** cl2patch -Prepare a patch for application: change the date for ChangeLog entries. +* Automated Builds +** buildfarm/ +The (old) LRDE build farm, based on Samba's. + +** buildbot/ +Helper scripts for a BuiltBot-based build farm. -** diffed -Manipulate patches in the diff format. -** g2b +* Time Management and Calendars +** ics2mail/weekly.sh +Compute the number of work/busy hours from an ICS calendar hosted on a +Web server. + + +* Miscellaneous utilities +** metaInternshipSite/ +A generator for the mandatory Internship Web site EPITA (Ing) students are +expected to deliver at the end of their first internship (at the +beginning of ``Ing 2''). + +** src/apatche +Send patches to a mailing list. + +** src/g2b Change the compression system from Gzip to Bzip2. -** insist +** src/insist Repeatedly do something until it succeeds. -** install-on +** src/install-on Remotely install a package on a machine. ** src/install-pysyck Install PySyck from http://pyyaml.org. Useful under Mac OS X, whose MacPorts do not contain PySyck. -** rdiff -Recursive diff between two files/tarballs. - -** symbuild +** src/symbuild Easy navigation between source and build trees -** tarr +** src/tarr Quickly make tarballs. -** timeout +** src/timeout Run a command and killing it if it is too slow. -** whitespace +** src/whitespace Normalize whitespace uses in files. -** xdiff -A wrapper around "diff" that recognize files by their extension -to provide heading for diff hunks. It is meant to completely -replace "diff" (but slaving it). -- -Copyright (C) 2003 LRDE +Copyright (C) 2003, 2007 LRDE This file is part of LrdeTools. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Index: ics2mail/weekly.sh --- ics2mail/weekly.sh (revision 452) +++ ics2mail/weekly.sh (working copy) @@ -75,6 +75,9 @@ } } ' "$cal" | sed 's/é/�/g' -# if anyone can convert UTF8 to ascii automatically ... I didn't manage to. +# FIXME: if anyone can convert UTF8 to ascii automatically ... I +# didn't managed to. +# +# 2007-11-13: Use recode! -- Roland. rm "$cal"

1 0

[LrdeTools] 452: Add a script making installations of PySyck easier.
by Roland Levillain 13 Nov '07

13 Nov '07

https://svn.lrde.epita.fr/svn/lrde-tools/trunk This should ease the transition to PySyck 0.61 (which supports multiple YAML document in a single file/stream) for Mac OS X users. TC's generators should run fine with the programs installed by this script. BTW, If you know how to create Portfiles for the MacPorts, don't hesitate to propose one for PySyck and one (update) for Syck to the MacPorts maintainers. (I think I know understand why this project is called Syck...) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add a script making installations of PySyck easier. * src/install-pysyck: New installer. * README: Mention install-pysyck. README | 4 src/install-pysyck | 236 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+) Index: src/install-pysyck --- src/install-pysyck (revision 0) +++ src/install-pysyck (revision 0) @@ -0,0 +1,236 @@ +#! /bin/bash + +# The path of the script. +me="$0" + +# The (general) install prefix. +prefix="/usr/local" +# The install prefix for Syck. +syck_prefix="$prefix" +# The install prefix for PySyck. +pysyck_prefix="$prefix" + +# Syck URL. +syck_url="http://pyyaml.org/download/pysyck/syck-0.61+svn231+patches.tar.gz" +# PySyck URL +pysyck_url="http://pyyaml.org/download/pysyck/PySyck-0.61.2.tar.gz" + +# The name of the dowloaded Syck archive. +syck_archive="syck.tar.gz" +# The name of the dowloaded PySyck archive. +pysyck_archive="pysyck.tar.gz" + +# The sudo command used when installing files (empty by default). +sudo_command= +# Turn on debug mode? +debug_p=false + + +usage() +{ + # Using single quotes around EOF allows us to display backslashes (\) + # as expected in the output. + cat <<EOF +\`install-pysyck' downloads, builds and installs Syck and PySyck from +http://www.pyyaml.org. See http://www.pyyaml.org/wiki/PySyck for more +information. This script is especially useful on Mac OS X, since the +MacPorts do not provide (yet) a recent version of PySyck. + +Usage: $me [OPTION]... + +Defaults for the options are specified in brackets. + +General + -h, --help display this help and exit + +Installation directories + --prefix=PREFIX install files in PREFIX [/usr/local] + --syck-prefix=SYCK_PREFIX install Syck files in PREFIX [PREFIX] + --pysyck-prefix=PYSYCK_PREFIX install PySyck files in PREFIX [PREFIX] + +Installation + --sudo-command=SUDO_CMD prepend SUDO_CMD to installation statements [] + +Debug + --debug turn on debug mode (display every command) + +Examples: + $me --sudo=sudo + $me --prefix=/mnt/shared-tools --sudo="sudo -u admin" + $me --prefix=/usr/local/stow/pysyck + $me \\ + --syck-prefix=\$HOME/local/stow/syck-0.61+svn231+patches \\ + --pysyck-prefix=\$HOME/local/stow/PySyck-0.61.2 + +EOF + exit +} + +# MATCH_OPTION OPTION PREFIX +# -------------------------- +# Try to match OPTION at the beginning of PREFIX. Return 0 in case of +# success, 1 otherwise. +match_option() +{ + echo "$1" | grep -q "^$2" 2>/dev/null +} + +# ARGUMENT OPTION +# --------------- +# Get the argument of OPTION +argument() +{ + # I don't remember whether sed -r is portable... + echo "$1" | sed "s/[^=]\\+=\$.*\$/\\1/" +} + +# CLEANUP +# ------- +# Remove the work directory. +cleanup() +{ + rm -rf "$work_dir" +} + + +# Handle options. +for i; do + # Help. + match_option "$i" "-h" && usage + match_option "$i" "--help" && usage + # Prefix. + match_option "$i" "--prefix" && \ + prefix=$(argument "$i") && \ + syck_prefix="$prefix" && \ + pysyck_prefix="$prefix" \ + # Syck prefix. + match_option "$i" "--syck-prefix" && syck_prefix=$(argument "$i") + # PySyck prefix. + match_option "$i" "--pysyck-prefix" && pysyck_prefix=$(argument "$i") + # Sudo command. + match_option "$i" "--sudo-command" && sudo_command=$(argument "$i") + # Debug. + match_option "$i" "--debug" && debug_p=true +done + +# Ask for confirmation. +echo "Do you want to install Syck into $syck_prefix" +echo " and PySyck into $pysyck_prefix? (y/n)" +while true; do + read answer + case "$answer" in + y|yes*) + break + ;; + n|no*) + echo "Installation aborted." + exit 1 + ;; + *) + echo "Please answer \`y' or \`n'." + ;; + esac +done + +# Any failure is fatal. +set -e + +# Create a work directory +work_dir=$(mktemp -d /tmp/install-pysyck.XXXXXX) +# Clean up the working directory on SIGHUP, SIGINT, SIGQUIT, SIGTERM or +# an unexpected failure (ERR). +# This feature is disabled in debug mode, so that the user can look at +# the work directory after the script terminates. +debug_p || trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR +cd "$work_dir" + +# Information +echo "Work directory is $work_dir" +echo "Syck prefix is $syck_prefix" +echo "PySyck prefix is $pysyck_prefix" +test -n "$sudo_command" && echo "Sudo command is $sudo_command" +debug_p && echo "Debug mode on" + +# Turn on debug mode if requested so. +debug_p && set -x + +# Download. +echo "Downloading Syck from $syck_url..." +wget -O "$syck_archive" "$syck_url" +echo "Downloading PySyck from $pysyck_url..." +wget -O "$pysyck_archive" "$pysyck_url" + +## ------ ## +## Syck. ## +## ------ ## + +syck_srcdir=$(tar tzvf "$syck_archive" \ + | perl -n \ + -e "print \"\$1\\n\"" \ + -e " if (s,^.* ([^ /]*syck[^ /]+)/\$,\\1,)") +echo "Unpacking Syck into $syck_srcdir..." +tar xzf "$syck_archive" +cd "$syck_srcdir" + +echo "Building Syck..." +./configure --prefix="$syck_prefix" +make +make check +echo "Installing Syck..." +eval "$sudo_command make install" +echo "Cleaning Syck build tree..." +make clean + +# Absolute prefix. +abs_syck_prefix=$(cd $syck_prefix && pwd) + +cd .. + + + +## -------- ## +## PySyck. ## +## -------- ## + +pysyck_srcdir=$(tar tzvf "$pysyck_archive" \ + | perl -n \ + -e "print \"\$1\\n\"" \ + -e " if (s,^.* ([^ /]*PySyck[^ /]+)/\$,\\1,)") +echo "Unpacking PySyck into $pysyck_srcdir..." +tar xzf "$pysyck_archive" +cd "$pysyck_srcdir" + +echo "Patching setup.cfg..." +cat <<EOF | patch +--- setup.cfg.orig 2007-11-13 23:28:01.000000000 +0100 ++++ setup.cfg 2007-11-13 23:30:44.000000000 +0100 +@@ -4,8 +4,8 @@ + [build_ext] + + # List of directories to search for 'syck.h' (separated by ':'). +-#include_dirs=/usr/local/include:../../include ++include_dirs=${abs_syck_prefix}/include:/usr/local/include:../../include + + # List of directories to search for 'libsyck.a' (separated by ':'). +-#library_dirs=/usr/local/lib:../../lib ++library_dirs=${abs_syck_prefix}/lib:/usr/local/lib:../../lib + + +EOF +echo "Installing PySyck..." +eval "$sudo_command python setup.py install --prefix=\"$pysyck_prefix\"" +echo "Cleaning PySyck build tree..." +python setup.py clean + +# Absolute prefix. +abs_pysyck_prefix=$(cd $pysyck_prefix && pwd) + +cd .. + +# The end. +echo +echo "======================================================================" +echo "Syck and PySyck installed successfully! Don't forget to update" +echo "your PYTHONPATH to use the freshly installed PySyck" +echo "(e.g., pre/append $abs_pysyck_prefix/lib/python2.5/site-packages)." +echo "======================================================================" Property changes on: src/install-pysyck ___________________________________________________________________ Name: svn:executable + * Index: README --- README (revision 451) +++ README (working copy) @@ -104,6 +104,10 @@ ** install-on Remotely install a package on a machine. +** src/install-pysyck +Install PySyck from http://pyyaml.org. Useful under Mac OS X, whose +MacPorts do not contain PySyck. + ** rdiff Recursive diff between two files/tarballs.

1 0