- Olena-patches

last-svn-commit-89-g4ee8312 bootstrap: Various fixes.
by Roland Levillain 22 Mar '10

22 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 52 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 42 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index d530769..b5040bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Various fixes. + 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Regen the list of split outputs of the documentation. diff --git a/bootstrap b/bootstrap index d607402..4484b9d 100755 --- a/bootstrap +++ b/bootstrap @@ -145,8 +145,9 @@ trap cleanup 0 1 2 3 6 15 Test \end{document} EOF - htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required" -) + htlatex >/dev/null 2>&1 test.tex +) || fatal "TeX4ht is required" + # dvipng is required by TeX4ht. require dvipng 1.11 @@ -156,42 +157,65 @@ run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-he # Generate scribo/headers.mk run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers scribo scribo -# Generate lists of files to be part of the distribution -# for the tutorial. +# Generate files of Milena's documentation. # * Figures. gen_doc_figures() { + rm -f "milena/doc/$2-figures.mk.tmp" milena/doc/gen-make-variable "$1" \ `find milena/doc/figures/*.$2 | sed 's,^milena/doc,\$(srcdir),'` \ - >"milena/doc/$2-figures.mk" \ - || fatal "unexpected failure: $@" + >"milena/doc/$2-figures.mk.tmp" + mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" + chmod -w "milena/doc/$2-figures.mk" } gen_doc_figures PBM_FIGURES pbm gen_doc_figures PGM_FIGURES pgm gen_doc_figures PPM_FIGURES ppm -run milena/doc/ ./generate_dist_files.sh outputs txt # * Examples. +rm -f milena/doc/examples.mk.tmp milena/doc/gen-make-variable EXAMPLES \ `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ - >milena/doc/examples.mk + >milena/doc/examples.mk.tmp +mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk +chmod -w milena/doc/examples.mk # * Split examples. -cd milena/doc && ./gen-split-examples-mk >split-examples.mk +( + cd milena/doc + rm -f split-examples.mk.tmp + ./gen-split-examples-mk >split-examples.mk.tmp + mv -f split-examples.mk.tmp split-examples.mk + chmod -w split-examples.mk +) # * Outputs. +rm -f milena/doc/outputs.mk.tmp milena/doc/gen-make-variable OUTPUTS \ `find milena/doc/examples \ -name \*.cc -a \! -path milena/doc/examples/trash/\* \ | sed -e 's,milena/doc/examples/,,' \ -e 'y,/,_,' \ - -e 's,$.*$\.cc$,milena/doc/outputs/\1.txt,'` \ - >milena/doc/outputs.mk + -e 's,$.*$\.cc$,$(srcdir)/outputs/\1.txt,'` \ + >milena/doc/outputs.mk.tmp +mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk +chmod -w milena/doc/outputs.mk # * Outputs rules and timestamps. -cd milena/doc && \ +( + cd milena/doc + rm -f examples-outputs.mk.tmp ./gen-examples-outputs-mk \ `find examples -name \*.cc -a \! -path examples/trash/\* \ | env LC_ALL=C sort` \ - >examples-outputs.mk + >examples-outputs.mk.tmp + mv -f examples-outputs.mk.tmp examples-outputs.mk + chmod -w examples-outputs.mk +) # * Split outputs. -cd milena/doc && ./gen-split-outputs-mk >split-outputs.mk +( + cd milena/doc + rm -f split-outputs.mk.tmp + ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f split-outputs.mk.tmp split-outputs.mk + chmod -w 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-95-g67339bf Remove useless regen actions from bootstrap.
by Roland Levillain 22 Mar '10

22 Mar '10

* bootstrap (gen_doc_figures): Remove this function, and its uses as well. --- ChangeLog | 7 +++++++ bootstrap | 16 +++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7bd8ec3..94dd844 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless regen actions from bootstrap. + + * bootstrap (gen_doc_figures): Remove this function, and its uses + as well. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Add options to boostrap. * bootstrap: Here. diff --git a/bootstrap b/bootstrap index 59d56c9..8f7d0c0 100755 --- a/bootstrap +++ b/bootstrap @@ -155,6 +155,9 @@ require $libtoolize 1.5.22 require doxygen 1.5.6 require convert 6.3.7 +# FIXME: Also check these: +# epstopdf +# pgf (how?) # Check for TeX4ht. htlatex and friends do not have options like # `--version', `-version', `-v', etc. Hence this ad hoc procedure. @@ -177,16 +180,6 @@ EOF require dvipng 1.11 -gen_doc_figures() -{ - rm -f "milena/doc/$2-figures.mk.tmp" - milena/doc/gen-make-variable "$1" \ - `find milena/doc/figures/*.$2 | sed 's,^milena/doc,\$(srcdir),'` \ - >"milena/doc/$2-figures.mk.tmp" - mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" - chmod -w "milena/doc/$2-figures.mk" -} - # Regen files stored in the repository if asked so. if $regen_p; then # Generate files of Milena's documentation. @@ -198,9 +191,6 @@ if $regen_p; then mv -f figures.mk.tmp figures.mk chmod -w figures.mk ) - gen_doc_figures PBM_FIGURES pbm - gen_doc_figures PGM_FIGURES pgm - gen_doc_figures PPM_FIGURES ppm # * Examples. rm -f milena/doc/examples.mk.tmp milena/doc/gen-make-variable EXAMPLES \ -- 1.5.6.5

1 0

last-svn-commit-102-gc0a2675 Remove useless regen actions from bootstrap.
by Roland Levillain 22 Mar '10

22 Mar '10

* bootstrap (gen_doc_figures): Remove this function, and its uses as well. --- ChangeLog | 7 +++++++ bootstrap | 16 +++------------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b17931..826eb19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless regen actions from bootstrap. + + * bootstrap (gen_doc_figures): Remove this function, and its uses + as well. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Add options to boostrap. * bootstrap: Here. diff --git a/bootstrap b/bootstrap index 59d56c9..8f7d0c0 100755 --- a/bootstrap +++ b/bootstrap @@ -155,6 +155,9 @@ require $libtoolize 1.5.22 require doxygen 1.5.6 require convert 6.3.7 +# FIXME: Also check these: +# epstopdf +# pgf (how?) # Check for TeX4ht. htlatex and friends do not have options like # `--version', `-version', `-v', etc. Hence this ad hoc procedure. @@ -177,16 +180,6 @@ EOF require dvipng 1.11 -gen_doc_figures() -{ - rm -f "milena/doc/$2-figures.mk.tmp" - milena/doc/gen-make-variable "$1" \ - `find milena/doc/figures/*.$2 | sed 's,^milena/doc,\$(srcdir),'` \ - >"milena/doc/$2-figures.mk.tmp" - mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" - chmod -w "milena/doc/$2-figures.mk" -} - # Regen files stored in the repository if asked so. if $regen_p; then # Generate files of Milena's documentation. @@ -198,9 +191,6 @@ if $regen_p; then mv -f figures.mk.tmp figures.mk chmod -w figures.mk ) - gen_doc_figures PBM_FIGURES pbm - gen_doc_figures PGM_FIGURES pgm - gen_doc_figures PPM_FIGURES ppm # * Examples. rm -f milena/doc/examples.mk.tmp milena/doc/gen-make-variable EXAMPLES \ -- 1.5.6.5

1 0

last-svn-commit-94-g4498502 Have doc/gen-figures-mk generate more Makefile bits.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-figures-mk: Generate Make variables PBM_FIGURES, PGM_FIGURES and PPM_FIGURES in output. * doc/figures.mk: Regen. * doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk, $(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk. ($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk) ($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk) ($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk): Remove rules. (EXTRA_DIST): Add $(FIGURES). Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES). * doc/pbm-figures.mk, * doc/pgm-figures.mk, * doc/ppm-figures.mk: Remove. --- milena/ChangeLog | 20 ++++++++++ milena/doc/Makefile.am | 92 ++++++-------------------------------------- milena/doc/figures.mk | 41 ++++++++++++++++++++ milena/doc/gen-figures-mk | 29 ++++++++++++++- milena/doc/pbm-figures.mk | 11 ----- milena/doc/pgm-figures.mk | 7 --- milena/doc/ppm-figures.mk | 29 -------------- 7 files changed, 102 insertions(+), 127 deletions(-) delete mode 100644 milena/doc/pbm-figures.mk delete mode 100644 milena/doc/pgm-figures.mk delete mode 100644 milena/doc/ppm-figures.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index d852efd..ea7ae4c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Have doc/gen-figures-mk generate more Makefile bits. + + * doc/gen-figures-mk: Generate Make variables PBM_FIGURES, + PGM_FIGURES and PPM_FIGURES in output. + * doc/figures.mk: Regen. + * doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk, + $(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk) + ($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk) + ($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk): + Remove rules. + (EXTRA_DIST): Add $(FIGURES). + Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES). + * doc/pbm-figures.mk, + * doc/pgm-figures.mk, + * doc/ppm-figures.mk: + Remove. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Rework doc/gen-figures-mk a bit. * doc/gen-figures-mk (gen_var): New function. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b36ad89..54342e8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,10 +102,7 @@ $(srcdir)/figures.mk: $(srcdir)/gen-figures-mk mv -f $@.tmp $@ chmod -w $@ 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). +EXTRA_DIST += $(FIGURES) MAINTAINERCLEANFILES = $(FIGURES) .PHONY: regen-figures-mk @@ -115,82 +112,11 @@ regen-figures-mk: mv -f $(srcdir)/figures.mk.tmp $(srcdir)/figures.mk chmod -w $(srcdir)/figures.mk -# This image seems to be used nowhere. -MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf -EXTRA_DIST += $(MORE_FIGURES) +# ------------- # +# PNG figures. # +# ------------- # -# ----- # -# PBM. # -# ----- # - -$(srcdir)/pbm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PBM_FIGURES \ - `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/pbm-figures.mk -EXTRA_DIST += $(PBM_FIGURES) - -.PHONY: regen-pbm-figures-mk -regen-pbm-figures-mk: - rm -f $(srcdir)/pbm-figures.mk.tmp - $(srcdir)/gen-make-variable PBM_FIGURES \ - `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/pbm-figures.mk.tmp - mv -f $(srcdir)/pbm-figures.mk.tmp $(srcdir)/pbm-figures.mk - chmod -w $(srcdir)/pbm-figures.mk - -# ----- # -# PGM. # -# ----- # - -$(srcdir)/pgm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PGM_FIGURES \ - `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/pgm-figures.mk -EXTRA_DIST += $(PGM_FIGURES) - -.PHONY: regen-pgm-figures-mk -regen-pgm-figures-mk: - rm -f $(srcdir)/pgm-figures.mk.tmp - $(srcdir)/gen-make-variable PGM_FIGURES \ - `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/pgm-figures.mk.tmp - mv -f $(srcdir)/pgm-figures.mk.tmp $(srcdir)/pgm-figures.mk - chmod -w $(srcdir)/pgm-figures.mk - -# ----- # -# PPM. # -# ----- # - -$(srcdir)/ppm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PPM_FIGURES \ - `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/ppm-figures.mk -EXTRA_DIST += $(PPM_FIGURES) - -.PHONY: regen-ppm-figures-mk -regen-ppm-figures-mk: - rm -f $(srcdir)/ppm-figures.mk.tmp - $(srcdir)/gen-make-variable PPM_FIGURES \ - `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/ppm-figures.mk.tmp - mv -f $(srcdir)/ppm-figures.mk.tmp $(srcdir)/ppm-figures.mk - chmod -w $(srcdir)/ppm-figures.mk - -# ----- # -# PNG. # -# ----- # +# PNG figures are generated from PBM, PGM and PPM figures. convert_to_png = convert -scale 250 -bordercolor black -border 2x2 @@ -212,6 +138,14 @@ PNG_FIGURES = \ EXTRA_DIST += $(PNG_FIGURES) MAINTAINERCLEANFILES += $(PNG_FIGURES) +# --------------- # +# Other figures. # +# --------------- # + +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + ## ---------- ## ## Examples. ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 4dce4cd..c3e72f1 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -145,3 +145,44 @@ FIGURES = \ $(TUTO3_COLORIZE_FIGURES) \ $(TUTO3_RW_IMAGE_FIGURES) \ $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) + +# The list of all generated PBM figures. +PBM_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/ima_save.pbm \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm \ + $(srcdir)/figures/tuto2_first_image-1.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm + +# The list of all generated PGM figures. +PGM_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm + +# The list of all generated PPM figures. +PPM_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 \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm \ + $(srcdir)/figures/fill-imageif-cfun-1.ppm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm \ + $(srcdir)/figures/labeling-compute-2.ppm \ + $(srcdir)/figures/tuto3_colorize-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index a566cee..ca20fc9 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -102,6 +102,14 @@ gen_var() done } | backslashify } + +# List of paths to PBM figures. +pbm_fig_paths= +# List of paths to PGM figures. +pgg_fig_paths= +# List of paths to PPM figures. +ppm_fig_paths= + cat<<EOF ## Generated by $me. Do not edit by hand. @@ -134,6 +142,16 @@ for file in `inputs`; do # Populate the list of variables of figures. fig_vars="$fig_vars \$($fig_var)" + # Populate the list of paths to figures of a given format. + for figure in $figures; do + fig_path=" \$(srcdir)/figures/$figure" + case "$figure" in + *.pbm) pbm_fig_paths="$pbm_fig_paths $fig_path";; + *.pgm) pgm_fig_paths="$pgm_fig_paths $fig_path";; + *.ppm) ppm_fig_paths="$ppm_fig_paths $fig_path";; + esac + done + # Generate a Make variable for the figures produced by FILE. { echo "$fig_var =" @@ -160,6 +178,15 @@ EOF done -# Output the list of figures. +# More Make variables. echo "# The list of all generated figures." gen_var FIGURES $fig_vars +echo +echo "# The list of all generated PBM figures." +gen_var PBM_FIGURES $pbm_fig_paths +echo +echo "# The list of all generated PGM figures." +gen_var PGM_FIGURES $pgm_fig_paths +echo +echo "# The list of all generated PPM figures." +gen_var PPM_FIGURES $ppm_fig_paths diff --git a/milena/doc/pbm-figures.mk b/milena/doc/pbm-figures.mk deleted file mode 100644 index dd061a5..0000000 --- a/milena/doc/pbm-figures.mk +++ /dev/null @@ -1,11 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PBM_FIGURES = \ - $(srcdir)/figures/fill-subdomain-1.pbm \ - $(srcdir)/figures/ima_save.pbm \ - $(srcdir)/figures/labeling-compute-1.pbm \ - $(srcdir)/figures/logical-not-1.pbm \ - $(srcdir)/figures/logical-not-2.pbm \ - $(srcdir)/figures/logical-not-3.pbm \ - $(srcdir)/figures/tuto2_first_image-1.pbm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm diff --git a/milena/doc/pgm-figures.mk b/milena/doc/pgm-figures.mk deleted file mode 100644 index b65d78f..0000000 --- a/milena/doc/pgm-figures.mk +++ /dev/null @@ -1,7 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PGM_FIGURES = \ - $(srcdir)/figures/tuto3_colorize-1.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-7.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-8.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-9.pgm diff --git a/milena/doc/ppm-figures.mk b/milena/doc/ppm-figures.mk deleted file mode 100644 index 25b9033..0000000 --- a/milena/doc/ppm-figures.mk +++ /dev/null @@ -1,29 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PPM_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 \ - $(srcdir)/figures/fill-1.ppm \ - $(srcdir)/figures/fill-2.ppm \ - $(srcdir)/figures/fill-imageif-cfun-1.ppm \ - $(srcdir)/figures/fill-subdomain-2.ppm \ - $(srcdir)/figures/fill-subdomain-3.ppm \ - $(srcdir)/figures/fill-subdomain-4.ppm \ - $(srcdir)/figures/ima2d-rot-1.ppm \ - $(srcdir)/figures/ima2d-rot-2.ppm \ - $(srcdir)/figures/labeling-compute-2.ppm \ - $(srcdir)/figures/tuto3_colorize-2.ppm \ - $(srcdir)/figures/tuto3_rw_image-1.ppm \ - $(srcdir)/figures/tuto3_rw_image-2.ppm \ - $(srcdir)/figures/tuto3_rw_image-3.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ - $(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)/figures/tuto4_genericity_and_algorithms-7.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-8.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-9.ppm -- 1.5.6.5

1 0

last-svn-commit-101-g2199e6c Have doc/gen-figures-mk generate more Makefile bits.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-figures-mk: Generate Make variables PBM_FIGURES, PGM_FIGURES and PPM_FIGURES in output. * doc/figures.mk: Regen. * doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk, $(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk. ($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk) ($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk) ($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk): Remove rules. (EXTRA_DIST): Add $(FIGURES). Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES). * doc/pbm-figures.mk, * doc/pgm-figures.mk, * doc/ppm-figures.mk: Remove. --- milena/ChangeLog | 20 ++++++++++ milena/doc/Makefile.am | 92 ++++++-------------------------------------- milena/doc/figures.mk | 41 ++++++++++++++++++++ milena/doc/gen-figures-mk | 29 ++++++++++++++- milena/doc/pbm-figures.mk | 11 ----- milena/doc/pgm-figures.mk | 7 --- milena/doc/ppm-figures.mk | 29 -------------- 7 files changed, 102 insertions(+), 127 deletions(-) delete mode 100644 milena/doc/pbm-figures.mk delete mode 100644 milena/doc/pgm-figures.mk delete mode 100644 milena/doc/ppm-figures.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index a68576b..5e7ce97 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Have doc/gen-figures-mk generate more Makefile bits. + + * doc/gen-figures-mk: Generate Make variables PBM_FIGURES, + PGM_FIGURES and PPM_FIGURES in output. + * doc/figures.mk: Regen. + * doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk, + $(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk) + ($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk) + ($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk): + Remove rules. + (EXTRA_DIST): Add $(FIGURES). + Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES). + * doc/pbm-figures.mk, + * doc/pgm-figures.mk, + * doc/ppm-figures.mk: + Remove. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Rework doc/gen-figures-mk a bit. * doc/gen-figures-mk (gen_var): New function. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b36ad89..54342e8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,10 +102,7 @@ $(srcdir)/figures.mk: $(srcdir)/gen-figures-mk mv -f $@.tmp $@ chmod -w $@ 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). +EXTRA_DIST += $(FIGURES) MAINTAINERCLEANFILES = $(FIGURES) .PHONY: regen-figures-mk @@ -115,82 +112,11 @@ regen-figures-mk: mv -f $(srcdir)/figures.mk.tmp $(srcdir)/figures.mk chmod -w $(srcdir)/figures.mk -# This image seems to be used nowhere. -MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf -EXTRA_DIST += $(MORE_FIGURES) +# ------------- # +# PNG figures. # +# ------------- # -# ----- # -# PBM. # -# ----- # - -$(srcdir)/pbm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PBM_FIGURES \ - `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/pbm-figures.mk -EXTRA_DIST += $(PBM_FIGURES) - -.PHONY: regen-pbm-figures-mk -regen-pbm-figures-mk: - rm -f $(srcdir)/pbm-figures.mk.tmp - $(srcdir)/gen-make-variable PBM_FIGURES \ - `find $(srcdir)/figures/*.pbm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/pbm-figures.mk.tmp - mv -f $(srcdir)/pbm-figures.mk.tmp $(srcdir)/pbm-figures.mk - chmod -w $(srcdir)/pbm-figures.mk - -# ----- # -# PGM. # -# ----- # - -$(srcdir)/pgm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PGM_FIGURES \ - `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/pgm-figures.mk -EXTRA_DIST += $(PGM_FIGURES) - -.PHONY: regen-pgm-figures-mk -regen-pgm-figures-mk: - rm -f $(srcdir)/pgm-figures.mk.tmp - $(srcdir)/gen-make-variable PGM_FIGURES \ - `find $(srcdir)/figures/*.pgm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/pgm-figures.mk.tmp - mv -f $(srcdir)/pgm-figures.mk.tmp $(srcdir)/pgm-figures.mk - chmod -w $(srcdir)/pgm-figures.mk - -# ----- # -# PPM. # -# ----- # - -$(srcdir)/ppm-figures.mk: $(srcdir)/gen-make-variable - rm -f $@.tmp - $(srcdir)/gen-make-variable PPM_FIGURES \ - `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$@.tmp - mv -f $@.tmp $@ - chmod -w $@ -include $(srcdir)/ppm-figures.mk -EXTRA_DIST += $(PPM_FIGURES) - -.PHONY: regen-ppm-figures-mk -regen-ppm-figures-mk: - rm -f $(srcdir)/ppm-figures.mk.tmp - $(srcdir)/gen-make-variable PPM_FIGURES \ - `find $(srcdir)/figures/*.ppm | sed 's,^$(srcdir),\$$(srcdir),'` \ - >$(srcdir)/ppm-figures.mk.tmp - mv -f $(srcdir)/ppm-figures.mk.tmp $(srcdir)/ppm-figures.mk - chmod -w $(srcdir)/ppm-figures.mk - -# ----- # -# PNG. # -# ----- # +# PNG figures are generated from PBM, PGM and PPM figures. convert_to_png = convert -scale 250 -bordercolor black -border 2x2 @@ -212,6 +138,14 @@ PNG_FIGURES = \ EXTRA_DIST += $(PNG_FIGURES) MAINTAINERCLEANFILES += $(PNG_FIGURES) +# --------------- # +# Other figures. # +# --------------- # + +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + ## ---------- ## ## Examples. ## diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index 4dce4cd..c3e72f1 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -145,3 +145,44 @@ FIGURES = \ $(TUTO3_COLORIZE_FIGURES) \ $(TUTO3_RW_IMAGE_FIGURES) \ $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES) + +# The list of all generated PBM figures. +PBM_FIGURES = \ + $(srcdir)/figures/fill-subdomain-1.pbm \ + $(srcdir)/figures/ima_save.pbm \ + $(srcdir)/figures/labeling-compute-1.pbm \ + $(srcdir)/figures/logical-not-1.pbm \ + $(srcdir)/figures/logical-not-2.pbm \ + $(srcdir)/figures/logical-not-3.pbm \ + $(srcdir)/figures/tuto2_first_image-1.pbm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm + +# The list of all generated PGM figures. +PGM_FIGURES = \ + $(srcdir)/figures/tuto3_colorize-1.pgm + +# The list of all generated PPM figures. +PPM_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 \ + $(srcdir)/figures/fill-1.ppm \ + $(srcdir)/figures/fill-2.ppm \ + $(srcdir)/figures/fill-imageif-cfun-1.ppm \ + $(srcdir)/figures/fill-subdomain-2.ppm \ + $(srcdir)/figures/fill-subdomain-3.ppm \ + $(srcdir)/figures/fill-subdomain-4.ppm \ + $(srcdir)/figures/ima2d-rot-1.ppm \ + $(srcdir)/figures/ima2d-rot-2.ppm \ + $(srcdir)/figures/labeling-compute-2.ppm \ + $(srcdir)/figures/tuto3_colorize-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-1.ppm \ + $(srcdir)/figures/tuto3_rw_image-2.ppm \ + $(srcdir)/figures/tuto3_rw_image-3.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm \ + $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index a566cee..ca20fc9 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -102,6 +102,14 @@ gen_var() done } | backslashify } + +# List of paths to PBM figures. +pbm_fig_paths= +# List of paths to PGM figures. +pgg_fig_paths= +# List of paths to PPM figures. +ppm_fig_paths= + cat<<EOF ## Generated by $me. Do not edit by hand. @@ -134,6 +142,16 @@ for file in `inputs`; do # Populate the list of variables of figures. fig_vars="$fig_vars \$($fig_var)" + # Populate the list of paths to figures of a given format. + for figure in $figures; do + fig_path=" \$(srcdir)/figures/$figure" + case "$figure" in + *.pbm) pbm_fig_paths="$pbm_fig_paths $fig_path";; + *.pgm) pgm_fig_paths="$pgm_fig_paths $fig_path";; + *.ppm) ppm_fig_paths="$ppm_fig_paths $fig_path";; + esac + done + # Generate a Make variable for the figures produced by FILE. { echo "$fig_var =" @@ -160,6 +178,15 @@ EOF done -# Output the list of figures. +# More Make variables. echo "# The list of all generated figures." gen_var FIGURES $fig_vars +echo +echo "# The list of all generated PBM figures." +gen_var PBM_FIGURES $pbm_fig_paths +echo +echo "# The list of all generated PGM figures." +gen_var PGM_FIGURES $pgm_fig_paths +echo +echo "# The list of all generated PPM figures." +gen_var PPM_FIGURES $ppm_fig_paths diff --git a/milena/doc/pbm-figures.mk b/milena/doc/pbm-figures.mk deleted file mode 100644 index dd061a5..0000000 --- a/milena/doc/pbm-figures.mk +++ /dev/null @@ -1,11 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PBM_FIGURES = \ - $(srcdir)/figures/fill-subdomain-1.pbm \ - $(srcdir)/figures/ima_save.pbm \ - $(srcdir)/figures/labeling-compute-1.pbm \ - $(srcdir)/figures/logical-not-1.pbm \ - $(srcdir)/figures/logical-not-2.pbm \ - $(srcdir)/figures/logical-not-3.pbm \ - $(srcdir)/figures/tuto2_first_image-1.pbm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm diff --git a/milena/doc/pgm-figures.mk b/milena/doc/pgm-figures.mk deleted file mode 100644 index b65d78f..0000000 --- a/milena/doc/pgm-figures.mk +++ /dev/null @@ -1,7 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PGM_FIGURES = \ - $(srcdir)/figures/tuto3_colorize-1.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-7.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-8.pgm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-9.pgm diff --git a/milena/doc/ppm-figures.mk b/milena/doc/ppm-figures.mk deleted file mode 100644 index 25b9033..0000000 --- a/milena/doc/ppm-figures.mk +++ /dev/null @@ -1,29 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -PPM_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 \ - $(srcdir)/figures/fill-1.ppm \ - $(srcdir)/figures/fill-2.ppm \ - $(srcdir)/figures/fill-imageif-cfun-1.ppm \ - $(srcdir)/figures/fill-subdomain-2.ppm \ - $(srcdir)/figures/fill-subdomain-3.ppm \ - $(srcdir)/figures/fill-subdomain-4.ppm \ - $(srcdir)/figures/ima2d-rot-1.ppm \ - $(srcdir)/figures/ima2d-rot-2.ppm \ - $(srcdir)/figures/labeling-compute-2.ppm \ - $(srcdir)/figures/tuto3_colorize-2.ppm \ - $(srcdir)/figures/tuto3_rw_image-1.ppm \ - $(srcdir)/figures/tuto3_rw_image-2.ppm \ - $(srcdir)/figures/tuto3_rw_image-3.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm \ - $(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)/figures/tuto4_genericity_and_algorithms-7.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-8.ppm \ - $(srcdir)/figures/tuto4_genericity_and_algorithms-9.ppm -- 1.5.6.5

1 0

last-svn-commit-93-g9729ffb Rework doc/gen-figures-mk a bit.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-figures-mk (gen_var): New function. Use to factor the emission of the Make variable at the end of the output. Aesthetic changes. --- milena/ChangeLog | 9 +++++ milena/doc/gen-figures-mk | 77 +++++++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d4633d1..d852efd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Rework doc/gen-figures-mk a bit. + + * doc/gen-figures-mk (gen_var): New function. + Use to factor the emission of the Make variable at the end of the + output. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/gen-split-outputs-mk. * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index cdbffbf..a566cee 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -85,9 +85,23 @@ backslashify() echo "$last_line" } -# Empty FIG_VARS. +# List of generated figures. fig_vars= +# gen_var VARIABLE [ITEMS...] +# --------------------------- +# Generate a Make variable named VARIABLE containing ITEMS. +gen_var() +{ + local v + { + echo "$1 =" + shift + for v; do + echo " $v" + done + } | backslashify +} cat<<EOF ## Generated by $me. Do not edit by hand. @@ -107,32 +121,33 @@ for file in `inputs`; do fi if test -n "$figures"; then - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - canonical_var=`canonicalize "$canonical_name"` - fig_var="`upcase "$canonical_var"`_FIGURES" - # Populate the list of variables of figures. - if test -z "$fig_vars"; then - fig_vars="$fig_var" - else - fig_vars="$fig_vars $fig_var" - fi - { - echo "$fig_var =" - for figure in $figures; do - echo " \$(srcdir)/figures/$figure" - done - } | backslashify - base=`basename "$file" .cc` - dir=`dirname "$file"` - timestamp="\$(srcdir)/$dir/$base.stamp" - cat <<EOF + # FIXME: Programs of which sources are located in a subdirectory of + # examples/ take the path as prefix of their name. This is a pain. + # It'd be much simpler to have all sources in the same directory. + canonical_name=`echo "$file" \ + | sed -e 's,examples/,,' \ + -e 'y,/,_,' \ + -e 's,\.cc$,,'` + canonical_var=`canonicalize "$canonical_name"` + fig_var="`upcase "$canonical_var"`_FIGURES" + + # Populate the list of variables of figures. + fig_vars="$fig_vars \$($fig_var)" + + # Generate a Make variable for the figures produced by FILE. + { + echo "$fig_var =" + for figure in $figures; do + fig_path=" \$(srcdir)/figures/$figure" + echo "$fig_path" + done + } | backslashify + + # Generate a Make rule to regen the figures produced by FILE. + base=`basename "$file" .cc` + dir=`dirname "$file"` + timestamp="\$(srcdir)/$dir/$base.stamp" + cat <<EOF \$($fig_var): $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ @@ -141,16 +156,10 @@ for file in `inputs`; do fi EOF - fi done # Output the list of figures. echo "# The list of all generated figures." -{ - echo "FIGURES =" - for v in $fig_vars; do - echo " \$($v)" - done -} | backslashify +gen_var FIGURES $fig_vars -- 1.5.6.5

1 0

last-svn-commit-100-g390b095 Rework doc/gen-figures-mk a bit.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-figures-mk (gen_var): New function. Use to factor the emission of the Make variable at the end of the output. Aesthetic changes. --- milena/ChangeLog | 9 +++++ milena/doc/gen-figures-mk | 77 +++++++++++++++++++++++++-------------------- 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 55db7c1..a68576b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Rework doc/gen-figures-mk a bit. + + * doc/gen-figures-mk (gen_var): New function. + Use to factor the emission of the Make variable at the end of the + output. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/gen-split-outputs-mk. * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index cdbffbf..a566cee 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -85,9 +85,23 @@ backslashify() echo "$last_line" } -# Empty FIG_VARS. +# List of generated figures. fig_vars= +# gen_var VARIABLE [ITEMS...] +# --------------------------- +# Generate a Make variable named VARIABLE containing ITEMS. +gen_var() +{ + local v + { + echo "$1 =" + shift + for v; do + echo " $v" + done + } | backslashify +} cat<<EOF ## Generated by $me. Do not edit by hand. @@ -107,32 +121,33 @@ for file in `inputs`; do fi if test -n "$figures"; then - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - canonical_var=`canonicalize "$canonical_name"` - fig_var="`upcase "$canonical_var"`_FIGURES" - # Populate the list of variables of figures. - if test -z "$fig_vars"; then - fig_vars="$fig_var" - else - fig_vars="$fig_vars $fig_var" - fi - { - echo "$fig_var =" - for figure in $figures; do - echo " \$(srcdir)/figures/$figure" - done - } | backslashify - base=`basename "$file" .cc` - dir=`dirname "$file"` - timestamp="\$(srcdir)/$dir/$base.stamp" - cat <<EOF + # FIXME: Programs of which sources are located in a subdirectory of + # examples/ take the path as prefix of their name. This is a pain. + # It'd be much simpler to have all sources in the same directory. + canonical_name=`echo "$file" \ + | sed -e 's,examples/,,' \ + -e 'y,/,_,' \ + -e 's,\.cc$,,'` + canonical_var=`canonicalize "$canonical_name"` + fig_var="`upcase "$canonical_var"`_FIGURES" + + # Populate the list of variables of figures. + fig_vars="$fig_vars \$($fig_var)" + + # Generate a Make variable for the figures produced by FILE. + { + echo "$fig_var =" + for figure in $figures; do + fig_path=" \$(srcdir)/figures/$figure" + echo "$fig_path" + done + } | backslashify + + # Generate a Make rule to regen the figures produced by FILE. + base=`basename "$file" .cc` + dir=`dirname "$file"` + timestamp="\$(srcdir)/$dir/$base.stamp" + cat <<EOF \$($fig_var): $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ @@ -141,16 +156,10 @@ for file in `inputs`; do fi EOF - fi done # Output the list of figures. echo "# The list of all generated figures." -{ - echo "FIGURES =" - for v in $fig_vars; do - echo " \$($v)" - done -} | backslashify +gen_var FIGURES $fig_vars -- 1.5.6.5

1 0

last-svn-commit-92-gd9609f2 Add options to boostrap.
by Roland Levillain 22 Mar '10

22 Mar '10

* bootstrap: Here. (usage): New function. Call it when invoked with option `-h, --help'. Regen files stored in the repository only if invoked with option `-r, --regen'. --- ChangeLog | 10 ++++ bootstrap | 160 +++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 102 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bf4a84..7bd8ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Add options to boostrap. + + * bootstrap: Here. + (usage): New function. Call it when invoked with option + `-h, --help'. + Regen files stored in the repository only if invoked with option + `-r, --regen'. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Make a more portable use of mktemp. 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4e8c5d5..59d56c9 100755 --- a/bootstrap +++ b/bootstrap @@ -11,6 +11,22 @@ stderr () echo >&2 "$0: $@" } +usage () +{ + cat <<EOF +Usage: $0 [OPTION] + +Options: + -h, --help display this message + -r, --regen regenerate files stored in the repository + +Report bugs to <olena-bugs(a)lrde.epita.fr> +EOF +} + +# Regenerate files stored in the repository? +regen_p=false + awk_strverscmp=' # Use only awk features that work with 7th edition Unix awk (1978). # My, what an old awk you have, Mr. Solaris! @@ -114,6 +130,15 @@ run () # Failures do matter. set -e +# Process arguments. +for arg in "$@"; do + case "$arg" in + -h|--help) usage; exit 0 ;; + -r|--regen) regen_p=true ;; + *) fatal "error: unrecognized option: $1" ;; + esac +done + # Requirements over bootstrap tools. require autoconf 2.61 require automake 1.10 @@ -151,21 +176,7 @@ EOF # dvipng is required by TeX4ht. require dvipng 1.11 -# Generate milena/headers.mk -run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers - -# Generate scribo/headers.mk -run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers scribo scribo -# Generate files of Milena's documentation. -# * Figures. -( - cd milena/doc - rm -f figures.mk.tmp - ./gen-figures-mk >figures.mk.tmp - mv -f figures.mk.tmp figures.mk - chmod -w figures.mk -) gen_doc_figures() { rm -f "milena/doc/$2-figures.mk.tmp" @@ -175,60 +186,73 @@ gen_doc_figures() mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" chmod -w "milena/doc/$2-figures.mk" } -gen_doc_figures PBM_FIGURES pbm -gen_doc_figures PGM_FIGURES pgm -gen_doc_figures PPM_FIGURES ppm -# * Examples. -rm -f milena/doc/examples.mk.tmp -milena/doc/gen-make-variable EXAMPLES \ - `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ - >milena/doc/examples.mk.tmp -mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk -chmod -w milena/doc/examples.mk -# * Split examples. -( - cd milena/doc - rm -f split-examples.mk.tmp - ./gen-split-examples-mk >split-examples.mk.tmp - mv -f split-examples.mk.tmp split-examples.mk - chmod -w split-examples.mk -) -# * Outputs. -rm -f milena/doc/outputs.mk.tmp -milena/doc/gen-make-variable OUTPUTS \ - `find milena/doc/examples \ - -name \*.cc -a \! -path milena/doc/examples/trash/\* \ - | sed -e 's,milena/doc/examples/,,' \ - -e 'y,/,_,' \ - -e 's,$.*$\.cc$,$(srcdir)/outputs/\1.txt,'` \ - >milena/doc/outputs.mk.tmp -mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk -chmod -w milena/doc/outputs.mk -# * Outputs rules and timestamps. -( - cd milena/doc - rm -f examples-outputs.mk.tmp - ./gen-examples-outputs-mk \ - `find examples -name \*.cc -a \! -path examples/trash/\* \ - | env LC_ALL=C sort` \ - >examples-outputs.mk.tmp - mv -f examples-outputs.mk.tmp examples-outputs.mk - chmod -w examples-outputs.mk -) -# * Split outputs. -( - cd milena/doc - rm -f split-outputs.mk.tmp - ./gen-split-outputs-mk >split-outputs.mk.tmp - mv -f split-outputs.mk.tmp split-outputs.mk - chmod -w 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 - -# Generate unit test files for Scribo. -run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . + +# Regen files stored in the repository if asked so. +if $regen_p; then + # Generate files of Milena's documentation. + # * Figures. + ( + cd milena/doc + rm -f figures.mk.tmp + ./gen-figures-mk >figures.mk.tmp + mv -f figures.mk.tmp figures.mk + chmod -w figures.mk + ) + gen_doc_figures PBM_FIGURES pbm + gen_doc_figures PGM_FIGURES pgm + gen_doc_figures PPM_FIGURES ppm + # * Examples. + rm -f milena/doc/examples.mk.tmp + milena/doc/gen-make-variable EXAMPLES \ + `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ + >milena/doc/examples.mk.tmp + mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk + chmod -w milena/doc/examples.mk + # * Split examples. + ( + cd milena/doc + rm -f split-examples.mk.tmp + ./gen-split-examples-mk >split-examples.mk.tmp + mv -f split-examples.mk.tmp split-examples.mk + chmod -w split-examples.mk + ) + # * Outputs. + rm -f milena/doc/outputs.mk.tmp + milena/doc/gen-make-variable OUTPUTS \ + `find milena/doc/examples \ + -name \*.cc -a \! -path milena/doc/examples/trash/\* \ + | sed -e 's,milena/doc/examples/,,' \ + -e 'y,/,_,' \ + -e 's,$.*$\.cc$,$(srcdir)/outputs/\1.txt,'` \ + >milena/doc/outputs.mk.tmp + mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk + chmod -w milena/doc/outputs.mk + # * Outputs rules and timestamps. + ( + cd milena/doc + rm -f examples-outputs.mk.tmp + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp + mv -f examples-outputs.mk.tmp examples-outputs.mk + chmod -w examples-outputs.mk + ) + # * Split outputs. + ( + cd milena/doc + rm -f split-outputs.mk.tmp + ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f split-outputs.mk.tmp split-outputs.mk + chmod -w 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 + + # Generate unit test files for Scribo. + run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . +fi # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0

last-svn-commit-99-gc94f517 Add options to boostrap.
by Roland Levillain 22 Mar '10

22 Mar '10

* bootstrap: Here. (usage): New function. Call it when invoked with option `-h, --help'. Regen files stored in the repository only if invoked with option `-r, --regen'. --- ChangeLog | 10 ++++ bootstrap | 160 +++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 102 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26f854d..9b17931 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Add options to boostrap. + + * bootstrap: Here. + (usage): New function. Call it when invoked with option + `-h, --help'. + Regen files stored in the repository only if invoked with option + `-r, --regen'. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Make a more portable use of mktemp. 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4e8c5d5..59d56c9 100755 --- a/bootstrap +++ b/bootstrap @@ -11,6 +11,22 @@ stderr () echo >&2 "$0: $@" } +usage () +{ + cat <<EOF +Usage: $0 [OPTION] + +Options: + -h, --help display this message + -r, --regen regenerate files stored in the repository + +Report bugs to <olena-bugs(a)lrde.epita.fr> +EOF +} + +# Regenerate files stored in the repository? +regen_p=false + awk_strverscmp=' # Use only awk features that work with 7th edition Unix awk (1978). # My, what an old awk you have, Mr. Solaris! @@ -114,6 +130,15 @@ run () # Failures do matter. set -e +# Process arguments. +for arg in "$@"; do + case "$arg" in + -h|--help) usage; exit 0 ;; + -r|--regen) regen_p=true ;; + *) fatal "error: unrecognized option: $1" ;; + esac +done + # Requirements over bootstrap tools. require autoconf 2.61 require automake 1.10 @@ -151,21 +176,7 @@ EOF # dvipng is required by TeX4ht. require dvipng 1.11 -# Generate milena/headers.mk -run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers - -# Generate scribo/headers.mk -run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers scribo scribo -# Generate files of Milena's documentation. -# * Figures. -( - cd milena/doc - rm -f figures.mk.tmp - ./gen-figures-mk >figures.mk.tmp - mv -f figures.mk.tmp figures.mk - chmod -w figures.mk -) gen_doc_figures() { rm -f "milena/doc/$2-figures.mk.tmp" @@ -175,60 +186,73 @@ gen_doc_figures() mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" chmod -w "milena/doc/$2-figures.mk" } -gen_doc_figures PBM_FIGURES pbm -gen_doc_figures PGM_FIGURES pgm -gen_doc_figures PPM_FIGURES ppm -# * Examples. -rm -f milena/doc/examples.mk.tmp -milena/doc/gen-make-variable EXAMPLES \ - `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ - >milena/doc/examples.mk.tmp -mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk -chmod -w milena/doc/examples.mk -# * Split examples. -( - cd milena/doc - rm -f split-examples.mk.tmp - ./gen-split-examples-mk >split-examples.mk.tmp - mv -f split-examples.mk.tmp split-examples.mk - chmod -w split-examples.mk -) -# * Outputs. -rm -f milena/doc/outputs.mk.tmp -milena/doc/gen-make-variable OUTPUTS \ - `find milena/doc/examples \ - -name \*.cc -a \! -path milena/doc/examples/trash/\* \ - | sed -e 's,milena/doc/examples/,,' \ - -e 'y,/,_,' \ - -e 's,$.*$\.cc$,$(srcdir)/outputs/\1.txt,'` \ - >milena/doc/outputs.mk.tmp -mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk -chmod -w milena/doc/outputs.mk -# * Outputs rules and timestamps. -( - cd milena/doc - rm -f examples-outputs.mk.tmp - ./gen-examples-outputs-mk \ - `find examples -name \*.cc -a \! -path examples/trash/\* \ - | env LC_ALL=C sort` \ - >examples-outputs.mk.tmp - mv -f examples-outputs.mk.tmp examples-outputs.mk - chmod -w examples-outputs.mk -) -# * Split outputs. -( - cd milena/doc - rm -f split-outputs.mk.tmp - ./gen-split-outputs-mk >split-outputs.mk.tmp - mv -f split-outputs.mk.tmp split-outputs.mk - chmod -w 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 - -# Generate unit test files for Scribo. -run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . + +# Regen files stored in the repository if asked so. +if $regen_p; then + # Generate files of Milena's documentation. + # * Figures. + ( + cd milena/doc + rm -f figures.mk.tmp + ./gen-figures-mk >figures.mk.tmp + mv -f figures.mk.tmp figures.mk + chmod -w figures.mk + ) + gen_doc_figures PBM_FIGURES pbm + gen_doc_figures PGM_FIGURES pgm + gen_doc_figures PPM_FIGURES ppm + # * Examples. + rm -f milena/doc/examples.mk.tmp + milena/doc/gen-make-variable EXAMPLES \ + `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ + >milena/doc/examples.mk.tmp + mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk + chmod -w milena/doc/examples.mk + # * Split examples. + ( + cd milena/doc + rm -f split-examples.mk.tmp + ./gen-split-examples-mk >split-examples.mk.tmp + mv -f split-examples.mk.tmp split-examples.mk + chmod -w split-examples.mk + ) + # * Outputs. + rm -f milena/doc/outputs.mk.tmp + milena/doc/gen-make-variable OUTPUTS \ + `find milena/doc/examples \ + -name \*.cc -a \! -path milena/doc/examples/trash/\* \ + | sed -e 's,milena/doc/examples/,,' \ + -e 'y,/,_,' \ + -e 's,$.*$\.cc$,$(srcdir)/outputs/\1.txt,'` \ + >milena/doc/outputs.mk.tmp + mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk + chmod -w milena/doc/outputs.mk + # * Outputs rules and timestamps. + ( + cd milena/doc + rm -f examples-outputs.mk.tmp + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp + mv -f examples-outputs.mk.tmp examples-outputs.mk + chmod -w examples-outputs.mk + ) + # * Split outputs. + ( + cd milena/doc + rm -f split-outputs.mk.tmp + ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f split-outputs.mk.tmp split-outputs.mk + chmod -w 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 + + # Generate unit test files for Scribo. + run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . +fi # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0

last-svn-commit-91-ge54763c Distribute doc/gen-split-outputs-mk.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. Aesthetic changes. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9f25bf1..d4633d1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/gen-split-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Make a more portable use of mktemp. * doc/gen-split-examples-mk, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8209278..b36ad89 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -217,6 +217,9 @@ MAINTAINERCLEANFILES += $(PNG_FIGURES) ## Examples. ## ## ---------- ## +# Generate a Makefile helper containing a variable assignment. +EXTRA_DIST += gen-make-variable + $(srcdir)/examples.mk: $(srcdir)/gen-make-variable rm -f $@.tmp $(srcdir)/gen-make-variable EXAMPLES \ @@ -259,6 +262,8 @@ EXTRA_DIST += $(MORE_EXAMPLES) ## Split examples. ## ## ---------------- ## +# Generate a Makefile helper handling the generation of split examples. +EXTRA_DIST += gen-split-examples-mk $(srcdir)/split-examples.mk: $(srcdir)/gen-split-examples-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-examples-mk >split-examples.mk.tmp @@ -912,6 +917,9 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/win-create-1-display.txt EXTRA_DIST += $(MORE_OUTPUTS) +# FIXME: Can't we implement this using `gen-make-variable'? +EXTRA_DIST += gen-examples-outputs-mk + $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp # Ignore sources in examples/trash/. @@ -939,6 +947,8 @@ regen-examples-outputs-mk: ## Split outputs. ## ## --------------- ## +# Generate a Makefile helper handling the generation of split outputs. +EXTRA_DIST += gen-split-outputs-mk $(srcdir)/split-outputs.mk: $(srcdir)/gen-split-outputs-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp @@ -1025,10 +1035,3 @@ EXTRA_DIST += \ tools/sample_utils.hh \ tools/split_sample.sh \ tools/todoxygen.sh - -# Generate a Makefile helper containing a variable assignment. -EXTRA_DIST += gen-make-variable -# FIXME: Can't we implement this using `gen-make-variable'? -EXTRA_DIST += gen-examples-outputs-mk -# Generate a Makefile handling the generation of split examples. -EXTRA_DIST += gen-split-examples-mk -- 1.5.6.5

1 0