- Olena-patches

last-svn-commit-76-gfc7196b bootstrap: Regen the list of split outputs of the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index d116ebe..bf62855 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Regen the list of split outputs of the documentation. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Be terser. diff --git a/bootstrap b/bootstrap index 3187d3b..d607402 100755 --- a/bootstrap +++ b/bootstrap @@ -190,6 +190,8 @@ cd milena/doc && \ `find examples -name \*.cc -a \! -path examples/trash/\* \ | env LC_ALL=C sort` \ >examples-outputs.mk +# * Split outputs. +cd milena/doc && ./gen-split-outputs-mk >split-outputs.mk # Generate unit test files. run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests -- 1.5.6.5

1 0

last-svn-commit-83-g19eee8e bootstrap: Regen the list of split outputs of the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 2 ++ 2 files changed, 6 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e5c2a0..d530769 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Regen the list of split outputs of the documentation. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Be terser. diff --git a/bootstrap b/bootstrap index 3187d3b..d607402 100755 --- a/bootstrap +++ b/bootstrap @@ -190,6 +190,8 @@ cd milena/doc && \ `find examples -name \*.cc -a \! -path examples/trash/\* \ | env LC_ALL=C sort` \ >examples-outputs.mk +# * Split outputs. +cd milena/doc && ./gen-split-outputs-mk >split-outputs.mk # Generate unit test files. run . ./build-aux/build_unit_test.sh `pwd`/milena/mln milena/tests/unit_test milena/tests/unit_test/disabled_tests -- 1.5.6.5

1 0

last-svn-commit-75-g84ab03d Generate the list of split outputs in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. (regen-split-outputs-mk): New (phony) target. ($(srcdir)/split-outputs.stamp): Remove rule. (refman_dependencies) (tutorial_dependencies) (ref_guide_dependencies) (EXTRA_DIST, MAINTAINERCLEANFILES): Remove $(srcdir)/split-outputs.stamp Add $(SPLIT_OUTPUTS). (regen-am): Remake regen-split-outputs-mk. * doc/gen-split-outputs-mk: New script. Use it to generate... * doc/split-outputs.mk: ...this (new) Make helper. --- milena/ChangeLog | 18 ++++++ milena/doc/Makefile.am | 38 ++++++------ milena/doc/gen-split-examples-mk | 2 + ...{gen-split-examples-mk => gen-split-outputs-mk} | 24 +++++--- milena/doc/split-outputs.mk | 60 ++++++++++++++++++++ 5 files changed, 114 insertions(+), 28 deletions(-) copy milena/doc/{gen-split-examples-mk => gen-split-outputs-mk} (82%) create mode 100644 milena/doc/split-outputs.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index 88aa96a..1518c1a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of split outputs in the documentation. + + * doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. + (regen-split-outputs-mk): New (phony) target. + ($(srcdir)/split-outputs.stamp): Remove rule. + (refman_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies) + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/split-outputs.stamp + Add $(SPLIT_OUTPUTS). + (regen-am): Remake regen-split-outputs-mk. + * doc/gen-split-outputs-mk: New script. + Use it to generate... + * doc/split-outputs.mk: ...this (new) Make helper. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Prepare doc source files for the automation of output splitting. * doc/examples/tuto3/println.cc, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index f40cd4b..d2b6300 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -244,7 +244,7 @@ regen-split-examples-mk: # corresponding to a bunch of files. refman_dependencies = \ $(SPLIT_EXAMPLES) \ - $(srcdir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -534,7 +534,7 @@ tutorial_dir = $(doc_dir)/tutorial # corresponding to a bunch of files. tutorial_dependencies = \ $(SPLIT_EXAMPLES) \ - $(doc_dir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -732,7 +732,7 @@ ref_guide_dir = $(doc_dir)/ref_guide # corresponding to a bunch of files. ref_guide_dependencies = \ $(SPLIT_EXAMPLES) \ - $(doc_dir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -909,22 +909,21 @@ include $(srcdir)/figures.mk ## Split outputs. ## ## --------------- ## -EXTRA_DIST += $(srcdir)/split-outputs.stamp -MAINTAINERCLEANFILES += $(srcdir)/split-outputs.stamp -# FIXME: Loops are bad, as they prevent parallelism. And we prefer -# data-driven actions anyway. This would imply that we know in -# advance the list out outputs (here, split outputs). Maybe we can -# infer it from the LaTeX document. -$(srcdir)/split-outputs.stamp: $(OUTPUTS) - @rm -f $@.tmp - @touch $@.tmp - failcom='exit 1'; \ - for file in $(OUTPUTS); do \ - $(DOC_SRCDIR)/tools/split_sample.sh \ - $$file txt "" $(SPLIT_OUTPUTS_SRCDIR) \ - || eval $$failcom; \ - done - @mv -f $@.tmp $@ +$(srcdir)/split-outputs.mk: $(srcdir)/gen-split-outputs-mk + rm -f $@.tmp + cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/split-outputs.mk +EXTRA_DIST += $(SPLIT_OUTPUTS) +MAINTAINERCLEANFILES += $(SPLIT_OUTPUTS) + +.PHONY: regen-split-outputs-mk +regen-split-outputs-mk: + rm -f $(srcdir)/split-outputs.mk.tmp + cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f $(srcdir)/split-outputs.mk.tmp $(srcdir)/split-outputs.mk + chmod -w $(srcdir)/split-outputs.mk ## -------------- ## @@ -942,6 +941,7 @@ regen-am: $(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk + $(MAKE) $(AM_MAKEFLAGS) regen-split-outputs-mk ## -------------- ## diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index fb29a02..a049c46 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -18,6 +18,8 @@ # To be used from milena/doc/'s source directory. +# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. + me=`basename $0` die () diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-outputs-mk similarity index 82% copy from milena/doc/gen-split-examples-mk copy to milena/doc/gen-split-outputs-mk index fb29a02..22d0a71 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-outputs-mk @@ -18,6 +18,8 @@ # To be used from milena/doc/'s source directory. +# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. + me=`basename $0` die () @@ -44,10 +46,11 @@ backslashify() # Get this list as argument? inputs() { + # FIXME: Or « find examples -name \*.cc -a \! -path examples/trash/\* » ? find examples -name \*.cc } -output_dir=examples/split +output_dir=outputs/split # Use a temporary file to dump rules at the end of the output. tempfile=`mktemp` @@ -63,11 +66,12 @@ EOF # Output target names in a variable. { - echo "SPLIT_EXAMPLES =" + echo "SPLIT_OUTPUTS =" inputs | while read file; do + # Count the number of opening and closing marks. - nopening=`grep -c '// *\\\{' "$file"` - nclosing=`grep -c '// *\\\}' "$file"` + nopening=`grep -c 'doc::begin_output' "$file"` + nclosing=`grep -c 'doc::end_output' "$file"` test "$nopening" -eq "$nclosing" \ || die "Unbalanced marks in $file ($nopening vs $nclosing)" @@ -81,15 +85,17 @@ EOF | sed -e 's,examples/,,' \ -e 'y,/,_,' \ -e 's,\.cc$,,'` - # Timestamp split examples (outputs) depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" + # Output file to be split. + output="\$(srcdir)/outputs/$canonical_name.txt" + # Timestamp split outputs depend on. + timestamp="\$(srcdir)/$output_dir/$canonical_name.txt.stamp" # List of targets associated to FILE. targets= { i=1 while test "$i" -le "$nopening"; do # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" + part="\$(srcdir)/$output_dir/$canonical_name-$i.txt" if test -z "$targets"; then targets="$part" @@ -104,10 +110,10 @@ EOF cat >>"$tempfile" <<EOF -$timestamp: \$(srcdir)/$file +$timestamp: $output @rm -f \$@.tmp @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir + \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir @mv -f \$@.tmp \$@ EXTRA_DIST += $timestamp MAINTAINERCLEANFILES += $timestamp diff --git a/milena/doc/split-outputs.mk b/milena/doc/split-outputs.mk new file mode 100644 index 0000000..417c25d --- /dev/null +++ b/milena/doc/split-outputs.mk @@ -0,0 +1,60 @@ +## Generated by gen-split-outputs-mk. Do not edit by hand. + +SPLIT_OUTPUTS = \ + $(srcdir)/outputs/split/graph-iter-1.txt \ + $(srcdir)/outputs/split/graph-iter-2.txt \ + $(srcdir)/outputs/split/graph-iter-3.txt \ + $(srcdir)/outputs/split/graph-iter-4.txt \ + $(srcdir)/outputs/split/tuto3_println-1.txt \ + $(srcdir)/outputs/split/tuto3_println-2.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-1.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-2.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-3.txt + + +$(srcdir)/outputs/split/graph-iter.txt.stamp: $(srcdir)/outputs/graph-iter.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/graph-iter.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/graph-iter.txt.stamp + +$(srcdir)/outputs/split/graph-iter-1.txt $(srcdir)/outputs/split/graph-iter-2.txt $(srcdir)/outputs/split/graph-iter-3.txt $(srcdir)/outputs/split/graph-iter-4.txt: $(srcdir)/outputs/split/graph-iter.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/outputs/split/tuto3_println.txt.stamp: $(srcdir)/outputs/tuto3_println.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/tuto3_println.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto3_println.txt.stamp + +$(srcdir)/outputs/split/tuto3_println-1.txt $(srcdir)/outputs/split/tuto3_println-2.txt: $(srcdir)/outputs/split/tuto3_println.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp: $(srcdir)/outputs/tuto4_site_set_create.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp + +$(srcdir)/outputs/split/tuto4_site_set_create-1.txt $(srcdir)/outputs/split/tuto4_site_set_create-2.txt $(srcdir)/outputs/split/tuto4_site_set_create-3.txt: $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -- 1.5.6.5

1 0

last-svn-commit-82-gba6a3f8 Generate the list of split outputs in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. (regen-split-outputs-mk): New (phony) target. ($(srcdir)/split-outputs.stamp): Remove rule. (refman_dependencies) (tutorial_dependencies) (ref_guide_dependencies) (EXTRA_DIST, MAINTAINERCLEANFILES): Remove $(srcdir)/split-outputs.stamp Add $(SPLIT_OUTPUTS). (regen-am): Remake regen-split-outputs-mk. * doc/gen-split-outputs-mk: New script. Use it to generate... * doc/split-outputs.mk: ...this (new) Make helper. --- milena/ChangeLog | 18 ++++++ milena/doc/Makefile.am | 38 ++++++------ milena/doc/gen-split-examples-mk | 2 + ...{gen-split-examples-mk => gen-split-outputs-mk} | 24 +++++--- milena/doc/split-outputs.mk | 60 ++++++++++++++++++++ 5 files changed, 114 insertions(+), 28 deletions(-) copy milena/doc/{gen-split-examples-mk => gen-split-outputs-mk} (82%) create mode 100644 milena/doc/split-outputs.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index f52482d..7b7982d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,23 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of split outputs in the documentation. + + * doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule. + (regen-split-outputs-mk): New (phony) target. + ($(srcdir)/split-outputs.stamp): Remove rule. + (refman_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies) + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/split-outputs.stamp + Add $(SPLIT_OUTPUTS). + (regen-am): Remake regen-split-outputs-mk. + * doc/gen-split-outputs-mk: New script. + Use it to generate... + * doc/split-outputs.mk: ...this (new) Make helper. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Prepare doc source files for the automation of output splitting. * doc/examples/tuto3/println.cc, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index f40cd4b..d2b6300 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -244,7 +244,7 @@ regen-split-examples-mk: # corresponding to a bunch of files. refman_dependencies = \ $(SPLIT_EXAMPLES) \ - $(srcdir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -534,7 +534,7 @@ tutorial_dir = $(doc_dir)/tutorial # corresponding to a bunch of files. tutorial_dependencies = \ $(SPLIT_EXAMPLES) \ - $(doc_dir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -732,7 +732,7 @@ ref_guide_dir = $(doc_dir)/ref_guide # corresponding to a bunch of files. ref_guide_dependencies = \ $(SPLIT_EXAMPLES) \ - $(doc_dir)/split-outputs.stamp \ + $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -909,22 +909,21 @@ include $(srcdir)/figures.mk ## Split outputs. ## ## --------------- ## -EXTRA_DIST += $(srcdir)/split-outputs.stamp -MAINTAINERCLEANFILES += $(srcdir)/split-outputs.stamp -# FIXME: Loops are bad, as they prevent parallelism. And we prefer -# data-driven actions anyway. This would imply that we know in -# advance the list out outputs (here, split outputs). Maybe we can -# infer it from the LaTeX document. -$(srcdir)/split-outputs.stamp: $(OUTPUTS) - @rm -f $@.tmp - @touch $@.tmp - failcom='exit 1'; \ - for file in $(OUTPUTS); do \ - $(DOC_SRCDIR)/tools/split_sample.sh \ - $$file txt "" $(SPLIT_OUTPUTS_SRCDIR) \ - || eval $$failcom; \ - done - @mv -f $@.tmp $@ +$(srcdir)/split-outputs.mk: $(srcdir)/gen-split-outputs-mk + rm -f $@.tmp + cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f $@.tmp $@ + chmod -w $@ +include $(srcdir)/split-outputs.mk +EXTRA_DIST += $(SPLIT_OUTPUTS) +MAINTAINERCLEANFILES += $(SPLIT_OUTPUTS) + +.PHONY: regen-split-outputs-mk +regen-split-outputs-mk: + rm -f $(srcdir)/split-outputs.mk.tmp + cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f $(srcdir)/split-outputs.mk.tmp $(srcdir)/split-outputs.mk + chmod -w $(srcdir)/split-outputs.mk ## -------------- ## @@ -942,6 +941,7 @@ regen-am: $(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk + $(MAKE) $(AM_MAKEFLAGS) regen-split-outputs-mk ## -------------- ## diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index fb29a02..a049c46 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -18,6 +18,8 @@ # To be used from milena/doc/'s source directory. +# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. + me=`basename $0` die () diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-outputs-mk similarity index 82% copy from milena/doc/gen-split-examples-mk copy to milena/doc/gen-split-outputs-mk index fb29a02..22d0a71 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-outputs-mk @@ -18,6 +18,8 @@ # To be used from milena/doc/'s source directory. +# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. + me=`basename $0` die () @@ -44,10 +46,11 @@ backslashify() # Get this list as argument? inputs() { + # FIXME: Or « find examples -name \*.cc -a \! -path examples/trash/\* » ? find examples -name \*.cc } -output_dir=examples/split +output_dir=outputs/split # Use a temporary file to dump rules at the end of the output. tempfile=`mktemp` @@ -63,11 +66,12 @@ EOF # Output target names in a variable. { - echo "SPLIT_EXAMPLES =" + echo "SPLIT_OUTPUTS =" inputs | while read file; do + # Count the number of opening and closing marks. - nopening=`grep -c '// *\\\{' "$file"` - nclosing=`grep -c '// *\\\}' "$file"` + nopening=`grep -c 'doc::begin_output' "$file"` + nclosing=`grep -c 'doc::end_output' "$file"` test "$nopening" -eq "$nclosing" \ || die "Unbalanced marks in $file ($nopening vs $nclosing)" @@ -81,15 +85,17 @@ EOF | sed -e 's,examples/,,' \ -e 'y,/,_,' \ -e 's,\.cc$,,'` - # Timestamp split examples (outputs) depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" + # Output file to be split. + output="\$(srcdir)/outputs/$canonical_name.txt" + # Timestamp split outputs depend on. + timestamp="\$(srcdir)/$output_dir/$canonical_name.txt.stamp" # List of targets associated to FILE. targets= { i=1 while test "$i" -le "$nopening"; do # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" + part="\$(srcdir)/$output_dir/$canonical_name-$i.txt" if test -z "$targets"; then targets="$part" @@ -104,10 +110,10 @@ EOF cat >>"$tempfile" <<EOF -$timestamp: \$(srcdir)/$file +$timestamp: $output @rm -f \$@.tmp @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir + \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir @mv -f \$@.tmp \$@ EXTRA_DIST += $timestamp MAINTAINERCLEANFILES += $timestamp diff --git a/milena/doc/split-outputs.mk b/milena/doc/split-outputs.mk new file mode 100644 index 0000000..417c25d --- /dev/null +++ b/milena/doc/split-outputs.mk @@ -0,0 +1,60 @@ +## Generated by gen-split-outputs-mk. Do not edit by hand. + +SPLIT_OUTPUTS = \ + $(srcdir)/outputs/split/graph-iter-1.txt \ + $(srcdir)/outputs/split/graph-iter-2.txt \ + $(srcdir)/outputs/split/graph-iter-3.txt \ + $(srcdir)/outputs/split/graph-iter-4.txt \ + $(srcdir)/outputs/split/tuto3_println-1.txt \ + $(srcdir)/outputs/split/tuto3_println-2.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-1.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-2.txt \ + $(srcdir)/outputs/split/tuto4_site_set_create-3.txt + + +$(srcdir)/outputs/split/graph-iter.txt.stamp: $(srcdir)/outputs/graph-iter.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/graph-iter.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/graph-iter.txt.stamp + +$(srcdir)/outputs/split/graph-iter-1.txt $(srcdir)/outputs/split/graph-iter-2.txt $(srcdir)/outputs/split/graph-iter-3.txt $(srcdir)/outputs/split/graph-iter-4.txt: $(srcdir)/outputs/split/graph-iter.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/outputs/split/tuto3_println.txt.stamp: $(srcdir)/outputs/tuto3_println.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/tuto3_println.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto3_println.txt.stamp + +$(srcdir)/outputs/split/tuto3_println-1.txt $(srcdir)/outputs/split/tuto3_println-2.txt: $(srcdir)/outputs/split/tuto3_println.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + +$(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp: $(srcdir)/outputs/tuto4_site_set_create.txt + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp +MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp + +$(srcdir)/outputs/split/tuto4_site_set_create-1.txt $(srcdir)/outputs/split/tuto4_site_set_create-2.txt $(srcdir)/outputs/split/tuto4_site_set_create-3.txt: $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -- 1.5.6.5

1 0

last-svn-commit-74-geb37b34 Prepare doc source files for the automation of output splitting.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/examples/tuto3/println.cc, * doc/examples/tuto4/site_set_create.cc: Use doc::begin_output and doc::end_output instead of hand-made delimiters. --- milena/ChangeLog | 9 +++++++++ milena/doc/examples/tuto3/println.cc | 10 ++++++---- milena/doc/examples/tuto4/site_set_create.cc | 14 ++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d0bf165..88aa96a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Prepare doc source files for the automation of output splitting. + + * doc/examples/tuto3/println.cc, + * doc/examples/tuto4/site_set_create.cc: + Use doc::begin_output and doc::end_output instead of hand-made + delimiters. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> Have split_sample.sh announce the right number of output files. diff --git a/milena/doc/examples/tuto3/println.cc b/milena/doc/examples/tuto3/println.cc index 8ee60be..ca789db 100644 --- a/milena/doc/examples/tuto3/println.cc +++ b/milena/doc/examples/tuto3/println.cc @@ -5,29 +5,31 @@ #include <mln/debug/println.hh> #include <mln/debug/println_with_border.hh> +#include <doc/tools/sample_utils.hh> + int main() { using namespace mln; using namespace mln::value; { - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ image2d<int_u8> ima(5,5); data::fill(ima, 2); debug::println(ima); // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } { - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ image2d<int_u8> ima(5,5); data::fill(ima, 2); border::fill(ima, 7); debug::println_with_border(ima); // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } } diff --git a/milena/doc/examples/tuto4/site_set_create.cc b/milena/doc/examples/tuto4/site_set_create.cc index 8f0e5fe..d7cf355 100644 --- a/milena/doc/examples/tuto4/site_set_create.cc +++ b/milena/doc/examples/tuto4/site_set_create.cc @@ -2,6 +2,8 @@ #include <mln/core/site_set/p_array.hh> #include <mln/make/box2d.hh> +#include <doc/tools/sample_utils.hh> + int main() { using namespace mln; @@ -10,14 +12,14 @@ int main() box2d b(4,4); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); { @@ -27,14 +29,14 @@ int main() arr.append(point2d(1,2)); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ mln_piter_(p_array<point2d>) p(arr); for_all(p) std::cout << p << ", "; std::cout << std::endl; // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } { @@ -42,11 +44,11 @@ int main() box2d b = make::box2d(-2,-2, 2, 2); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; - std::cout << "// \\}" << std::endl; + doc::end_output(); } } -- 1.5.6.5

1 0

last-svn-commit-81-ga4d6bc8 Prepare doc source files for the automation of output splitting.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/examples/tuto3/println.cc, * doc/examples/tuto4/site_set_create.cc: Use doc::begin_output and doc::end_output instead of hand-made delimiters. --- milena/ChangeLog | 9 +++++++++ milena/doc/examples/tuto3/println.cc | 10 ++++++---- milena/doc/examples/tuto4/site_set_create.cc | 14 ++++++++------ 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a4d2bd9..f52482d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Prepare doc source files for the automation of output splitting. + + * doc/examples/tuto3/println.cc, + * doc/examples/tuto4/site_set_create.cc: + Use doc::begin_output and doc::end_output instead of hand-made + delimiters. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> Have split_sample.sh announce the right number of output files. diff --git a/milena/doc/examples/tuto3/println.cc b/milena/doc/examples/tuto3/println.cc index 8ee60be..ca789db 100644 --- a/milena/doc/examples/tuto3/println.cc +++ b/milena/doc/examples/tuto3/println.cc @@ -5,29 +5,31 @@ #include <mln/debug/println.hh> #include <mln/debug/println_with_border.hh> +#include <doc/tools/sample_utils.hh> + int main() { using namespace mln; using namespace mln::value; { - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ image2d<int_u8> ima(5,5); data::fill(ima, 2); debug::println(ima); // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } { - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ image2d<int_u8> ima(5,5); data::fill(ima, 2); border::fill(ima, 7); debug::println_with_border(ima); // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } } diff --git a/milena/doc/examples/tuto4/site_set_create.cc b/milena/doc/examples/tuto4/site_set_create.cc index 8f0e5fe..d7cf355 100644 --- a/milena/doc/examples/tuto4/site_set_create.cc +++ b/milena/doc/examples/tuto4/site_set_create.cc @@ -2,6 +2,8 @@ #include <mln/core/site_set/p_array.hh> #include <mln/make/box2d.hh> +#include <doc/tools/sample_utils.hh> + int main() { using namespace mln; @@ -10,14 +12,14 @@ int main() box2d b(4,4); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); { @@ -27,14 +29,14 @@ int main() arr.append(point2d(1,2)); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); // \{ mln_piter_(p_array<point2d>) p(arr); for_all(p) std::cout << p << ", "; std::cout << std::endl; // \} - std::cout << "// \\}" << std::endl; + doc::end_output(); } { @@ -42,11 +44,11 @@ int main() box2d b = make::box2d(-2,-2, 2, 2); // \} - std::cout << "// \\{" << std::endl; + doc::begin_output(); mln_piter_(box2d) p(b); for_all(p) std::cout << p << ", "; std::cout << std::endl; - std::cout << "// \\}" << std::endl; + doc::end_output(); } } -- 1.5.6.5

1 0

last-svn-commit-73-g65274cb Have split_sample.sh announce the right number of output files.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/tools/split_sample.sh: Here. --- milena/ChangeLog | 6 ++++++ milena/doc/tools/split_sample.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 98e8345..d0bf165 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Have split_sample.sh announce the right number of output files. + + * doc/tools/split_sample.sh: Here. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix programs in doc/examples/. * doc/examples/ima-save.cc: Add a FIXME. diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index aeb5e26..04b313e 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -13,8 +13,9 @@ if ! [ -z "$3" ]; then fi split=false -i=1 +i=0 for begin in $begins; do + i=$((i+1)) partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) subdir=`basename \`dirname $1\`` out_name="`basename $1 .$2`-$i.$2$suffix" @@ -22,7 +23,6 @@ for begin in $begins; do out_name="${subdir}_$out_name" fi head -n $partend $1 | tail -n $(($partend - $begin)) > "$4/$out_name" - i=$((i+1)) split=true done -- 1.5.6.5

1 0

last-svn-commit-80-g8293184 Have split_sample.sh announce the right number of output files.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/tools/split_sample.sh: Here. --- milena/ChangeLog | 6 ++++++ milena/doc/tools/split_sample.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 937fced..a4d2bd9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Have split_sample.sh announce the right number of output files. + + * doc/tools/split_sample.sh: Here. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix programs in doc/examples/. * doc/examples/ima-save.cc: Add a FIXME. diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index aeb5e26..04b313e 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -13,8 +13,9 @@ if ! [ -z "$3" ]; then fi split=false -i=1 +i=0 for begin in $begins; do + i=$((i+1)) partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) subdir=`basename \`dirname $1\`` out_name="`basename $1 .$2`-$i.$2$suffix" @@ -22,7 +23,6 @@ for begin in $begins; do out_name="${subdir}_$out_name" fi head -n $partend $1 | tail -n $(($partend - $begin)) > "$4/$out_name" - i=$((i+1)) split=true done -- 1.5.6.5

1 0

last-svn-commit-72-g2efbcf3 Fix programs in doc/examples/.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/examples/ima-save.cc: Add a FIXME. * doc/examples/ima-load.cc: Likewise. Avoid hard-coded paths. * doc/examples/tuto4/image.cc: Make it compile. * doc/img/small.pbm: New symbolic link to img/small.pbm. * doc/examples/split/ima-load-1.cc.raw: Regen. * doc/examples/fill-imageif-cfun.cc, * figures.mk, * ppm-figures.mk: s/fill-subimage-cfun/fill-imageif-cfun/. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/examples/fill-imageif-cfun.cc | 2 +- milena/doc/examples/ima-load.cc | 8 +++++++- milena/doc/examples/ima-save.cc | 3 +++ milena/doc/examples/split/ima-load-1.cc.raw | 2 +- milena/doc/examples/tuto4/image.cc | 4 +--- milena/doc/figures.mk | 2 +- milena/doc/img/small.pbm | 1 + milena/doc/ppm-figures.mk | 1 - 9 files changed, 30 insertions(+), 8 deletions(-) create mode 120000 milena/doc/img/small.pbm diff --git a/milena/ChangeLog b/milena/ChangeLog index 174692d..98e8345 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix programs in doc/examples/. + + * doc/examples/ima-save.cc: Add a FIXME. + * doc/examples/ima-load.cc: Likewise. + Avoid hard-coded paths. + * doc/examples/tuto4/image.cc: Make it compile. + * doc/img/small.pbm: New symbolic link to img/small.pbm. + * doc/examples/split/ima-load-1.cc.raw: Regen. + * doc/examples/fill-imageif-cfun.cc, + * figures.mk, + * ppm-figures.mk: + s/fill-subimage-cfun/fill-imageif-cfun/. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update PNG-to-EPS conversion rule. * doc/Makefile.am (.png.eps): No longer try to build figures/ in diff --git a/milena/doc/examples/fill-imageif-cfun.cc b/milena/doc/examples/fill-imageif-cfun.cc index 14fa3bb..7f1ff46 100644 --- a/milena/doc/examples/fill-imageif-cfun.cc +++ b/milena/doc/examples/fill-imageif-cfun.cc @@ -46,5 +46,5 @@ int main() data::fill((ima2 | row_oddity).rw(), literal::red); // \} - doc::ppmsave(ima2, "fill-subimage-cfun"); + doc::ppmsave(ima2, "fill-imageif-cfun"); } diff --git a/milena/doc/examples/ima-load.cc b/milena/doc/examples/ima-load.cc index 321ba9c..d3c57a8 100644 --- a/milena/doc/examples/ima-load.cc +++ b/milena/doc/examples/ima-load.cc @@ -1,10 +1,16 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> + +#include "doc/tools/data.hh" + int main() { using namespace mln; + /* FIXME: MLN_DOC_DIR looks probably confusing in the + documentation... But we have to handle parallel builds. Maybe a + solution could be to prepare the the build dir for data? */ // \{ image2d<bool> ima; - io::pbm::load(ima, "my_image.pbm"); + io::pbm::load(ima, MLN_DOC_DIR "/img/small.pbm"); // \} } diff --git a/milena/doc/examples/ima-save.cc b/milena/doc/examples/ima-save.cc index b93945b..e988d11 100644 --- a/milena/doc/examples/ima-save.cc +++ b/milena/doc/examples/ima-save.cc @@ -17,6 +17,9 @@ int main() }; image2d<bool> ima = make::image(vals); + /* FIXME: MLN_DOC_DIR looks probably confusing in the + documentation... But we have to handle parallel builds. Maybe a + solution could be to prepare the the build dir for data? */ // \{ io::pbm::save(ima, MLN_DOC_DIR "/figures/ima_save.pbm"); // \} diff --git a/milena/doc/examples/split/ima-load-1.cc.raw b/milena/doc/examples/split/ima-load-1.cc.raw index 3f0f30f..532d58d 100644 --- a/milena/doc/examples/split/ima-load-1.cc.raw +++ b/milena/doc/examples/split/ima-load-1.cc.raw @@ -1,2 +1,2 @@ image2d<bool> ima; - io::pbm::load(ima, "my_image.pbm"); + io::pbm::load(ima, MLN_DOC_DIR "/img/small.pbm"); diff --git a/milena/doc/examples/tuto4/image.cc b/milena/doc/examples/tuto4/image.cc index a15af5e..af8a2d9 100644 --- a/milena/doc/examples/tuto4/image.cc +++ b/milena/doc/examples/tuto4/image.cc @@ -8,7 +8,5 @@ int main() image2d<value::int_u8> input(2,2); box2d b(2,2); - image2d<value::int_u8> input(b); - - image2d<value::int_u8> + image2d<value::int_u8> input2(b); } diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index e6ea731..3519e3f 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -46,7 +46,7 @@ $(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $( $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subimage-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ diff --git a/milena/doc/img/small.pbm b/milena/doc/img/small.pbm new file mode 120000 index 0000000..47b607b --- /dev/null +++ b/milena/doc/img/small.pbm @@ -0,0 +1 @@ +../../img/small.pbm \ No newline at end of file diff --git a/milena/doc/ppm-figures.mk b/milena/doc/ppm-figures.mk index 835a32e..25b9033 100644 --- a/milena/doc/ppm-figures.mk +++ b/milena/doc/ppm-figures.mk @@ -12,7 +12,6 @@ PPM_FIGURES = \ $(srcdir)/figures/fill-subdomain-2.ppm \ $(srcdir)/figures/fill-subdomain-3.ppm \ $(srcdir)/figures/fill-subdomain-4.ppm \ - $(srcdir)/figures/fill-subimage-cfun-1.ppm \ $(srcdir)/figures/ima2d-rot-1.ppm \ $(srcdir)/figures/ima2d-rot-2.ppm \ $(srcdir)/figures/labeling-compute-2.ppm \ -- 1.5.6.5

1 0

last-svn-commit-79-g6b0e546 Fix programs in doc/examples/.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/examples/ima-save.cc: Add a FIXME. * doc/examples/ima-load.cc: Likewise. Avoid hard-coded paths. * doc/examples/tuto4/image.cc: Make it compile. * doc/img/small.pbm: New symbolic link to img/small.pbm. * doc/examples/split/ima-load-1.cc.raw: Regen. * doc/examples/fill-imageif-cfun.cc, * figures.mk, * ppm-figures.mk: s/fill-subimage-cfun/fill-imageif-cfun/. --- milena/ChangeLog | 15 +++++++++++++++ milena/doc/examples/fill-imageif-cfun.cc | 2 +- milena/doc/examples/ima-load.cc | 8 +++++++- milena/doc/examples/ima-save.cc | 3 +++ milena/doc/examples/split/ima-load-1.cc.raw | 2 +- milena/doc/examples/tuto4/image.cc | 4 +--- milena/doc/figures.mk | 2 +- milena/doc/img/small.pbm | 1 + milena/doc/ppm-figures.mk | 1 - 9 files changed, 30 insertions(+), 8 deletions(-) create mode 120000 milena/doc/img/small.pbm diff --git a/milena/ChangeLog b/milena/ChangeLog index d9517af..937fced 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Fix programs in doc/examples/. + + * doc/examples/ima-save.cc: Add a FIXME. + * doc/examples/ima-load.cc: Likewise. + Avoid hard-coded paths. + * doc/examples/tuto4/image.cc: Make it compile. + * doc/img/small.pbm: New symbolic link to img/small.pbm. + * doc/examples/split/ima-load-1.cc.raw: Regen. + * doc/examples/fill-imageif-cfun.cc, + * figures.mk, + * ppm-figures.mk: + s/fill-subimage-cfun/fill-imageif-cfun/. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update PNG-to-EPS conversion rule. * doc/Makefile.am (.png.eps): No longer try to build figures/ in diff --git a/milena/doc/examples/fill-imageif-cfun.cc b/milena/doc/examples/fill-imageif-cfun.cc index 14fa3bb..7f1ff46 100644 --- a/milena/doc/examples/fill-imageif-cfun.cc +++ b/milena/doc/examples/fill-imageif-cfun.cc @@ -46,5 +46,5 @@ int main() data::fill((ima2 | row_oddity).rw(), literal::red); // \} - doc::ppmsave(ima2, "fill-subimage-cfun"); + doc::ppmsave(ima2, "fill-imageif-cfun"); } diff --git a/milena/doc/examples/ima-load.cc b/milena/doc/examples/ima-load.cc index 321ba9c..d3c57a8 100644 --- a/milena/doc/examples/ima-load.cc +++ b/milena/doc/examples/ima-load.cc @@ -1,10 +1,16 @@ #include <mln/core/image/image2d.hh> #include <mln/io/pbm/load.hh> + +#include "doc/tools/data.hh" + int main() { using namespace mln; + /* FIXME: MLN_DOC_DIR looks probably confusing in the + documentation... But we have to handle parallel builds. Maybe a + solution could be to prepare the the build dir for data? */ // \{ image2d<bool> ima; - io::pbm::load(ima, "my_image.pbm"); + io::pbm::load(ima, MLN_DOC_DIR "/img/small.pbm"); // \} } diff --git a/milena/doc/examples/ima-save.cc b/milena/doc/examples/ima-save.cc index b93945b..e988d11 100644 --- a/milena/doc/examples/ima-save.cc +++ b/milena/doc/examples/ima-save.cc @@ -17,6 +17,9 @@ int main() }; image2d<bool> ima = make::image(vals); + /* FIXME: MLN_DOC_DIR looks probably confusing in the + documentation... But we have to handle parallel builds. Maybe a + solution could be to prepare the the build dir for data? */ // \{ io::pbm::save(ima, MLN_DOC_DIR "/figures/ima_save.pbm"); // \} diff --git a/milena/doc/examples/split/ima-load-1.cc.raw b/milena/doc/examples/split/ima-load-1.cc.raw index 3f0f30f..532d58d 100644 --- a/milena/doc/examples/split/ima-load-1.cc.raw +++ b/milena/doc/examples/split/ima-load-1.cc.raw @@ -1,2 +1,2 @@ image2d<bool> ima; - io::pbm::load(ima, "my_image.pbm"); + io::pbm::load(ima, MLN_DOC_DIR "/img/small.pbm"); diff --git a/milena/doc/examples/tuto4/image.cc b/milena/doc/examples/tuto4/image.cc index a15af5e..af8a2d9 100644 --- a/milena/doc/examples/tuto4/image.cc +++ b/milena/doc/examples/tuto4/image.cc @@ -8,7 +8,5 @@ int main() image2d<value::int_u8> input(2,2); box2d b(2,2); - image2d<value::int_u8> input(b); - - image2d<value::int_u8> + image2d<value::int_u8> input2(b); } diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index e6ea731..3519e3f 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -46,7 +46,7 @@ $(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $( $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subimage-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ diff --git a/milena/doc/img/small.pbm b/milena/doc/img/small.pbm new file mode 120000 index 0000000..47b607b --- /dev/null +++ b/milena/doc/img/small.pbm @@ -0,0 +1 @@ +../../img/small.pbm \ No newline at end of file diff --git a/milena/doc/ppm-figures.mk b/milena/doc/ppm-figures.mk index 835a32e..25b9033 100644 --- a/milena/doc/ppm-figures.mk +++ b/milena/doc/ppm-figures.mk @@ -12,7 +12,6 @@ PPM_FIGURES = \ $(srcdir)/figures/fill-subdomain-2.ppm \ $(srcdir)/figures/fill-subdomain-3.ppm \ $(srcdir)/figures/fill-subdomain-4.ppm \ - $(srcdir)/figures/fill-subimage-cfun-1.ppm \ $(srcdir)/figures/ima2d-rot-1.ppm \ $(srcdir)/figures/ima2d-rot-2.ppm \ $(srcdir)/figures/labeling-compute-2.ppm \ -- 1.5.6.5

1 0