Olena-patches March 2010

olena-patches@lrde.epita.fr

4 participants
277 discussions

last-svn-commit-84-g2152dd0 Have ``make maintainer-clean'' remove generated figures in doc/.

by Roland Levillain

* doc/figures.mk (EXTEND_FIGURES) (FILL_FIGURES) (FILL_SUBDOMAIN_FIGURES) (FILL_IMAGEIF_CFUN_FIGURES) (IMA2D_ROT_FIGURES) (IMA_SAVE_FIGURES) (LABELING_COMPUTE_FIGURES) (LOGICAL_NOT_FIGURES) (TUTO2_FIRST_IMAGE_FIGURES) (TUTO3_COLORIZE_FIGURES) (TUTO3_RW_IMAGE_FIGURES) (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): New variables. Use them to simplify rules. (FIGURES): New variable. * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). --- milena/ChangeLog | 22 +++++++++++++ milena/doc/Makefile.am | 12 +++++-- milena/doc/figures.mk | 79 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 98 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7b7982d..90dc6e6 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. + + * doc/figures.mk + (EXTEND_FIGURES) + (FILL_FIGURES) + (FILL_SUBDOMAIN_FIGURES) + (FILL_IMAGEIF_CFUN_FIGURES) + (IMA2D_ROT_FIGURES) + (IMA_SAVE_FIGURES) + (LABELING_COMPUTE_FIGURES) + (LOGICAL_NOT_FIGURES) + (TUTO2_FIRST_IMAGE_FIGURES) + (TUTO3_COLORIZE_FIGURES) + (TUTO3_RW_IMAGE_FIGURES) + (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): + New variables. + Use them to simplify rules. + (FIGURES): New variable. + * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). + +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. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d2b6300..5d71933 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -94,6 +94,14 @@ DOC_PACKAGES = doxyfuns.sty milena.sty ## Figures. ## ## --------- ## +# Generated figures. +include $(srcdir)/figures.mk +# FIXME: $(FIGURES) is not added to EXTRA_DIST (though it is added to +# MAINTAINERCLEANFILES), because its contents is already in EXTRA_DIST +# thanks to PBM_FIGURES, PGM_FIGURES and PPM_FIGURES. However, these +# variables may be removed someday (see FIXME below). +MAINTAINERCLEANFILES = $(FIGURES) + # ----- # # PBM. # # ----- # @@ -185,7 +193,7 @@ PNG_FIGURES = \ $(PGM_FIGURES:.pgm=.png) \ $(PPM_FIGURES:.ppm=.png) EXTRA_DIST += $(PNG_FIGURES) -MAINTAINERCLEANFILES = $(PNG_FIGURES) +MAINTAINERCLEANFILES += $(PNG_FIGURES) ## ---------- ## @@ -903,8 +911,6 @@ regen-examples-outputs-mk: mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk chmod -w $(srcdir)/examples-outputs.mk -include $(srcdir)/figures.mk - ## --------------- ## ## Split outputs. ## ## --------------- ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 3519e3f..d4a9263 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -25,86 +25,141 @@ ## outputs (as a side effect) or at least if the extraction of this ## list from the source file was straightforward. -$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp +EXTEND_FIGURES = \ + $(srcdir)/figures/extend-1.ppm \ + $(srcdir)/figures/extend-2.ppm \ + $(srcdir)/figures/extend-3.ppm \ + $(srcdir)/figures/extend-4.ppm \ + $(srcdir)/figures/extend-5.ppm +$(EXTEND_FIGURES): $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp +FILL_FIGURES = \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm +$(FILL_FIGURES): $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp +FILL_SUBDOMAIN_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm +$(FILL_SUBDOMAIN_FIGURES): $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +FILL_IMAGEIF_CFUN_FIGURES = $(srcdir)/figures/fill-imageif-cfun-1.ppm +$(FILL_IMAGEIF_CFUN_FIGURES): $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp +IMA2D_ROT_FIGURES = \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm +$(IMA2D_ROT_FIGURES): $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp +IMA_SAVE_FIGURES = $(srcdir)/figures/ima_save.pbm +$(IMA_SAVE_FIGURES): $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp +LABELING_COMPUTE_FIGURES = \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/labeling-compute-2.ppm +$(LABELING_COMPUTE_FIGURES): $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp +LOGICAL_NOT_FIGURES = \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm +$(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp +TUTO2_FIRST_IMAGE_FIGURES = $(srcdir)/figures/tuto2_first_image-1.pbm +$(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp +TUTO3_COLORIZE_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm \ + $(srcdir)/figures/tuto3_colorize-2.ppm +$(TUTO3_COLORIZE_FIGURES): $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp +TUTO3_RW_IMAGE_FIGURES = \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm +$(TUTO3_RW_IMAGE_FIGURES): $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp +TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm +$(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi + +# The list of all generated figures. +FIGURES = \ + $(EXTEND_FIGURES) \ + $(FILL_FIGURES) \ + $(FILL_SUBDOMAIN_FIGURES) \ + $(FILL_IMAGEIF_CFUN_FIGURES) \ + $(IMA2D_ROT_FIGURES) \ + $(IMA_SAVE_FIGURES) \ + $(LABELING_COMPUTE_FIGURES) \ + $(LOGICAL_NOT_FIGURES) \ + $(TUTO2_FIRST_IMAGE_FIGURES) \ + $(TUTO3_COLORIZE_FIGURES) \ + $(TUTO3_RW_IMAGE_FIGURES) \ + $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) -- 1.5.6.5

14 years, 9 months

last-svn-commit-77-gf86b1e7 Have ``make maintainer-clean'' remove generated figures in doc/.

by Roland Levillain

* doc/figures.mk (EXTEND_FIGURES) (FILL_FIGURES) (FILL_SUBDOMAIN_FIGURES) (FILL_IMAGEIF_CFUN_FIGURES) (IMA2D_ROT_FIGURES) (IMA_SAVE_FIGURES) (LABELING_COMPUTE_FIGURES) (LOGICAL_NOT_FIGURES) (TUTO2_FIRST_IMAGE_FIGURES) (TUTO3_COLORIZE_FIGURES) (TUTO3_RW_IMAGE_FIGURES) (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): New variables. Use them to simplify rules. (FIGURES): New variable. * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). --- milena/ChangeLog | 22 +++++++++++++ milena/doc/Makefile.am | 12 +++++-- milena/doc/figures.mk | 79 ++++++++++++++++++++++++++++++++++++++++------- 3 files changed, 98 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1518c1a..dff8465 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,27 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. + + * doc/figures.mk + (EXTEND_FIGURES) + (FILL_FIGURES) + (FILL_SUBDOMAIN_FIGURES) + (FILL_IMAGEIF_CFUN_FIGURES) + (IMA2D_ROT_FIGURES) + (IMA_SAVE_FIGURES) + (LABELING_COMPUTE_FIGURES) + (LOGICAL_NOT_FIGURES) + (TUTO2_FIRST_IMAGE_FIGURES) + (TUTO3_COLORIZE_FIGURES) + (TUTO3_RW_IMAGE_FIGURES) + (TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): + New variables. + Use them to simplify rules. + (FIGURES): New variable. + * doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES). + +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. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d2b6300..5d71933 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -94,6 +94,14 @@ DOC_PACKAGES = doxyfuns.sty milena.sty ## Figures. ## ## --------- ## +# Generated figures. +include $(srcdir)/figures.mk +# FIXME: $(FIGURES) is not added to EXTRA_DIST (though it is added to +# MAINTAINERCLEANFILES), because its contents is already in EXTRA_DIST +# thanks to PBM_FIGURES, PGM_FIGURES and PPM_FIGURES. However, these +# variables may be removed someday (see FIXME below). +MAINTAINERCLEANFILES = $(FIGURES) + # ----- # # PBM. # # ----- # @@ -185,7 +193,7 @@ PNG_FIGURES = \ $(PGM_FIGURES:.pgm=.png) \ $(PPM_FIGURES:.ppm=.png) EXTRA_DIST += $(PNG_FIGURES) -MAINTAINERCLEANFILES = $(PNG_FIGURES) +MAINTAINERCLEANFILES += $(PNG_FIGURES) ## ---------- ## @@ -903,8 +911,6 @@ regen-examples-outputs-mk: mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk chmod -w $(srcdir)/examples-outputs.mk -include $(srcdir)/figures.mk - ## --------------- ## ## Split outputs. ## ## --------------- ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 3519e3f..d4a9263 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -25,86 +25,141 @@ ## outputs (as a side effect) or at least if the extraction of this ## list from the source file was straightforward. -$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp +EXTEND_FIGURES = \ + $(srcdir)/figures/extend-1.ppm \ + $(srcdir)/figures/extend-2.ppm \ + $(srcdir)/figures/extend-3.ppm \ + $(srcdir)/figures/extend-4.ppm \ + $(srcdir)/figures/extend-5.ppm +$(EXTEND_FIGURES): $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp +FILL_FIGURES = \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm +$(FILL_FIGURES): $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp +FILL_SUBDOMAIN_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm +$(FILL_SUBDOMAIN_FIGURES): $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/fill-imageif-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp +FILL_IMAGEIF_CFUN_FIGURES = $(srcdir)/figures/fill-imageif-cfun-1.ppm +$(FILL_IMAGEIF_CFUN_FIGURES): $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp +IMA2D_ROT_FIGURES = \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm +$(IMA2D_ROT_FIGURES): $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp +IMA_SAVE_FIGURES = $(srcdir)/figures/ima_save.pbm +$(IMA_SAVE_FIGURES): $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp +LABELING_COMPUTE_FIGURES = \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/labeling-compute-2.ppm +$(LABELING_COMPUTE_FIGURES): $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp +LOGICAL_NOT_FIGURES = \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm +$(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp +TUTO2_FIRST_IMAGE_FIGURES = $(srcdir)/figures/tuto2_first_image-1.pbm +$(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp +TUTO3_COLORIZE_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm \ + $(srcdir)/figures/tuto3_colorize-2.ppm +$(TUTO3_COLORIZE_FIGURES): $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp +TUTO3_RW_IMAGE_FIGURES = \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm +$(TUTO3_RW_IMAGE_FIGURES): $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp +TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm +$(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi + +# The list of all generated figures. +FIGURES = \ + $(EXTEND_FIGURES) \ + $(FILL_FIGURES) \ + $(FILL_SUBDOMAIN_FIGURES) \ + $(FILL_IMAGEIF_CFUN_FIGURES) \ + $(IMA2D_ROT_FIGURES) \ + $(IMA_SAVE_FIGURES) \ + $(LABELING_COMPUTE_FIGURES) \ + $(LOGICAL_NOT_FIGURES) \ + $(TUTO2_FIRST_IMAGE_FIGURES) \ + $(TUTO3_COLORIZE_FIGURES) \ + $(TUTO3_RW_IMAGE_FIGURES) \ + $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) -- 1.5.6.5

14 years, 9 months

last-svn-commit-83-g19eee8e bootstrap: Regen the list of split outputs of the documentation.

by Roland Levillain

--- 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

14 years, 9 months

last-svn-commit-76-gfc7196b bootstrap: Regen the list of split outputs of the documentation.

by Roland Levillain

--- 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

14 years, 9 months

last-svn-commit-82-gba6a3f8 Generate the list of split outputs in the documentation.

by Roland Levillain

* 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

14 years, 9 months

last-svn-commit-75-g84ab03d Generate the list of split outputs in the documentation.

by Roland Levillain

* 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

14 years, 9 months

last-svn-commit-81-ga4d6bc8 Prepare doc source files for the automation of output splitting.

by Roland Levillain

* 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

14 years, 9 months

last-svn-commit-74-geb37b34 Prepare doc source files for the automation of output splitting.

by Roland Levillain

* 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

14 years, 9 months

last-svn-commit-80-g8293184 Have split_sample.sh announce the right number of output files.

by Roland Levillain

* 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

14 years, 9 months

last-svn-commit-73-g65274cb Have split_sample.sh announce the right number of output files.

by Roland Levillain

* 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

14 years, 9 months

← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches March 2010