- Olena-patches

4284: Fix documentation generation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/examples/Makefile.am: Check if directory exists before creating it. * doc/white_paper/Makefile.am, * doc/ref_guide/Makefile.am: Do not move output file. It is already created in the source directory. * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not move html output since it is already created in the source directory. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/examples/Makefile.am | 3 ++- milena/doc/ref_guide/Makefile.am | 3 +-- milena/doc/tutorial/Makefile.am | 5 ++--- milena/doc/white_paper/Makefile.am | 5 ++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 17453d8..287e058 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix documentation generation. + + * doc/examples/Makefile.am: Check if directory exists before + creating it. + + * doc/white_paper/Makefile.am, + * doc/ref_guide/Makefile.am: Do not move output file. It is + already created in the source directory. + + * doc/tutorial/Makefile.am: Fix missing 'mv -f' command and do not + move html output since it is already created in the source + directory. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix data-regen rule in documentation. * doc/examples/Makefile.am: fix 'data-regen' rule. diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index e0d14bc..843c6b3 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -143,7 +143,8 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc examples: $(EXTRA_PROGRAMS) run-examples: examples - mkdir -p $(top_builddir)/milena/doc/figures; \ + test -d $(top_builddir)/milena/doc/figures \ + || mkdir $(top_builddir)/milena/doc/figures; \ @failcom='exit 1'; \ list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index f13074f..31a5abb 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -59,8 +59,7 @@ REF_GUIDE_HH = $(srcdir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) $(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) \ - && mv -f ref_guide.hh $(srcdir) + $< $(DOC_SRCDIR)/ref_guide $(DOC_SRCDIR) # Final product. diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 5cd7464..3a2c61f 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -58,8 +58,7 @@ TUTORIAL_HH = $(srcdir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) $(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp $(DOC_SRCDIR)/tools/todoxygen.sh \ - $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) \ - && mv tutorial.hh $(srcdir) + $< $(DOC_SRCDIR)/tutorial $(DOC_SRCDIR) # Final product. TUTORIAL_PDF = $(srcdir)/tutorial.pdf @@ -68,7 +67,7 @@ $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && tutorial.pdf $(srcdir) + && mv -f tutorial.pdf $(srcdir) # FIXME: Regenerating figures.stamp requires make to go back to the # parent directory. We already do the opposite (descending from diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index df0a51b..5901d0e 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -65,10 +65,9 @@ white-paper: white-paper-pdf white-paper-html WHITE_PAPER_HTML = $(srcdir)/white_paper_html/index.html white-paper-html: $(WHITE_PAPER_HTML) $(WHITE_PAPER_HTML): white_paper.tex $(EPSS) - test -d white_paper_html || mkdir white_paper_html + test -d $(srcdir)/white_paper_html || mkdir $(srcdir)/white_paper_html TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@ $(top_srcdir)/milena/doc/tools/clearbanner.sh $@ - mv -f white_paper_html $(srcdir) WHITE_PAPER_PDF = $(srcdir)/white_paper.pdf @@ -77,7 +76,7 @@ $(WHITE_PAPER_PDF): white_paper.tex $(PNGS) TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< \ - && mv white_paper.pdf $(srcdir) + && mv -f white_paper.pdf $(srcdir) dist_doc_DATA = \ -- 1.5.6.5

1 0

4283: NEWS: Add release date.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- ChangeLog | 4 ++++ NEWS | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c596b0..999d8b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * NEWS: Add release date. + +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add new dev tools. * build-aux/check_source_has_test.sh, diff --git a/NEWS b/NEWS index 7401310..9702ab6 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -* Olena 1.0 +* Olena 1.0 July 14, 2009 * The core C++ library, renamed to Milena, has been rewritten from scratch and features numerous additions over the past -- 1.5.6.5

1 0

4282: Fix data-regen rule in documentation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/examples/Makefile.am: fix 'data-regen' rule. * doc/tools/split_sample.sh: add support for file name suffix. --- milena/ChangeLog | 8 ++++++++ milena/doc/examples/Makefile.am | 9 +++++---- milena/doc/tools/split_sample.sh | 12 ++++++++---- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6ab45c8..17453d8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Fix data-regen rule in documentation. + + * doc/examples/Makefile.am: fix 'data-regen' rule. + + * doc/tools/split_sample.sh: add support for file name suffix. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Update a tutorial example. * doc/outputs/tuto4_site_set_create.txt, diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index a0d812a..e0d14bc 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -143,8 +143,9 @@ tuto4_point2d_SOURCES = tuto4/point2d.cc examples: $(EXTRA_PROGRAMS) run-examples: examples + mkdir -p $(top_builddir)/milena/doc/figures; \ @failcom='exit 1'; \ - list='$(noinst_PROGRAMS)'; for bin in $$list; do \ + list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ echo "Running $$bin"; \ ./$$bin > $(OUTPUTS_SRCDIR)/$$bin.txt || eval $$failcom; \ done @@ -241,14 +242,14 @@ fix-refdata: diff $$split_ex $(SPLIT_EXAMPLES_SRCDIR)/`basename $$split_ex` >/dev/null 2>&1 \ || echo "Updating reference file for $$split_ex"; \ cp $$split_ex $(SPLIT_EXAMPLES_SRCDIR); \ - done; + done; split-examples: test -d $(SPLIT_EXAMPLES_SRCDIR) || mkdir $(SPLIT_EXAMPLES_SRCDIR) @failcom='exit 1'; \ list=`find $(EXAMPLES_SRCDIR) -type f -name '*.cc'`; for file in $$list; do \ - $(DOC_SRCDIR)/tools/split_sample.sh $$file cc $(SPLIT_EXAMPLES_SRCDIR)\ + $(DOC_SRCDIR)/tools/split_sample.sh $$file cc raw $(SPLIT_EXAMPLES_SRCDIR)\ || eval $$failcom; \ done @@ -256,7 +257,7 @@ split-outputs: test -d $(SPLIT_OUTPUTS_SRCDIR) || mkdir $(SPLIT_OUTPUTS_SRCDIR) @failcom='exit 1'; \ list='$(OUTPUTS_SRCDIR)/*.txt'; for file in $$list; do \ - $(DOC_SRCDIR)/tools/split_sample.sh $$file txt $(SPLIT_OUTPUTS_SRCDIR)\ + $(DOC_SRCDIR)/tools/split_sample.sh $$file txt "" $(SPLIT_OUTPUTS_SRCDIR)\ || eval $$failcom; \ done diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index 9712f40..aeb5e26 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -1,23 +1,27 @@ # /bin/sh -if ! [ $# -eq 3 ]; then - echo "Usage: $0 <file1> <file extension> <dst dir>" +if ! [ $# -eq 4 ]; then + echo "Usage: $0 <file1> <file extension> <suffix> <dst dir>" exit 1; fi begins=`grep -n -R '//[[:space:]]*\\\{' $1 | cut -d ':' -f 1` ends=`grep -n -R '//[[:space:]]*\\\}' $1 | cut -d ':' -f 1` +if ! [ -z "$3" ]; then + suffix=".$3" +fi + split=false i=1 for begin in $begins; do partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) subdir=`basename \`dirname $1\`` - out_name="`basename $1 .$2`-$i.$2" + out_name="`basename $1 .$2`-$i.$2$suffix" if [ "$subdir" != "examples" ] && [ "$subdir" != "outputs" ]; then out_name="${subdir}_$out_name" fi - head -n $partend $1 | tail -n $(($partend - $begin)) > "$3/$out_name" + head -n $partend $1 | tail -n $(($partend - $begin)) > "$4/$out_name" i=$((i+1)) split=true done -- 1.5.6.5

1 0

4281: Update a tutorial example.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* doc/outputs/tuto4_site_set_create.txt, * doc/outputs/split/tuto4_site_set_create-1.txt, * doc/outputs/split/tuto4_site_set_create-2.txt, * doc/outputs/split/tuto4_site_set_create-3.txt, * doc/examples/split/tuto4_site_set_create-2.cc.raw, * doc/examples/split/tuto4_site_set_create-3.cc.raw, * doc/examples/split/tuto4_site_set_create-4.cc.raw, * doc/examples/split/tuto4_site_set_create-5.cc.raw: New reference files. * doc/examples/tuto4/site_set_create.cc: Add more sample code. --- milena/ChangeLog | 16 ++++++++++ .../examples/split/tuto4_site_set_create-2.cc.raw | 7 ++-- .../examples/split/tuto4_site_set_create-3.cc.raw | 7 ++-- .../examples/split/tuto4_site_set_create-4.cc.raw | 5 ++- ...ate-4.cc.raw => tuto4_site_set_create-5.cc.raw} | 0 milena/doc/examples/tuto4/site_set_create.cc | 32 +++++++++++++------ .../doc/outputs/split/tuto4_site_set_create-1.txt | 1 + .../doc/outputs/split/tuto4_site_set_create-2.txt | 1 + .../doc/outputs/split/tuto4_site_set_create-3.txt | 1 + milena/doc/outputs/tuto4_site_set_create.txt | 11 ++++-- 10 files changed, 59 insertions(+), 22 deletions(-) copy milena/doc/examples/split/{tuto4_site_set_create-4.cc.raw => tuto4_site_set_create-5.cc.raw} (100%) create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-1.txt create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-2.txt create mode 100644 milena/doc/outputs/split/tuto4_site_set_create-3.txt diff --git a/milena/ChangeLog b/milena/ChangeLog index 37322db..6ab45c8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Update a tutorial example. + + * doc/outputs/tuto4_site_set_create.txt, + * doc/outputs/split/tuto4_site_set_create-1.txt, + * doc/outputs/split/tuto4_site_set_create-2.txt, + * doc/outputs/split/tuto4_site_set_create-3.txt, + * doc/examples/split/tuto4_site_set_create-2.cc.raw, + * doc/examples/split/tuto4_site_set_create-3.cc.raw, + * doc/examples/split/tuto4_site_set_create-4.cc.raw, + * doc/examples/split/tuto4_site_set_create-5.cc.raw: New reference + files. + + * doc/examples/tuto4/site_set_create.cc: Add more sample code. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: use mln_domain instead of mln_box. 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw index 06a04e3..63ceee5 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-2.cc.raw @@ -1,3 +1,4 @@ - p_array<point2d> arr; - arr.append(point2d(2,2)); - arr.append(point2d(1,2)); + mln_piter_(box2d) p(b); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; diff --git a/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw index 63ceee5..45970ad 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-3.cc.raw @@ -1,4 +1,3 @@ - mln_piter_(box2d) p(b); - for_all(p) - std::cout < arr; + arr.append(point2d(2,2)); + arr.append(point2d(1,2)); diff --git a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw index 1bbf4c0..ccff7e6 100644 --- a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw +++ b/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw @@ -1 +1,4 @@ - box2d b = make::box2d(-2,-2, 2, 2); + mln_piter_(p_array<point2d>) p(arr); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; diff --git a/milena/doc/examples/split/tuto4_site_set_create-4.cc.raw b/milena/doc/examples/split/tuto4_site_set_create-5.cc.raw similarity index 100% copy from milena/doc/examples/split/tuto4_site_set_create-4.cc.raw copy to milena/doc/examples/split/tuto4_site_set_create-5.cc.raw diff --git a/milena/doc/examples/tuto4/site_set_create.cc b/milena/doc/examples/tuto4/site_set_create.cc index 8c80c2e..8f0e5fe 100644 --- a/milena/doc/examples/tuto4/site_set_create.cc +++ b/milena/doc/examples/tuto4/site_set_create.cc @@ -10,31 +10,43 @@ int main() box2d b(4,4); // \} - // \{ - p_array<point2d> arr; - arr.append(point2d(2,2)); - arr.append(point2d(1,2)); - // \} - - std::cout << "\\{" << std::endl; + std::cout << "// \\{" << std::endl; // \{ mln_piter_(box2d) p(b); for_all(p) std::cout < arr; + arr.append(point2d(2,2)); + arr.append(point2d(1,2)); + // \} + + std::cout << "// \\{" << std::endl; + // \{ + mln_piter_(p_array<point2d>) p(arr); + for_all(p) + std::cout << p << ", "; + std::cout << std::endl; + // \} + std::cout << "// \\}" << std::endl; + } { // \{ box2d b = make::box2d(-2,-2, 2, 2); // \} - std::cout << "\\{" << std::endl; + std::cout << "// \\{" << std::endl; mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; - std::cout << "\\}" << std::endl; + std::cout << "// \\}" << std::endl; } } diff --git a/milena/doc/outputs/split/tuto4_site_set_create-1.txt b/milena/doc/outputs/split/tuto4_site_set_create-1.txt new file mode 100644 index 0000000..915e60e --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-1.txt @@ -0,0 +1 @@ +(0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), diff --git a/milena/doc/outputs/split/tuto4_site_set_create-2.txt b/milena/doc/outputs/split/tuto4_site_set_create-2.txt new file mode 100644 index 0000000..ad9805f --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-2.txt @@ -0,0 +1 @@ +(2,2), (1,2), diff --git a/milena/doc/outputs/split/tuto4_site_set_create-3.txt b/milena/doc/outputs/split/tuto4_site_set_create-3.txt new file mode 100644 index 0000000..ecb9a3b --- /dev/null +++ b/milena/doc/outputs/split/tuto4_site_set_create-3.txt @@ -0,0 +1 @@ +(-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), diff --git a/milena/doc/outputs/tuto4_site_set_create.txt b/milena/doc/outputs/tuto4_site_set_create.txt index 1cfac41..c711d72 100644 --- a/milena/doc/outputs/tuto4_site_set_create.txt +++ b/milena/doc/outputs/tuto4_site_set_create.txt @@ -1,6 +1,9 @@ -\{ +// \{ (0,0), (0,1), (0,2), (0,3), (1,0), (1,1), (1,2), (1,3), (2,0), (2,1), (2,2), (2,3), (3,0), (3,1), (3,2), (3,3), -\} -\{ +// \} +// \{ +(2,2), (1,2), +// \} +// \{ (-2,-2), (-2,-1), (-2,0), (-2,1), (-2,2), (-1,-2), (-1,-1), (-1,0), (-1,1), (-1,2), (0,-2), (0,-1), (0,0), (0,1), (0,2), (1,-2), (1,-1), (1,0), (1,1), (1,2), (2,-2), (2,-1), (2,0), (2,1), (2,2), -\} +// \} -- 1.5.6.5

1 0

4280: mln/geom/rotate.hh: use mln_domain instead of mln_box.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/geom/rotate.hh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 40e09ce..37322db 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: use mln_domain instead of mln_box. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add missing headers to doc examples. * doc/examples/tuto2_first_image.cc, diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index 6cb6773..87cc94c 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -168,8 +168,8 @@ namespace mln // Old versions of GCC (including Apple GCC 4.0.1) do not parse // correctly `mln_box(I)()'. Hence, we need to typedef // `mln_box(I)' first. - typedef mln_box(I) box_t; - return rotate(input, angle, extension, box_t()); + typedef mln_domain(I) domain_t; + return rotate(input, angle, extension, domain_t()); } -- 1.5.6.5

1 0

4279: Add missing headers to doc examples.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* milena/doc/examples/tuto2_first_image.cc, * milena/doc/examples/tuto3_rw_image.cc, * milena/doc/examples/tuto4_genericity_and_algorithms.cc: Add copyright headers. --- milena/ChangeLog | 9 ++++++ milena/doc/examples/tuto2_first_image.cc | 27 ++++++++++++++++++++ milena/doc/examples/tuto3_rw_image.cc | 27 ++++++++++++++++++++ .../examples/tuto4_genericity_and_algorithms.cc | 27 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 030398e..40e09ce 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Add missing headers to doc examples. + + * doc/examples/tuto2_first_image.cc, + * doc/examples/tuto3_rw_image.cc, + * doc/examples/tuto4_genericity_and_algorithms.cc: Add + copyright headers. + +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests output. diff --git a/milena/doc/examples/tuto2_first_image.cc b/milena/doc/examples/tuto2_first_image.cc index 7515a8e..7b4cee7 100644 --- a/milena/doc/examples/tuto2_first_image.cc +++ b/milena/doc/examples/tuto2_first_image.cc @@ -1,3 +1,30 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file + #include <mln/core/image/image2d.hh> #include <mln/make/image.hh> #include <mln/debug/println.hh> diff --git a/milena/doc/examples/tuto3_rw_image.cc b/milena/doc/examples/tuto3_rw_image.cc index 7bc10d8..14ba056 100644 --- a/milena/doc/examples/tuto3_rw_image.cc +++ b/milena/doc/examples/tuto3_rw_image.cc @@ -1,3 +1,30 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file + #include <mln/core/image/image2d.hh> #include <mln/value/rgb8.hh> #include <mln/data/fill.hh> diff --git a/milena/doc/examples/tuto4_genericity_and_algorithms.cc b/milena/doc/examples/tuto4_genericity_and_algorithms.cc index 2fd1413..b906a60 100644 --- a/milena/doc/examples/tuto4_genericity_and_algorithms.cc +++ b/milena/doc/examples/tuto4_genericity_and_algorithms.cc @@ -1,3 +1,30 @@ +// Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +/// \file + #include <mln/core/image/image2d.hh> #include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> -- 1.5.6.5

1 0

4278: tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests output.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 5 +++++ milena/tests/tools/pretty_check.sh | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7fe6681..030398e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2009-07-13 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * tests/tools/pretty_check.sh: Correctly grep XFAIL and FAIL tests + output. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> Do not use Doxygen-style comments within an implementation. diff --git a/milena/tests/tools/pretty_check.sh b/milena/tests/tools/pretty_check.sh index a13fc62..9ba1635 100755 --- a/milena/tests/tools/pretty_check.sh +++ b/milena/tests/tools/pretty_check.sh @@ -1,18 +1,18 @@ #!/bin/sh # Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -# +# # This file is part of Olena. -# +# # Olena is free software: you can redistribute it and/or modify it under # the terms of the GNU General Public License as published by the Free # Software Foundation, version 2 of the License. -# +# # Olena is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. @@ -90,7 +90,7 @@ fi if [ -z "$TEST_CXX" ]; then TEST_CXX="$CXX" fi - + gcc_wrapper="$PWD/$output_directory/gcc-wrapper.sh" cleanup_last_results() @@ -140,7 +140,7 @@ end_tmp_files() { local ef="error_entry_html.tmp" local wf="warning_entry_html.tmp" - close_dir_entry $ef + close_dir_entry $ef close_dir_entry $wf echo "</ol> " >> $ef echo "</ol> " >> $wf @@ -178,7 +178,7 @@ open_dir() </table> EOF - + } close_dir() @@ -384,7 +384,7 @@ main() # failed during execution. if [ "$status" == "FAIL" ] || [ "$status" == "XFAIL" ]; then - grep -B 2 ": $name\$" $check_log | head -n 1 > "$dir/$name.log" + grep -B 1 "X*FAIL: $name\$" $check_log | head -n 1 > "$dir/$name.log" error_entry $name $bdir error $status error_node $name $log "./$name" "$dir/$name" $bdir error $status fi @@ -417,11 +417,11 @@ main() fi done done - + # Build pretty output. end_tmp_files make_output_file - + # Cleanup temporary files. cleanup_tmp_files cleanup_gcc_wrapper -- 1.5.6.5

1 0

4277: Add new dev tools.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* build-aux/check_source_has_test.sh, * build-aux/check_test_hierarchy.sh: rename to... * build-aux/mln_check_source_has_test, * build-aux/mln_check_test_hierarchy: ... this. * build-aux/devtools.sh: Set the path to these tools. * build-aux/mln_add_file, * build-aux/mln_check_all_hh_headers, * build-aux/mln_check_guards: new tools. Signed-off-by: Guillaume Lazzara <z(a)lrde.epita.fr> --- ChangeLog | 23 +++- build-aux/check_source_has_test.sh | 70 ---------- build-aux/check_test_hierarchy.sh | 57 -------- build-aux/devtools.sh | 9 ++ build-aux/mln_add_file | 242 +++++++++++++++++++++++++++++++++++ build-aux/mln_check_all_hh_headers | 55 ++++++++ build-aux/mln_check_guards | 134 +++++++++++++++++++ build-aux/mln_check_source_has_test | 88 +++++++++++++ build-aux/mln_check_test_hierarchy | 75 +++++++++++ 9 files changed, 625 insertions(+), 128 deletions(-) delete mode 100755 build-aux/check_source_has_test.sh delete mode 100755 build-aux/check_test_hierarchy.sh create mode 100644 build-aux/devtools.sh create mode 100755 build-aux/mln_add_file create mode 100755 build-aux/mln_check_all_hh_headers create mode 100755 build-aux/mln_check_guards create mode 100755 build-aux/mln_check_source_has_test create mode 100755 build-aux/mln_check_test_hierarchy diff --git a/ChangeLog b/ChangeLog index 16747a4..8c596b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,20 @@ -2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add new dev tools. + + * build-aux/check_source_has_test.sh, + * build-aux/check_test_hierarchy.sh: rename to... + + * build-aux/mln_check_source_has_test, + * build-aux/mln_check_test_hierarchy: ... this. + + * build-aux/devtools.sh: Set the path to these tools. + + * build-aux/mln_add_file, + * build-aux/mln_check_all_hh_headers, + * build-aux/mln_check_guards: new tools. + +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Improve snapshot generation. @@ -12,6 +28,11 @@ 2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: Avoid an ICE with gcc 4.0.1 on MacOs + X (leopard 10.5). + +2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * lrde-upload.sh: Call chmod before copying files. 2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/build-aux/check_source_has_test.sh b/build-aux/check_source_has_test.sh deleted file mode 100755 index 2c269c5..0000000 --- a/build-aux/check_source_has_test.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh - -failed_tests=0 -all_tests=0 - -check_directory () -{ - echo "Current directories: $1 $2" - - for file in `ls $1`; do - - if [ -f ${1}/$file ]; then - ext=${file##*.} - base=${file%.*} - - if [ "$ext" = "hh" -a \ - "${base##*.}" != "spe" ]; then - test_file=${file%.hh}.cc - all_tests=$(($all_tests + 1)) - - if [ -f ${2}/$test_file ]; then - echo "\t\e[0;32mOK\e[m $file <-> $test_file" > /dev/null - else - if [ "$file" != "all.hh" -a \ - "$file" != "essential.hh" ]; then - echo "\tFAIL Test \"$test_file\" does not exist." - failed_tests=$(($failed_tests + 1)) - fi - fi - - fi - - fi - - if [ -d ${1}/$file ]; then - if [ -d ${2}/$file ]; then - echo "" - check_directory ${1}/$file ${2}/$file - else - if [ "$file" != "internal" ]; then - echo "FAIL Test directory \"${2}/$file\" does not exist." - fi - fi - fi - - done -} - -if [ $# -ne 2 ]; then - echo "Usage: ./check_test_hierarchy mln/ tests/" - exit 1 -fi - -echo "Source directory: $1" -echo "Test directory: $2" -echo "---" - -if [ -d ${1} ]; then - if [ -d ${2} ]; then - check_directory ${1} ${2} - else - echo "\e[0;31mFAIL\e[m Test directory $2 does not exist." - fi -else - echo "\e[0;31mFAIL\e[m Source directory $1 does not exist." -fi - -echo "\n=====" -echo "Missing tests: $failed_tests" - diff --git a/build-aux/check_test_hierarchy.sh b/build-aux/check_test_hierarchy.sh deleted file mode 100755 index 891ce31..0000000 --- a/build-aux/check_test_hierarchy.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh - -failed_tests=0 -all_tests=0 - -check_directory () -{ - echo "Current directories: $1 $2" - for file in `ls $1`; do - - source_file=${file%.cc}.hh - if [ -f ${1}/$file ]; then - all_tests=$(($all_tests + 1)) - if [ -f ${2}/$source_file ]; then - echo "\t\e[0;32mOK\e[m $file <-> $source_file" > /dev/null - else -# FIXME: Manage exceptions. - if [ "$file" != "Makefile.am" ]; then - echo "\t\e[0;31mFAIL\e[m $source_file source does not exist." - failed_tests=$(($failed_tests + 1)) - fi - fi - fi - - if [ -d ${1}/$file ]; then - if [ -d ${2}/$file ]; then - echo "" - check_directory ${1}/$file ${2}/$file - else -# FIXME: Manage exceptions. - echo "\e[0;31mFAIL\e[m ${2}/$file source directory does not exist." - fi - fi - - done -} - -if [ $# -ne 2 ]; then - echo "Usage: ./check_test_hierarchy tests/ mln/" - exit 1 -fi - -echo "Test directory: $1" -echo "Source directory: $2" -echo "---" - -if [ -d ${1} ]; then - if [ -d ${2} ]; then - check_directory ${1} ${2} - else - echo "\e[0;31mFAIL\e[m ${1} source directory does not exist." - fi -fi - -echo "\n=====" -echo "Uncorrect tests: $failed_tests" - diff --git a/build-aux/devtools.sh b/build-aux/devtools.sh new file mode 100644 index 0000000..fc5465a --- /dev/null +++ b/build-aux/devtools.sh @@ -0,0 +1,9 @@ +export MILENA_DEVTOOLS_PATH=`dirname $0` + +if [ -d "$PWD/$MILENA_DEVTOOLS_PATH" ]; then + export PATH=$PWD/$MILENA_DEVTOOLS_PATH:$PATH +elif [ -d "$MILENA_DEVTOOLS_PATH" ] && [ -z "`echo $MILENA_DEVTOOLS_PATH | cut -d '/' -f 1`" ]; then + export PATH=$MILENA_DEVTOOLS_PATH:$PATH +else + echo "Cannot guess Milena's devtools path. Please set MILENA_DEVTOOLS_PATH variable manually." +fi diff --git a/build-aux/mln_add_file b/build-aux/mln_add_file new file mode 100755 index 0000000..f92801f --- /dev/null +++ b/build-aux/mln_add_file @@ -0,0 +1,242 @@ +#!/bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +# Usage: ./new_header.sh <mln/path/header.hh> +# +# Add a new header in milena and include it in all.hh if exists. +# + + +if [ $# -ne 1 ] && [ $# -ne 2 ]; then + echo "Usage: `basename $0` [--with-test] <mln/path/headername.hh>" + exit 1 +fi + + +with_test=0 +if [ "$1" == "--with-test" ]; then + with_test=1; + shift +fi + +output_dir=`dirname $1` + + +add_license() +{ + cat >> $1 <<EOF +// Copyright (C) `date +'%Y'` EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +EOF + +} + + +add_doxygen_headers() +{ + cat >> $1 <<EOF + +/// \\file +/// +/// FIXME. + + +EOF +} + +prepare_file() +{ + + guards=`echo "$1" | tr "[a-z]" "[A-Z]" | sed -e 's/[\/\.]/_/g'` + + # Add licence and guards. + add_license $1 + + cat >> $1 <<EOF +#ifndef $guards +# define $guards +EOF + + add_doxygen_headers $1 + +# opening sub namespaces + dir=`echo $output_dir | cut -d '/' -f 1` + indent="" + i=1 + + while ! [ -z "$dir" ]; do + cat >> $1 <<EOF +${indent}namespace $dir +${indent}{ + +EOF + + indent="$indent " + i=$(($i + 1)) + dir=`echo $output_dir | cut -d '/' -f $i` + done + indent=`echo "$indent" | sed -e 's/ $//'` + + + +# Adding few comments and MLN_INCLUDE_ONLY guards. + cat >> $1 <<EOF +${indent}// Add facade declaration here. + + +# ifndef MLN_INCLUDE_ONLY + + + +${indent}// Implement the facade here. + + + +# endif // ! MLN_INCLUDE_ONLY + +EOF + + + +# closing sub namespaces + path=`dirname $1` + while [ "$path" != "." ]; do + namespace=`echo $path | sed -e 's/\//::/g'` + + cat >> $1 <<EOF +${indent}} // end of namespace $namespace + +EOF + + path=`dirname $path` + indent=`echo "$indent" | sed -e 's/ $//'` + done + + +# End of file. +cat >> $1 <<EOF +#endif // ! $guards +EOF + +} + +add_to_all_hh() +{ + if ! [ -f "$output_dir/all.hh" ]; then + echo "Warning: $output_dir/all.hh does not exist, you may want to \ +create it." 1>&2 + return + fi + + if ! [ -z "`grep "# include <$1>" $output_dir/all.hh`" ]; then + echo "File already included in $output_dir/all.hh" 1>&2 + return + fi + + line=`grep -nE '^#endif // ! ' $output_dir/all.hh | tail -n 1 | cut -d ':' -f 1` + line=$(($line - 1)) + sed -i "${line}i\# include <$1> +" $output_dir/all.hh +} + +add_to_test_makefile() +{ + test_dir=`dirname $1` + test_name=`basename $1` + test_bname=`basename $test_name .cc` + + if ! [ -f "$test_dir/Makefile.am" ]; then + echo "Warning: $test_dir/Makefile.am does not exist, you may want to \ +create it." 1>&2 + return + fi + + if ! [ -z "`grep "$test_name" $test_dir/Makefile.am`" ]; then + echo "File already added to $test_dir/Makefile.am" 1>&2 + return + fi + + 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 +" $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 + +} + + +add_test() +{ + test_file=tests/`echo $1 | sed -e 's,mln/,,g' | sed -e 's,\.hh,.cc,g'` + + add_license $test_file + add_doxygen_headers $test_file + + cat >> $test_file <<EOF + +#include <$1> + +int main() +{ + using namespace mln; + + +} +EOF + + add_to_test_makefile $test_file +} + + +touch $1 +prepare_file $1 +add_to_all_hh $1 + + +if [ $with_test -eq 1 ]; then + add_test $1 +fi + diff --git a/build-aux/mln_check_all_hh_headers b/build-aux/mln_check_all_hh_headers new file mode 100755 index 0000000..80d394d --- /dev/null +++ b/build-aux/mln_check_all_hh_headers @@ -0,0 +1,55 @@ +#!/bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +if [ $# -ne 2 ]; then + echo "Usage: `basename $0` <path to mln> <output_log_dir>" 1>&2 + exit 1; +fi + + +path_to_mln=`dirname $1` + +echo "" > $2/missing_all_hh.log +echo "" > $2/not_included_in_all_hh.log + +cd $path_to_mln + +# Checking local all.hh +for dir in `find mln -mindepth 1 -type d`; do + + if ! [ -e "$dir/all.hh" ]; then + echo "WARNING: no all.hh header in $dir" >&2 + echo "$dir/all.hh" >> $2/missing_all_hh.log + continue + fi + + for f in `ls $dir/*.hh | grep -vE '*.spe.hh'`; do + if [ "`basename $f`" != "all.hh" ]; then + result=`grep "include <$f>" $dir/all.hh` + if [ -z "$result" ]; then + echo " WARNING $f is not included in $dir/all.hh" >&2 + echo "$f" >> $2/not_included_in_all_hh.log + fi + fi + done + +done + +#cd - diff --git a/build-aux/mln_check_guards b/build-aux/mln_check_guards new file mode 100755 index 0000000..3a2a95b --- /dev/null +++ b/build-aux/mln_check_guards @@ -0,0 +1,134 @@ +#! /usr/bin/env perl +# +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. +# +# +# check_guards.pl: this file comes from the Vaucanson project. +# +# Usage: ./mln_check_guards <file1> <file2> .... +# +# Check guards and fix them if needed. + +use warnings; +use strict; + +my $boundupper = "#ifndef %CPPNAME% +# define %CPPNAME%"; +my $boundlower = "#endif // ! %CPPNAME%"; + +sub check_guards ($) +{ + my $fname = $_[0]; + + # The short name, without the path from builddir to srcdir. + $_ = $fname; + s,^.*milena/mln/,,g; + my $shortname = $_; + s,.*/,,g; + my $basename = $_; + + $_ = $shortname; + s,^[./]*,,g; + s,^,MLN_,g; + s,[^a-zA-Z0-9],_,g; + y/[a-z]./[A-Z]_/; + my $cppname = $_; + + $_ = $boundupper; + s,%BASENAME%,$basename,g; + s,%CPPNAME%,$cppname,g; + my $xboundupper = $_; + + $_ = $boundlower; + s,%BASENAME%,$basename,g; + s,%CPPNAME%,$cppname,g; + my $xboundlower = $_; + + + open(FILE, "<", $fname) or die "cannot open $fname: $!\n"; + + my $content; + while (<FILE>) + { + $content .= $_; + } + close FILE; + + # Prepare the new contents. + $_ = $content; + + # Kill trailing spaces. +# s/[ \t]+$//mg; + +# s,([ \t\n])*$,\n,sg; + + # Adjust cpp guards. + if (/\# *ifndef[^\n]*\n[\n\t ]*\# *define[^\n]*\n/s) + { + s,\# *ifndef[^\n]*\n[\n\t ]*\# *define[^\n]*\n,$xboundupper\n,sg; + } + + if (/\# *endif[^\n]*\n[\n\t ]*$/s) + { + s,\# *endif[^\n]*\n[\n\t ]*$,$xboundlower\n,sg; + } + + # Make sure we have a unique ending eol. + s/\n+\z/\n/; + + $content = $_; + + my @mv = ("mv", "-f", "$fname", "$fname.bak"); + system(@mv) == 0 or die "system @mv failed: $?\n"; + + open(FILE, ">", $fname) or die "cannot open $fname for writing: $!\n"; + print FILE $content; +} + +if ($#ARGV == -1) +{ + print "mln_check_guards <file1> <file2> ...\n"; + print "----\n"; + print "Check guards in a list of files and fix them if needed.\n"; + exit 1; +} + +foreach my $file (@ARGV) +{ + check_guards ($file); +} + +exit 0; + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: diff --git a/build-aux/mln_check_source_has_test b/build-aux/mln_check_source_has_test new file mode 100755 index 0000000..3b9e564 --- /dev/null +++ b/build-aux/mln_check_source_has_test @@ -0,0 +1,88 @@ +#! /bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +failed_tests=0 +all_tests=0 + +check_directory () +{ + echo "Current directories: $1 $2" + + for file in `ls $1`; do + + if [ -f ${1}/$file ]; then + ext=${file##*.} + base=${file%.*} + + if [ "$ext" = "hh" -a \ + "${base##*.}" != "spe" ]; then + test_file=${file%.hh}.cc + all_tests=$(($all_tests + 1)) + + if [ -f ${2}/$test_file ]; then + echo "\t\e[0;32mOK\e[m $file <-> $test_file" > /dev/null + else + if [ "$file" != "all.hh" -a \ + "$file" != "essential.hh" ]; then + echo "\tFAIL Test \"$test_file\" does not exist." + failed_tests=$(($failed_tests + 1)) + fi + fi + + fi + + fi + + if [ -d ${1}/$file ]; then + if [ -d ${2}/$file ]; then + echo "" + check_directory ${1}/$file ${2}/$file + else + if [ "$file" != "internal" ]; then + echo "FAIL Test directory \"${2}/$file\" does not exist." + fi + fi + fi + + done +} + +if [ $# -ne 2 ]; then + echo "Usage: ./check_test_source_has_test mln/ tests/" + exit 1 +fi + +echo "Source directory: $1" +echo "Test directory: $2" +echo "---" + +if [ -d ${1} ]; then + if [ -d ${2} ]; then + check_directory ${1} ${2} + else + echo "\e[0;31mFAIL\e[m Test directory $2 does not exist." + fi +else + echo "\e[0;31mFAIL\e[m Source directory $1 does not exist." +fi + +echo "\n=====" +echo "Missing tests: $failed_tests" + diff --git a/build-aux/mln_check_test_hierarchy b/build-aux/mln_check_test_hierarchy new file mode 100755 index 0000000..91dddcb --- /dev/null +++ b/build-aux/mln_check_test_hierarchy @@ -0,0 +1,75 @@ +#! /bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena Library. This library is free +# software; you can redistribute it and/or modify it under the terms +# of the GNU General Public License version 2 as published by the +# Free Software Foundation. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this library; see the file COPYING. If not, write to +# the Free Software Foundation, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +failed_tests=0 +all_tests=0 + +check_directory () +{ + echo "Current directories: $1 $2" + for file in `ls $1`; do + + source_file=${file%.cc}.hh + if [ -f ${1}/$file ]; then + all_tests=$(($all_tests + 1)) + if [ -f ${2}/$source_file ]; then + echo "\t\e[0;32mOK\e[m $file <-> $source_file" > /dev/null + else +# FIXME: Manage exceptions. + if [ "$file" != "Makefile.am" ]; then + echo "\t\e[0;31mFAIL\e[m $source_file source does not exist." + failed_tests=$(($failed_tests + 1)) + fi + fi + fi + + if [ -d ${1}/$file ]; then + if [ -d ${2}/$file ]; then + echo "" + check_directory ${1}/$file ${2}/$file + else +# FIXME: Manage exceptions. + echo "\e[0;31mFAIL\e[m ${2}/$file source directory does not exist." + fi + fi + + done +} + +if [ $# -ne 2 ]; then + echo "Usage: ./check_test_hierarchy tests/ mln/" + exit 1 +fi + +echo "Test directory: $1" +echo "Source directory: $2" +echo "---" + +if [ -d ${1} ]; then + if [ -d ${2} ]; then + check_directory ${1} ${2} + else + echo "\e[0;31mFAIL\e[m ${1} source directory does not exist." + fi +fi + +echo "\n=====" +echo "Uncorrect tests: $failed_tests" + -- 1.5.6.5

1 0

4276: Improve snapshot generation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* Makefile.am: Add new rule 'snapshot'. * lrde-upload.sh: Make the snapshot names more explicit. --- ChangeLog | 8 ++++++++ Makefile.am | 18 ++++++++++++++++++ lrde-upload.sh | 6 +++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ed3dfc..16747a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Improve snapshot generation. + + * Makefile.am: Add new rule 'snapshot'. + + * lrde-upload.sh: Make the snapshot names more explicit. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am: Add a FIXME. diff --git a/Makefile.am b/Makefile.am index 8982f66..f5646f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,4 +127,22 @@ dist-hook: autoreconf -f -v -i; \ find . -name autom4te.cache | xargs rm -rf \ ) + + +# Set the package version to olena-x.x-snapshot-dd-mm-yy +# +# Do not check NEWS file (this is not a release so there is no +# entries in this file for this package). +# +snapshot: + current_date=`date +'%d-%m-%y'` \ + && sed -e "s/^$AC_INIT(\[Olena\],$ \[$[\.[:alnum:]]*$$-snapshot-.*-[[:alnum:]]*$*\], $.*$/\1 [\2-snapshot-$$current_date], \4/g" \ + -e 's/ check-news / /g' \ + $(srcdir)/configure.ac > $(srcdir)/configure.ac.tmp \ + && cp -f $(srcdir)/configure.ac $(srcdir)/configure.ac.old \ + && cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac + #>> +# && $(srcdir)/build-aux/lrde-upload.sh \ No newline at end of file diff --git a/lrde-upload.sh b/lrde-upload.sh index 039889b..31cd16d 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -13,7 +13,7 @@ DEST_DOC=$DEST/doc/milena # Retrieve the package version VERSION=`autoconf --trace='AC_INIT:$2'` CURRENT_DATE=`date +'%d_%m_%y'` -REV=$VERSION-$CURRENT_DATE +REV=$VERSION-snapshot-$CURRENT_DATE # Always do "cp then mv" when uploading the file, so that someone # cannot start a download why the destination file is incomplete. @@ -21,8 +21,8 @@ REV=$VERSION-$CURRENT_DATE # Upload the tarball mkdir -p $DEST -# Delete tarballs older than 2 days.. -find $DEST -maxdepth 1 -type f -mtime +2 -exec rm -f {} \; +# Delete tarballs older than 2 days. +find $DEST -maxdepth 1 -type f -mtime +2 -name 'olena-*-snapshot-*' -exec rm -f {} \; # tar.gz cp -f olena-$VERSION.tar.gz $DEST/olena-$REV.tar.gz.tmp -- 1.5.6.5

1 0

[PATCH 10/10] Do not use Doxygen-style comments within an implementation.
by Roland Levillain 13 Jul '09

13 Jul '09

* mln/geom/rotate.hh (mln::geom::rotate(const Image&, double, const Ext&)): Here. Be more specific. --- milena/ChangeLog | 8 ++++++++ milena/mln/geom/rotate.hh | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6d7a281..7fe6681 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Do not use Doxygen-style comments within an implementation. + + * mln/geom/rotate.hh + (mln::geom::rotate(const Image&, double, const Ext&)): Here. + Be more specific. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk, tests/unit_test/unit-tests.mk: Regen. 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index f53359b..6cb6773 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -165,8 +165,9 @@ namespace mln mln_concrete(I) rotate(const Image& input, double angle, const Ext& extension) { - /// Old versions of GCC do not parse correctly `mln_box(I)()'. - /// Hence, we need to typedef mln_box(I) first. + // Old versions of GCC (including Apple GCC 4.0.1) do not parse + // correctly `mln_box(I)()'. Hence, we need to typedef + // `mln_box(I)' first. typedef mln_box(I) box_t; return rotate(input, angle, extension, box_t()); } -- 1.6.1.2

1 0