- Olena-patches

olena: olena-2.0-561-g017deaf Make mln::util::timer copy-constructible and (copy-)assignable.
by Roland Levillain 18 Jun '13

18 Jun '13

* mln/util/timer.hh: Rely on the default copy constructor and the default (copy-)assignment operator. --- milena/ChangeLog | 7 +++++++ milena/mln/util/timer.hh | 15 --------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f39e9e5..318d02e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-06-18 Roland Levillain <roland(a)lrde.epita.fr> + + Make mln::util::timer copy-constructible and (copy-)assignable. + + * mln/util/timer.hh: Rely on the default copy constructor and + the default (copy-)assignment operator. + 2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> Shell-related portability fixes in Milena's Makefiles. diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 7afff72..adfebef 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -49,13 +49,6 @@ namespace mln timer(); - // Explicit copy constructor (in most cases should not be - // used...). - explicit timer(const timer&); - - // Without impl. - void operator=(const timer&); - ~timer(); void start(); @@ -105,14 +98,6 @@ namespace mln } inline - timer::timer(const timer& t) - { - running_ = t.running_; - start_ = t.start_; - time_ = t.time_; - } - - inline timer::~timer() { reset(); -- 1.7.10.4

1 0

olena: olena-2.0-560-g808ccde Tell Git to ignore build-aux/test-driver.
by Roland Levillain 17 Jun '13

17 Jun '13

--- build-aux/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/build-aux/.gitignore b/build-aux/.gitignore index e727daf..14ddc68 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -17,4 +17,5 @@ /py-compile /*.rej /*TAGS +/test-driver /texinfo.tex -- 1.7.10.4

1 0

olena: olena-2.0-556-gf00d513 Use `perl -pi' instead of `sed -i' in Scribo.
by Roland Levillain 17 Jun '13

17 Jun '13

* doc/Makefile.am, * doc/tools/todoxygen.sh: Here, as `sed -i' (with no backup file) behaves differently on GNU/Linux and Mac OS X. For more information, see: http://stackoverflow.com/questions/5694228/. --- scribo/ChangeLog | 10 ++++++++++ scribo/doc/Makefile.am | 25 +++++++++++++------------ scribo/doc/tools/todoxygen.sh | 23 ++++++++++++----------- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 90de65c..b357b08 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Scribo. + + * doc/Makefile.am, + * doc/tools/todoxygen.sh: + Here, as `sed -i' (with no backup file) behaves differently on + GNU/Linux and Mac OS X. For more information, see: + http://stackoverflow.com/questions/5694228/. + 2013-04-26 Guillaume Lazzara <z(a)lrde.epita.fr> * scribo/binarization/sauvola_ms_split.hh: Make use of all arguments. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 8579a87..5e0dec9 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,9 +99,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -182,9 +182,9 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ - -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ - $(DEVEL_REFMAN).tmp/html/index.html + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(DEVEL_REFMAN),g" \ + $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @mv -f $@.tmp $@ @@ -238,9 +238,9 @@ install-data-local: $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ - `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g;" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ + `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ @@ -265,6 +265,7 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g" \ - -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + perl -pi \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/scribo/doc/tools/todoxygen.sh b/scribo/doc/tools/todoxygen.sh index 0a85632..29199ae 100755 --- a/scribo/doc/tools/todoxygen.sh +++ b/scribo/doc/tools/todoxygen.sh @@ -2,7 +2,8 @@ # todoxygen.sh: Turn HTML files into suitable inputs for doxygen. -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -33,18 +34,18 @@ echo '\htmlonly' >> $out tail -n $tail_line $html >> $out echo '\endhtmlonly */' >> $out -sed -i -e 's/&#XA0/\&nbsp/g' $out -sed -i -e 's/&#X21A6/\&map/g' $out -sed -i -e 's/&#X2019/\&rsquo/g' $out -sed -i -e 's/&#X2192/\&rarr/g' $out -sed -i -e 's/&#X201C/\&ldquo/g' $out -sed -i -e 's/&#X201D/\&rdquo/g' $out -sed -i -e 's/&#X2261/\&equiv/g' $out +perl -pi -e 's/&#XA0/\&nbsp/g' $out +perl -pi -e 's/&#X21A6/\&map/g' $out +perl -pi -e 's/&#X2019/\&rsquo/g' $out +perl -pi -e 's/&#X2192/\&rarr/g' $out +perl -pi -e 's/&#X201C/\&ldquo/g' $out +perl -pi -e 's/&#X201D/\&rdquo/g' $out +perl -pi -e 's/&#X2261/\&equiv/g' $out # Doxygen wants us to preserve '\n' after commands. # \ref and \see do not need that extra new line. for keyword in include section page subpage subsection subsubsection image; do - sed -i -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out - sed -i -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out - sed -i -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out + perl -pi -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out + perl -pi -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out + perl -pi -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out done -- 1.7.10.4

1 0

olena: olena-2.0-555-g0119758 Use `perl -pi' instead of `sed -i' in Milena.
by Roland Levillain 17 Jun '13

17 Jun '13

* doc/Makefile.am, * doc/tools/clearbanner.sh, * doc/tools/todoxygen.sh: Here, as `sed -i' (with no backup file) behaves differently on GNU/Linux and Mac OS X. For more information, see: http://stackoverflow.com/questions/5694228/. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 19 ++++++++++--------- milena/doc/tools/clearbanner.sh | 7 ++++--- milena/doc/tools/todoxygen.sh | 23 ++++++++++++----------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 28a569f..769d2d9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Milena. + + * doc/Makefile.am, + * doc/tools/clearbanner.sh, + * doc/tools/todoxygen.sh: + Here, as `sed -i' (with no backup file) behaves differently on + GNU/Linux and Mac OS X. For more information, see: + http://stackoverflow.com/questions/5694228/. + 2013-06-13 Roland Levillain <roland(a)lrde.epita.fr> Update the documentation of mln_trace. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 0ba5e58..3e70841 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -261,9 +261,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../../../doc/,g" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -348,8 +348,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ - $(DEVEL_REFMAN).tmp/html/index.html + perl -pi -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ + $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @mv -f $@.tmp $@ @@ -776,8 +776,9 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` + perl -pi \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/milena/$$d; \ @@ -802,5 +803,5 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/milena/doc/tools/clearbanner.sh b/milena/doc/tools/clearbanner.sh index d5f6b8c..81b1d91 100755 --- a/milena/doc/tools/clearbanner.sh +++ b/milena/doc/tools/clearbanner.sh @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -16,6 +17,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -sed -i -e 's,<HR SIZE=2><BLOCKQUOTE CLASS="quote">This document was translated from LATEX by,,g' $1 -sed -i -e 's,<A HREF="http://hevea.inria.fr/index.html">HEVEA</A>.</BLOCKQUOTE></BODY>,,g' $1 +perl -pi -e 's,<HR SIZE=2><BLOCKQUOTE CLASS="quote">This document was translated from LATEX by,,g' $1 +perl -pi -e 's,<A HREF="http://hevea.inria.fr/index.html">HEVEA</A>.</BLOCKQUOTE></BODY>,,g' $1 diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh index 0a85632..29199ae 100755 --- a/milena/doc/tools/todoxygen.sh +++ b/milena/doc/tools/todoxygen.sh @@ -2,7 +2,8 @@ # todoxygen.sh: Turn HTML files into suitable inputs for doxygen. -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -33,18 +34,18 @@ echo '\htmlonly' >> $out tail -n $tail_line $html >> $out echo '\endhtmlonly */' >> $out -sed -i -e 's/&#XA0/\&nbsp/g' $out -sed -i -e 's/&#X21A6/\&map/g' $out -sed -i -e 's/&#X2019/\&rsquo/g' $out -sed -i -e 's/&#X2192/\&rarr/g' $out -sed -i -e 's/&#X201C/\&ldquo/g' $out -sed -i -e 's/&#X201D/\&rdquo/g' $out -sed -i -e 's/&#X2261/\&equiv/g' $out +perl -pi -e 's/&#XA0/\&nbsp/g' $out +perl -pi -e 's/&#X21A6/\&map/g' $out +perl -pi -e 's/&#X2019/\&rsquo/g' $out +perl -pi -e 's/&#X2192/\&rarr/g' $out +perl -pi -e 's/&#X201C/\&ldquo/g' $out +perl -pi -e 's/&#X201D/\&rdquo/g' $out +perl -pi -e 's/&#X2261/\&equiv/g' $out # Doxygen wants us to preserve '\n' after commands. # \ref and \see do not need that extra new line. for keyword in include section page subpage subsection subsubsection image; do - sed -i -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out - sed -i -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out - sed -i -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out + perl -pi -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out + perl -pi -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out + perl -pi -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out done -- 1.7.10.4

1 0

olena: olena-2.0-554-g480f7d1 Use `perl -pi' instead of `sed -i' in Olena.
by Roland Levillain 17 Jun '13

17 Jun '13

* build-aux/mln_add_file, * doc/Makefile.am, * lrde-scmstats.sh: Here, as `sed -i' (with no backup file) behaves differently on GNU/Linux and Mac OS X. For more information, see: http://stackoverflow.com/questions/5694228/. --- ChangeLog | 11 +++++++++++ build-aux/mln_add_file | 8 ++++---- doc/Makefile.am | 23 ++++++++++++----------- lrde-scmstats.sh | 4 ++-- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c08e1b..b4cd1f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> + + Use `perl -pi' instead of `sed -i' in Olena. + + * build-aux/mln_add_file, + * doc/Makefile.am, + * lrde-scmstats.sh: + Here, as `sed -i' (with no backup file) behaves differently on + GNU/Linux and Mac OS X. For more information, see: + http://stackoverflow.com/questions/5694228/. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> Remove unstable viewer. diff --git a/build-aux/mln_add_file b/build-aux/mln_add_file index 193784b..d81112b 100755 --- a/build-aux/mln_add_file +++ b/build-aux/mln_add_file @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -173,7 +173,7 @@ create it." 1>&2 line=`grep -nE '^#endif // ! ' $output_dir/all.hh | tail -n 1 | cut -d ':' -f 1` line=$(($line - 1)) - sed -i "${line}i\# include <$1> + perl -pi -e "${line}i\# include <$1> " $output_dir/all.hh } @@ -196,12 +196,12 @@ create it." 1>&2 line=`grep -nE "_SOURCES = " $test_dir/Makefile.am | tail -n 1 | cut -d ':' -f 1` line=$(($line + 1)) - sed -i "${line}i${test_bname}_SOURCES = $test_name + perl -pi -e "${line}i${test_bname}_SOURCES = $test_name " $test_dir/Makefile.am line=`grep -nE '\\\' $test_dir/Makefile.am | grep -B 1 'CLEANFILES = ' | head -n 1 | cut -d ':' -f 1` line=$(($line + 1)) - sed -i "${line}i\\\t${test_bname} \\\\" $test_dir/Makefile.am + perl -pi -e "${line}i\\\t${test_bname} \\\\" $test_dir/Makefile.am } diff --git a/doc/Makefile.am b/doc/Makefile.am index 582f40a..e10944a 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,9 +121,9 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - sed -i -e "s,\@relcommondocpath\@,../../,g" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp/html -name '*.html'` + perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + `find $(USER_REFMAN).tmp/html -name '*.html'` ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -212,10 +212,10 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g" \ - -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` + perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ + `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ @@ -230,7 +230,8 @@ uninstall-local: doc-teamcity: - sed -i -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g" \ - -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + perl -pi \ + -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ + -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ + `find $(srcdir)/$(USER_REFMAN) -name '*.html'` diff --git a/lrde-scmstats.sh b/lrde-scmstats.sh index f1f0073..37a68e7 100755 --- a/lrde-scmstats.sh +++ b/lrde-scmstats.sh @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -40,7 +40,7 @@ DEST=/lrde/dload/olena/stats/$subdir gitstats . $DEST # Anonymize some names. -find "$DEST" -name "*.html" -exec sed -i 's/J.r.me Darbon/JD/g' {} \; +find "$DEST" -name "*.html" -exec perl -pi -e 's/J.r.me Darbon/JD/g' {} \; # Expose uploaded files. chmod -R a+rX $DEST -- 1.7.10.4

1 0

olena: olena-2.0-559-g2e5b2fb Shell-related portability fixes in Scribo's Makefiles.
by Roland Levillain 14 Jun '13

14 Jun '13

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. Wrap some long lines. --- scribo/ChangeLog | 9 +++++++++ scribo/doc/Makefile.am | 30 +++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b357b08..6330a23 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Scribo's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + Wrap some long lines. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Scribo. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 5e0dec9..c459d84 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -99,9 +99,10 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + find $(USER_REFMAN).tmp -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -238,9 +239,10 @@ install-data-local: $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) - perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g;" \ - -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ - `find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html'` + find $(DESTDIR)$(htmldir)/scribo/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g;" \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../../milena/$(USER_REFMAN)/,g" \ + {} \; # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/scribo/$$d; \ @@ -248,9 +250,10 @@ install-data-local: done ## Try GNU chmod's X mode before resorting to something slower but ## more standard. - chmod -R a+rX $(DESTDIR)$(htmldir)/scribo || \ - find $(DESTDIR)$(htmldir)/scribo $ -type d -a -exec chmod a+rx {} \; $ \ - -o -exec chmod a+r {} \; + chmod -R a+rX $(DESTDIR)$(htmldir)/scribo || \ + find $(DESTDIR)$(htmldir)/scribo \ + $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; uninstall-local: for d in $(DATA_html_dirs_inst); do \ @@ -265,7 +268,8 @@ uninstall-local: doc-teamcity: - perl -pi \ - -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ - -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

1 0

olena: olena-2.0-558-g173a803 Shell-related portability fixes in Milena's Makefiles.
by Roland Levillain 14 Jun '13

14 Jun '13

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. Wrap some long lines. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 29 +++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 769d2d9..f39e9e5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Milena's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + Wrap some long lines. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Milena. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 3e70841..44e4211 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -261,9 +261,10 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(USER_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp -name '*.html'` + find $(USER_REFMAN).tmp -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../../../doc/,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -348,7 +349,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) test -f $(DEVEL_REFMAN).tmp/latex/refman.tex rm -rf $(srcdir)/$(DEVEL_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ + perl -pi \ + -e "s,\@relcommondocpath\@,$(top_srcdir)/doc/$(DEVEL_REFMAN)/html/,g" \ $(DEVEL_REFMAN).tmp/html/index.html ## FIXME: Moving directories between file systems is not portable. mv $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) @@ -776,9 +778,10 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) ## Fix path to the main page of the documentation. chmod -R u+w $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) - perl -pi \ - -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html'` + find $(DESTDIR)$(htmldir)/milena/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../../doc/$(USER_REFMAN)/html,../../$(USER_REFMAN),g" \ + {} \; # Other HTML directories can be processed uniformly. for d in $(DATA_html_dirs_inst); do \ rm -rf $(DESTDIR)$(htmldir)/milena/$$d; \ @@ -786,9 +789,10 @@ install-data-local: done ## Try GNU chmod's X mode before resorting to something slower but ## more standard. - chmod -R a+rX $(DESTDIR)$(htmldir)/milena/ || \ - find $(DESTDIR)$(htmldir)/milena/ $ -type d -a -exec chmod a+rx {} \; $ \ - -o -exec chmod a+r {} \; + chmod -R a+rX $(DESTDIR)$(htmldir)/milena/ || \ + find $(DESTDIR)$(htmldir)/milena \ + $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; uninstall-local: for d in $(DATA_html_dirs_inst); do \ @@ -803,5 +807,6 @@ uninstall-local: doc-teamcity: - perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../../doc/$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

1 0

olena: olena-2.0-557-gf7d1607 Shell-related portability fixes in Olena's Makefiles.
by Roland Levillain 14 Jun '13

14 Jun '13

* doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and please the shell. --- ChangeLog | 8 ++++++++ doc/Makefile.am | 27 +++++++++++++++------------ 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index b4cd1f4..aa9606d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-06-14 Roland Levillain <roland(a)lrde.epita.fr> + + Shell-related portability fixes in Olena's Makefiles. + + * doc/Makefile.am: Rewrite patterns ``perl X `find Y''' as + ``find Y -exec perl X {} \;'' to avoid long `perl' command lines and + please the shell. + 2013-06-17 Roland Levillain <roland(a)lrde.epita.fr> Use `perl -pi' instead of `sed -i' in Olena. diff --git a/doc/Makefile.am b/doc/Makefile.am index e10944a..30fa31d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -121,9 +121,10 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(DOXYGEN) $(DOXYFILE_USER) rm -rf $(srcdir)/$(USER_REFMAN) ## Fix path to the main page of the documentation. - perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ - -e "s,\@userrefman\@,$(USER_REFMAN),g" \ - `find $(USER_REFMAN).tmp/html -name '*.html'` + find $(USER_REFMAN).tmp/html -name '*.html' -exec \ + perl -pi -e "s,\@relcommondocpath\@,../../,g;" \ + -e "s,\@userrefman\@,$(USER_REFMAN),g" \ + {} \; ## FIXME: Moving directories between file systems is not portable. mv $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) @mv -f $@.tmp $@ @@ -212,10 +213,11 @@ install-data-local: cp -r $(srcdir)/$(USER_REFMAN)/html $(DESTDIR)$(htmldir)/$(USER_REFMAN) # Fix documentation paths chmod -R u+w $(DESTDIR)$(htmldir)/$(USER_REFMAN) - perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ - -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ - `find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html'` + find $(DESTDIR)$(htmldir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena/$(USER_REFMAN),g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo/$(USER_REFMAN),g;" \ + -e "s,../../$(USER_REFMAN)/html,../$(USER_REFMAN),g" \ + {} \; ## Try GNU chmod's X mode before resorting to something slower but ## more standard. chmod -R a+rX $(DESTDIR)$(htmldir) || \ @@ -230,8 +232,9 @@ uninstall-local: doc-teamcity: - perl -pi \ - -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ - -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ - -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ - `find $(srcdir)/$(USER_REFMAN) -name '*.html'` + find $(srcdir)/$(USER_REFMAN) -name '*.html' -exec \ + perl -pi \ + -e "s,../../../milena/doc/$(USER_REFMAN)/html,../milena.doc,g;" \ + -e "s,../../../scribo/doc/$(USER_REFMAN)/html,../scribo.doc,g;" \ + -e "s,../../$(USER_REFMAN)/html,../olena.doc,g" \ + {} \; -- 1.7.10.4

1 0

olena: branch mln_trace created: olena-2.0-553-gedc8943
by git＠lrde.epita.fr 13 Jun '13

13 Jun '13

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 "Olena, a generic and efficient image processing platform". The branch mln_trace has been created at edc8943687604585b3c202a1a65456ca471f0c1a (commit) - Log ----------------------------------------------------------------- edc8943 Update the documentation of mln_trace. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-553-gedc8943 Update the documentation of mln_trace.
by Roland Levillain 13 Jun '13

13 Jun '13

* mln/debug/trace.hh: Here. Aesthetic changes. --- milena/ChangeLog | 7 +++++++ milena/mln/debug/trace.hh | 40 +++++++++++++++++++++------------------- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index edf3a65..28a569f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2013-06-13 Roland Levillain <roland(a)lrde.epita.fr> + + Update the documentation of mln_trace. + + * mln/debug/trace.hh: Here. + Aesthetic changes. + 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> * doc/mln/convert.dox: Fix from_to_ module name. diff --git a/milena/mln/debug/trace.hh b/milena/mln/debug/trace.hh index bddd8a1..e3f3261 100644 --- a/milena/mln/debug/trace.hh +++ b/milena/mln/debug/trace.hh @@ -28,12 +28,14 @@ /// \file /// -/// Definition of the trace entering procedure. +/// Definition of the function entering/exiting tracing mechanism. + +# include <ctime> -# include <string> # include <iostream> +# include <string> # include <stack> -# include <ctime> + # include <mln/core/contract.hh> # define mln_trace(S) \ @@ -49,13 +51,14 @@ namespace mln namespace debug { - /*! \brief Display function calls backtrace. + /*! \brief Trace function calls. This class is meant to be instantiated at the beginning of each routine in olena. It keep trace of the function call backtrace and remember the time in each function. - This class must used at follow: + This class is intended to be used through the mln_trace macro as + follows: \code namespace mln @@ -70,9 +73,9 @@ namespace mln } \endcode - \warning mln_trace() declares a named local variable, so do not - use mln_trace twice in the same scope in order to avoid - duplicate declarations. + \warning mln_trace() declares a local variable (named + mln_trace_), so do not use mln_trace twice in the same scope to + avoid duplicate declarations. */ class trace { @@ -94,10 +97,9 @@ namespace mln private: static std::stack<std::clock_t> start_times_; - static std::stack<std::string> scopes_; + static std::stack<std::string> scopes_; static unsigned max_tab_; static bool is_quiet_; - }; @@ -167,17 +169,17 @@ namespace mln std::clock_t now = std::clock(); if (start_times_.top() > now) - { - std::cerr << "warning: bad timer in trace handling" << std::endl; - // FIXME: So what? - } + std::cerr + << "Warning: Clock skew detected (start time in the future)." + << std::endl; if (start_times_.top() < now) - { - std::cout << "- " - << ((float(now) - float(start_times_.top())) / CLOCKS_PER_SEC) - << "s "; - } + { + std::cout + << "- " + << ((float(now) - float(start_times_.top())) / CLOCKS_PER_SEC) + << "s "; + } start_times_.pop(); -- 1.7.10.4

1 0