June 2009 - Olena-patches

[PATCH 05/10] Help make to regen doc/figures.stamp from subdirectories of doc/.
by Roland Levillain 26 Jun '09

26 Jun '09

* doc/tutorial/Makefile.am ($(srcdir)/../figures.stamp) * doc/ref_guide/Makefile.am ($(srcdir)/../figures.stamp): New rules. --- milena/ChangeLog | 8 ++++++++ milena/doc/ref_guide/Makefile.am | 9 +++++++++ milena/doc/tutorial/Makefile.am | 10 ++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ca94bc7..6b982e0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-26 Roland Levillain <roland(a)lrde.epita.fr> + Help make to regen doc/figures.stamp from subdirectories of doc/. + + * doc/tutorial/Makefile.am ($(srcdir)/../figures.stamp) + * doc/ref_guide/Makefile.am ($(srcdir)/../figures.stamp): + New rules. + +2009-06-26 Roland Levillain <roland(a)lrde.epita.fr> + Fix path to build-aux/generate_dist_headers.sh in Makefile. * Makefile.am (regen-am, $(srcdir)/headers.mk): Here. diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index b6bb701..6564d5c 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -47,6 +47,15 @@ $(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< +# FIXME: Regenerating figures.stamp requires make to go back to the +# parent directory. We already do the opposite (descending from +# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update +# tutorial.hh). This is not sound. We probably want to put together +# somes of these files, and maybe get rid of some directories, or at +# least move most of the Makefile machinery into +# milena/doc/Makefile.am. +$(srcdir)/../figures.stamp: + cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert dist_doc_DATA = $(REF_GUIDE_PDF) diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index debd706..0fb2333 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -45,6 +45,16 @@ $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< +# FIXME: Regenerating figures.stamp requires make to go back to the +# parent directory. We already do the opposite (descending from +# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update +# tutorial.hh). This is not sound. We probably want to put together +# somes of these files, and maybe get rid of some directories, or at +# least move most of the Makefile machinery into +# milena/doc/Makefile.am. +$(srcdir)/../figures.stamp: + cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert + dist_doc_DATA = $(TUTORIAL_PDF) EXTRA_DIST = \ -- 1.6.3.1

1 0

[PATCH 04/10] Fix path to build-aux/generate_dist_headers.sh in Makefile.
by Roland Levillain 26 Jun '09

26 Jun '09

* Makefile.am (regen-am, $(srcdir)/headers.mk): Here. --- scribo/ChangeLog | 6 ++++++ scribo/Makefile.am | 17 ++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f255534..8d92970 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,9 @@ +2009-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix path to build-aux/generate_dist_headers.sh in Makefile. + + * Makefile.am (regen-am, $(srcdir)/headers.mk): Here. + 2009-06-23 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Improve Scribo demo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index dede79f..4b1c5a2 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -27,23 +27,18 @@ bin: include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += tests -# FIXME: the generation should be done from scribo's directory. regen-am: - cd $(srcdir) && \ - $(top_srcdir)/build-aux/generate_dist_headers.sh\ - . \ - ./headers.mk \ - ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + . headers.mk nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh - cd $(srcdir) && \ - $(top_srcdir)/build-aux/generate_dist_headers.sh\ - . \ - ./headers.mk \ - ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + . headers.mk nodist-headers include $(srcdir)/headers.mk -- 1.6.3.1

1 0

[PATCH 03/10] Fix path to build-aux/generate_dist_headers.sh in Makefile.
by Roland Levillain 26 Jun '09

26 Jun '09

* Makefile.am (regen-am, $(srcdir)/headers.mk): Here. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f17e773..ca94bc7 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,9 @@ +2009-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix path to build-aux/generate_dist_headers.sh in Makefile. + + * Makefile.am (regen-am, $(srcdir)/headers.mk): Here. + 2009-06-25 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update inter-pixel demo. diff --git a/milena/Makefile.am b/milena/Makefile.am index f08e193..21ab235 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -70,7 +71,9 @@ REGEN_SUBDIRS += doc tests # # Hence the redundant action. There may be a better solution regen-am: - cd $(srcdir) && $(top_srcdir)/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + mln headers.mk nodist-headers EXTRA_DIST = nodist-headers # FIXME: Change generate_dist_headers.sh so that the action looks like this: @@ -78,7 +81,9 @@ EXTRA_DIST = nodist-headers # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh nodist-headers - cd $(srcdir) && $(top_srcdir)/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers + cd $(srcdir) \ + && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ + mln headers.mk nodist-headers include $(srcdir)/headers.mk -- 1.6.3.1

1 0

[PATCH 02/10] Distribute mln/fun/binary.hh.
by Roland Levillain 26 Jun '09

26 Jun '09

* nodist-headers: Remove mln/fun/binary.hh. --- milena/ChangeLog | 6 ++++++ milena/nodist-headers | 1 - 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9059ac9..f17e773 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -6,6 +6,12 @@ 2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Distribute mln/fun/binary.hh. + + * nodist-headers: Remove mln/fun/binary.hh. + +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Fix Make rule `fake-doc'. * doc/Makefile.am (fake-doc): Create-or-touch user/latex. diff --git a/milena/nodist-headers b/milena/nodist-headers index 985b49f..a168403 100644 --- a/milena/nodist-headers +++ b/milena/nodist-headers @@ -14,7 +14,6 @@ mln/extract/sat.hh mln/fun/access/all.hh mln/fun/access/mean.hh mln/fun/accu_result.hh -mln/fun/binary.hh mln/fun/binary_param.hh mln/fun/component/blue.hh mln/fun/component/comp.hh -- 1.6.3.1

1 0

[PATCH 01/10] Fix Make rule `fake-doc'.
by Roland Levillain 26 Jun '09

26 Jun '09

* doc/Makefile.am (fake-doc): Create-or-touch user/latex. --- milena/ChangeLog | 6 ++++++ milena/doc/Makefile.am | 8 +++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 35115e2..9059ac9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -6,6 +6,12 @@ 2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Fix Make rule `fake-doc'. + + * doc/Makefile.am (fake-doc): Create-or-touch user/latex. + +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + * doc/Makefile.am: Wrap long lines. 2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index ebec33c..47064b3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -292,11 +292,9 @@ fake-doc: touch Doxyfile_user touch Doxyfile_user_pdf test -d user || mkdir user - if test -d $(USER_REFMAN_HTML); then \ - touch $(USER_REFMAN_HTML); \ - else \ - mkdir $(USER_REFMAN_HTML); \ - fi + for d in $(USER_REFMAN_HTML) user/latex; do \ + if test -d $$d; then touch $$d; else mkdir $$d; fi; \ + done touch $(USER_REFMAN_PDF) # The converse of the previous rule, voiding the timestamps. -- 1.6.3.1

1 0

r4198: Update for US images
by Fabien Freling 25 Jun '09

25 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-25 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update for US images. * fabien/igr/check_us_morpho.sh: New script for US images. * fabien/igr/wst.cc: Update label type to label_16. * fabien/mln/debug/int2rgb.hh: Clean code. * fabien/mln/world/inter_pixel/display_region.hh: Clean code. --- igr/check_us_morpho.sh | 46 ++++++++++++++++++++ igr/wst.cc | 2 mln/debug/int2rgb.hh | 71 ++++++++++++++++++++++++++++---- mln/world/inter_pixel/display_region.hh | 2 4 files changed, 110 insertions(+), 11 deletions(-) Index: trunk/milena/sandbox/fabien/igr/check_us_morpho.sh =================================================================== --- trunk/milena/sandbox/fabien/igr/check_us_morpho.sh (revision 0) +++ trunk/milena/sandbox/fabien/igr/check_us_morpho.sh (revision 4198) @@ -0,0 +1,46 @@ +#!/bin/sh + + +process () +{ + ./grad $1 3 ${2}_us_grad.dump + if [ $? -gt 0 ]; then + echo "error: grad failed" + exit + fi + + for lambda in 500 1000 2000; do + + ./clo_vol ${2}_us_grad.dump 3 $lambda ${2}_us_clo_${lambda}.dump + if [ $? -gt 0 ]; then + echo "error: clo_vol failed" + exit + fi + + nbasins=`./wst ${2}_us_clo_${lambda}.dump 3 ${2}_us_wst_${lambda}.dump` + if [ $? -gt 0 ]; then + echo "error: wst failed" + echo "nbasins: $nbasins" + exit + fi + +#./maj ${2}_us_wst_${lambda}.dump ${2}_us_maj_${lambda}.dump +# if [ $? -gt 0 ]; then +# echo "error: maj failed" +# exit +# fi + + ../bin/dumpl16_to_colorize ${2}_us_wst_${lambda}.dump 3 $nbasins ${2}_us_maj_${lambda}.ppm + convert ${2}_us_maj_${lambda}.ppm ${2}_us_maj_${lambda}.png + rm ${2}_us_maj_${lambda}.ppm + + done + + # Cleanup. +#rm *.pgm *.ppm +} + + +# $1 = input.dump +# $2 = name +process $1 $2 Property changes on: trunk/milena/sandbox/fabien/igr/check_us_morpho.sh ___________________________________________________________________ Name: svn:executable + * Index: trunk/milena/sandbox/fabien/igr/wst.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/wst.cc (revision 4197) +++ trunk/milena/sandbox/fabien/igr/wst.cc (revision 4198) @@ -32,7 +32,7 @@ using value::int_u12; using value::label_8; using value::label_16; - typedef label_8 L; + typedef label_16 L; typedef int_u8 V; if (argc != 4) Index: trunk/milena/sandbox/fabien/mln/debug/int2rgb.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/debug/int2rgb.hh (revision 4197) +++ trunk/milena/sandbox/fabien/mln/debug/int2rgb.hh (revision 4198) @@ -1,4 +1,36 @@ -#include <mln/core/image/image2d.hh> +// 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. + +#ifndef MLN_DEBUG_INT2RGB_HH +# define MLN_DEBUG_INT2RGB_HH + +/// \file +/// +/// FIXME + +#include <mln/core/concept/image.hh> #include <mln/value/rgb8.hh> @@ -8,16 +40,33 @@ namespace debug { - using value::rgb8; - - template <typename V> - image2d<rgb8> - int2rgb(const image2d<V>& input) + /// \brief FIXME + /// + /// \param[in] input The input image. + /// \return An image which values are cut into rgb channels. + /// It allows visualization of integer values superior to 256. + /// + template <typename I> + inline + mln_ch_value(I, value::rgb8) + int2rgb(const Image<I>& input); + + +#ifndef MLN_INCLUDE_ONLY + + template <typename I> + inline + mln_ch_value(I, value::rgb8) + int2rgb(const Image<I>& input_) { - image2d<rgb8> output; + trace::entering("debug::int2rgb"); + + const I& input = exact(input_); + + mln_ch_value(I, value::rgb8) output; initialize(output, input); - mln_piter(image2d<V>) p(input.domain()); + mln_piter(I) p(input.domain()); for_all(p) { unsigned value = input(p); @@ -28,9 +77,15 @@ output(p).red() = value % 256; } + trace::exiting("debug::int2rgb"); return output; } +#endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::debug } // end of namespace mln + +#endif // ! MLN_DEBUG_INT2RGB_HH Index: trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh =================================================================== --- trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 4197) +++ trunk/milena/sandbox/fabien/mln/world/inter_pixel/display_region.hh (revision 4198) @@ -44,8 +44,6 @@ # include <mln/opt/at.hh> # include <mln/value/rgb8.hh> -#include <mln/literal/colors.hh> //DEBUG - namespace mln {

1 0

milena r4197: Update inter-pixel demo
by Fabien Freling 25 Jun '09

25 Jun '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-06-25 Fabien Freling <fabien.freling(a)lrde.epita.fr> Update inter-pixel demo. * demos/inter_pixel/inter_pixel.cc: Add output images for better visualization. --- inter_pixel.cc | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 3 deletions(-) Index: trunk/milena/demos/inter_pixel/inter_pixel.cc =================================================================== --- trunk/milena/demos/inter_pixel/inter_pixel.cc (revision 4196) +++ trunk/milena/demos/inter_pixel/inter_pixel.cc (revision 4197) @@ -4,17 +4,22 @@ #include <mln/value/int_u8.hh> #include <mln/value/label_16.hh> +#include <mln/value/rgb8.hh> #include <mln/io/pgm/all.hh> #include <mln/io/ppm/save.hh> +#include <mln/data/convert.hh> +#include <mln/data/fill.hh> #include <mln/debug/int2rgb.hh> #include <mln/display/display_region.hh> #include <mln/literal/colors.hh> #include <mln/math/diff_abs.hh> +#include <mln/morpho/closing/volume.hh> #include <mln/morpho/elementary/gradient.hh> #include <mln/morpho/watershed/flooding.hh> #include <mln/world/inter_pixel/compute.hh> +#include <mln/world/inter_pixel/display_edge.hh> #include <mln/world/inter_pixel/display_region.hh> #include <mln/world/inter_pixel/immerse.hh> #include <mln/world/inter_pixel/is_pixel.hh> @@ -25,6 +30,7 @@ using namespace mln; using value::int_u8; using value::label_16; +using value::rgb8; struct dist_t : Function_vv2v<dist_t> @@ -53,12 +59,13 @@ // Gradient. image2d<int_u8> grad = morpho::elementary::gradient(input, c4()); + io::pgm::save(grad, "gradient.pgm"); label_16 nbasins; // Normal watershed. image2d<label_16> normal_wst = morpho::watershed::flooding(input, c4(), nbasins); - io::ppm::save(display::display_region(input, normal_wst, literal::red), "normal.ppm"); + io::ppm::save(display::display_region(input, normal_wst, literal::red), "normal_watershed.ppm"); @@ -68,9 +75,56 @@ image_if<image2d<int_u8>, world::inter_pixel::is_separator> edges; edges = world::inter_pixel::compute(imax, dist); + io::pgm::save(world::inter_pixel::display_edge(edges.unmorph_(), 0, 3), "edge_dist.pgm"); + + // Color on edge image. + image2d<rgb8> edge_color = data::convert(rgb8(), edges.unmorph_()); + mln_piter_(image2d<int_u8>) p(input.domain()); + for_all(p) + convert::from_to(input(p), opt::at(edge_color, p.row() * 2, p.col() * 2)); + data::fill((edge_color | world::inter_pixel::is_separator()).rw(), literal::green); + data::fill((edge_color | world::inter_pixel::is_zero_face()).rw(), literal::blue); + io::ppm::save(edge_color, "edge_color.ppm"); + + // Color on stretched edge image. + box2d b = edge_color.bbox(); + image2d<rgb8> edge_stretch(make::box2d(((b.pmin()[0] + 1) / 2) * 4, ((b.pmin()[1] + 1) / 2) * 4, + ((b.pmax()[0] + 1) / 2 + 1) * 4 - 2, ((b.pmax()[1] + 1) / 2 + 1) * 4 - 2)); + typedef image_if<image2d<rgb8>, world::inter_pixel::is_separator> edge_t; + edge_t edge_sep = edge_color | world::inter_pixel::is_separator(); + mln_piter_(edge_t) q(edge_sep.domain()); + for_all(q) + if (q.row() % 2) // horizontal edge + { + unsigned row = (q.row() / 2 + 1) * 4 - 1; + unsigned col = (q.col() / 2) * 4; + for (unsigned i = 0; i < 3; ++i) + opt::at(edge_stretch, row, col + i) = literal::green; + } + else // vertical edge + { + unsigned row = (q.row() / 2) * 4; + unsigned col = (q.col() / 2 + 1) * 4 - 1; + for (unsigned i = 0; i < 3; ++i) + opt::at(edge_stretch, row + i, col) = literal::green; + } + mln_VAR(edge_zero, edge_color | world::inter_pixel::is_zero_face()); + mln_piter_(edge_zero_t) ez(edge_zero.domain()); + for_all(ez) + opt::at(edge_stretch, ((ez.row() + 1) / 2) * 4 - 1, ((ez.col() + 1) / 2) * 4 - 1) = literal::blue; + mln_VAR(edge_pix, edge_color | world::inter_pixel::is_pixel()); + mln_piter_(edge_pix_t) ex(edge_pix.domain()); + for_all(ex) + for (int i = 0; i < 3; ++i) + for (int j = 0; j < 3; ++j) + opt::at(edge_stretch, (ex.row() / 2) * 4 + i, (ex.col() / 2) * 4 + j) = edge_color(ex); + io::ppm::save(edge_stretch, "edge_stretch.ppm"); + + // On edges watershed. - mln_VAR(edge_wst, morpho::watershed::flooding(edges, world::inter_pixel::e2e(), nbasins)); - io::ppm::save(world::inter_pixel::display_region(input, edge_wst.unmorph_(), literal::red), "edges.ppm"); + mln_VAR(edge_clo, morpho::closing::volume(edges, world::inter_pixel::e2e(), 25)); + mln_VAR(edge_wst, morpho::watershed::flooding(edge_clo, world::inter_pixel::e2e(), nbasins)); + io::ppm::save(world::inter_pixel::display_region(input, edge_wst.unmorph_(), literal::red), "edge_watershed.ppm"); return 0; }

1 0

[PATCH 4/4] doc/Makefile.am: Wrap long lines.
by Roland Levillain 25 Jun '09

25 Jun '09

--- milena/ChangeLog | 4 ++++ milena/doc/Makefile.am | 34 +++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 00a7295..30229d0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + * doc/Makefile.am: Wrap long lines. + +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Add a Make rule faking the regeneration of the documentation. * doc/Makefile.am, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e9550b8..ebec33c 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -53,7 +53,9 @@ doc-html: tutorial-html white-paper-html ref-guide-html ref-doc-html doc-devel-pdf: tutorial-pdf ref-guide-pdf white-paper-pdf ref-doc-devel-pdf -doc-devel-html: tutorial-html ref-guide-html white-paper-html ref-doc-devel-html +doc-devel-html: tutorial-html ref-guide-html white-paper-html \ + ref-doc-devel-html + # FIXME: Maintaining dependencies across directories is too # complicated. Simplify. @@ -158,19 +160,20 @@ edit_pdf = sed -e 's,GENERATE_LATEX = NO,GENERATE_LATEX = YES,g' \ # documentation (devel and user) using @VARIABLES@. Don't generate # Doxyfile_user from Doxyfile_devel! Both should be a product # derived from a single source, Doxyfile.in. -edit_user = sed -e 's,OUTPUT_DIRECTORY = ./devel/,OUTPUT_DIRECTORY = ./user/,g' \ - -e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \ - -e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \ - -e 's,EXTRACT_STATIC = YES,EXTRACT_STATIC = NO,g' \ - -e 's,EXTRACT_LOCAL_CLASSES = YES,EXTRACT_LOCAL_CLASSES = NO,g' \ - -e 's,HIDE_UNDOC_MEMBERS = NO,HIDE_UNDOC_MEMBERS = YES,g' \ - -e 's,HIDE_UNDOC_CLASSES = NO,HIDE_UNDOC_CLASSES = YES,g' \ - -e 's,HIDE_FRIEND_COMPOUNDS = NO,HIDE_FRIEND_COMPOUNDS = YES,g' \ - -e 's,HIDE_IN_BODY_DOCS = NO,HIDE_IN_BODY_DOCS = YES,g' \ - -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ - -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ - -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' \ - -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g' +edit_user = sed \ + -e 's,OUTPUT_DIRECTORY = ./devel/,OUTPUT_DIRECTORY = ./user/,g' \ + -e 's,EXTRACT_ALL = YES,EXTRACT_ALL = NO,g' \ + -e 's,EXTRACT_PRIVATE = YES,EXTRACT_PRIVATE = NO,g' \ + -e 's,EXTRACT_STATIC = YES,EXTRACT_STATIC = NO,g' \ + -e 's,EXTRACT_LOCAL_CLASSES = YES,EXTRACT_LOCAL_CLASSES = NO,g' \ + -e 's,HIDE_UNDOC_MEMBERS = NO,HIDE_UNDOC_MEMBERS = YES,g' \ + -e 's,HIDE_UNDOC_CLASSES = NO,HIDE_UNDOC_CLASSES = YES,g' \ + -e 's,HIDE_FRIEND_COMPOUNDS = NO,HIDE_FRIEND_COMPOUNDS = YES,g' \ + -e 's,HIDE_IN_BODY_DOCS = NO,HIDE_IN_BODY_DOCS = YES,g' \ + -e 's,INTERNAL_DOCS = YES,INTERNAL_DOCS = NO,g' \ + -e 's,GENERATE_TODOLIST = YES,GENERATE_TODOLIST = NO,g' \ + -e 's,PROJECT_NUMBER = \",PROJECT_NUMBER = \"User documentation ,g' \ + -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g' # Regen files. @@ -248,7 +251,8 @@ Doxyfile_user_pdf: Doxyfile_user $(edit_pdf) $< >$@ Doxyfile_devel: $(srcdir)/Doxyfile.in - Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog | sed -e 's/\\\$$//g'`; \ + Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ + | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ Doxyfile_devel_pdf: Doxyfile_devel -- 1.6.2.4

1 0

[PATCH 3/4] Strip some Makefile.am's under milena/doc/ in the distribution.
by Roland Levillain 25 Jun '09

25 Jun '09

* Makefile.am (LRDE_STRIPPED_DIST_FILES): Add $(distdir)/milena/doc/Makefile.am, $(distdir)/milena/doc/ref_guide/Makefile.am, $(distdir)/milena/doc/tutorial/Makefile.am and $(distdir)/milena/doc/white_paper/Makefile.am. --- ChangeLog | 10 ++++++++++ Makefile.am | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8075d39..d539310 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Strip some Makefile.am's under milena/doc/ in the distribution. + + * Makefile.am (LRDE_STRIPPED_DIST_FILES): Add + $(distdir)/milena/doc/Makefile.am, + $(distdir)/milena/doc/ref_guide/Makefile.am, + $(distdir)/milena/doc/tutorial/Makefile.am and + $(distdir)/milena/doc/white_paper/Makefile.am. + 2009-06-25 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * bootstrap: update generation of distributed file lists in milena/doc. diff --git a/Makefile.am b/Makefile.am index 6039908..9cd8b57 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,10 @@ REGEN_SUBDIRS += milena scribo LRDE_STRIPPED_DIST_FILES = \ $(distdir)/Makefile.am \ $(distdir)/configure.ac \ + $(distdir)/milena/doc/Makefile.am \ + $(distdir)/milena/doc/ref_guide/Makefile.am \ + $(distdir)/milena/doc/tutorial/Makefile.am \ + $(distdir)/milena/doc/white_paper/Makefile.am \ $(distdir)/milena/mln/accu/math/all.hh \ $(distdir)/milena/mln/all.hh \ $(distdir)/milena/mln/core/image/vmorph/all.hh \ -- 1.6.2.4

1 0

[PATCH 2/4] Add a Make rule faking the regeneration of the documentation.
by Roland Levillain 25 Jun '09

25 Jun '09

* doc/Makefile.am, * doc/ref_guide/Makefile.am, * doc/tutorial/Makefile.am, * doc/white_paper/Makefile.am (fake-doc, void-doc): New (phony) targets. --- milena/ChangeLog | 10 +++++++ milena/doc/Makefile.am | 50 ++++++++++++++++++++++++++++++++++++ milena/doc/ref_guide/Makefile.am | 14 ++++++++++ milena/doc/tutorial/Makefile.am | 14 ++++++++++ milena/doc/white_paper/Makefile.am | 15 +++++++++++ 5 files changed, 103 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c4eaf15..00a7295 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Add a Make rule faking the regeneration of the documentation. + + * doc/Makefile.am, + * doc/ref_guide/Makefile.am, + * doc/tutorial/Makefile.am, + * doc/white_paper/Makefile.am (fake-doc, void-doc): + New (phony) targets. + +2009-06-25 Roland Levillain <roland(a)lrde.epita.fr> + Improve build dependencies in doc/. * doc/Makefile.am ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML)) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index a7664ed..e9550b8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -253,3 +253,53 @@ Doxyfile_devel: $(srcdir)/Doxyfile.in Doxyfile_devel_pdf: Doxyfile_devel $(edit_pdf) $< >$@ + + +#<<lrde +# Pretend the documentation is up-to-date. This is really useful for +# developers who want to check the distribution mechanism, for +# generating the Doxygen documentation make take up to 1 hour. +# +# A few remarks. Refreshing the contents of EXTRA_DIST using +# +# touch $(EXTRA_DIST) +# +# just does not work, as EXTRA_DIST lists source and built files +# (resp. in srcdir and buidldir). Cheat: go to srcdir and strip the +# srcdir prefix from path of every file listed in EXTRA_DIST. And we +# have to prune the built files (e.g. `Doxyfile_user_pdf'). +# +# We also selectively refresh files by hand in a certain order (some +# of them being already listed in EXTRA_DIST), to satisfy the +# dependencies. +.PHONY: fake-doc +fake-doc: + cd $(srcdir) \ + && touch `echo $(EXTRA_DIST) \ + | sed -e 's!$(srcdir)/!!g' \ + -e 's/Doxyfile_user_pdf//g' \ + -e 's/Doxyfile_user//g' ` + cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ + cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ + cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@ + touch $(EXTRA_DEPS) + touch Doxyfile_devel + touch Doxyfile_devel_pdf + touch Doxyfile_user + touch Doxyfile_user_pdf + test -d user || mkdir user + if test -d $(USER_REFMAN_HTML); then \ + touch $(USER_REFMAN_HTML); \ + else \ + mkdir $(USER_REFMAN_HTML); \ + fi + touch $(USER_REFMAN_PDF) + +# The converse of the previous rule, voiding the timestamps. +.PHONY: void-doc +void-doc: + touch $(srcdir)/Doxyfile.in + cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ + cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ + cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@ +#>> diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index 3ba3098..b6bb701 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -61,3 +61,17 @@ CLEANFILES = \ *.haux *.hh *.html *.htoc \ ref_guide.html \ $(REF_GUIDE_HH) + + +#<<lrde +# Pretend the documentation is up-to-date. +.PHONY: fake-doc +fake-doc: + touch $(REF_GUIDE_HH) + touch $(REF_GUIDE_PDF) + +# The converse of the previous rule, voiding the timestamps. +.PHONY: void-doc +void-doc: + touch $(srcdir)/ref_guide.tex +#>> diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 17d8154..debd706 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -59,3 +59,17 @@ CLEANFILES = \ tutorial.haux \ tutorial.html \ $(TUTORIAL_HH) + + +#<<lrde +# Pretend the documentation is up-to-date. +.PHONY: fake-doc +fake-doc: + touch $(TUTORIAL_HH) + touch $(TUTORIAL_PDF) + +# The converse of the previous rule, voiding the timestamps. +.PHONY: void-doc +void-doc: + touch $(srcdir)/tutorial.tex +#>> diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am index 322deb8..eeebc6f 100644 --- a/milena/doc/white_paper/Makefile.am +++ b/milena/doc/white_paper/Makefile.am @@ -69,3 +69,18 @@ CLEANFILES = \ white_paper.pdf \ *.log *.idx *.out *.aux \ figures + + +#<<lrde +# Pretend the documentation is up-to-date. +.PHONY: fake-doc +fake-doc: + touch $(EPSS) + touch $(WHITE_PAPER_HTML) + touch $(WHITE_PAPER_PDF) + +# The converse of the previous rule, voiding the timestamps. +.PHONY: void-doc +void-doc: + touch $(srcdir)/white_paper.tex +#>> -- 1.6.2.4

1 0