March 2010 - Olena-patches

last-svn-commit-51-g0176b4b Revamp the conversion of images in the documentation.
by Roland Levillain 16 Mar '10

16 Mar '10

* gen-make-variable: New script. * doc/Makefile.am: Include $(srcdir)/pbm-figures.mk, ($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk. ($(srcdir)/pbm-figures.mk) ($(srcdir)/pgm-figures.mk) ($(srcdir)/ppm-figures.mk): New targets. (EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES). (regen-pbm-figures-mk) (regen-pgm-figures-mk) (regen-ppm-figures-mk): New (phony target). (regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and regen-ppm-figures-mk instead of calling generate_dist_files.sh to convert figures. ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to convert figures. (convert_to_png): New variable. (SUFFIXES): Add .pbm, .pgm, .ppm and .png. (.pbm.png, .pgm.png, .ppm.png): New suffix rules. (PNG_FIGURES): New variable. (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES). (refman_dependencies): Remove $(srcdir)/figures.stamp. Add $(PNG_FIGURES). (technical_dependencies) (tutorial_dependencies) (ref_guide_dependencies): Likewise. No longer include $(srcdir)/figures/figures.mk. ($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp): Remove rules. (EXTRA_DIST, MAINTAINERCLEANFILES): Remove $(srcdir)/figures.stamp. (EXTRA_DIST): Add gen-make-variable. * pbm-figures.mk, pgm-figures.mk, ppm-figures.mk: New (generated) Make helpers. * figures/figures.mk: Remove. --- milena/ChangeLog | 43 ++++++ milena/doc/Makefile.am | 140 +++++++++++++++----- milena/doc/figures/figures.mk | 41 ------ .../{gen-examples-outputs-mk => gen-make-variable} | 41 ++++-- milena/doc/pbm-figures.mk | 11 ++ milena/doc/pgm-figures.mk | 7 + milena/doc/ppm-figures.mk | 30 ++++ 7 files changed, 227 insertions(+), 86 deletions(-) delete mode 100644 milena/doc/figures/figures.mk copy milena/doc/{gen-examples-outputs-mk => gen-make-variable} (54%) create mode 100644 milena/doc/pbm-figures.mk create mode 100644 milena/doc/pgm-figures.mk create mode 100644 milena/doc/ppm-figures.mk diff --git a/milena/ChangeLog b/milena/ChangeLog index ab828ac..f49830e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,46 @@ +2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> + + Revamp the conversion of images in the documentation. + + * gen-make-variable: New script. + * doc/Makefile.am: Include $(srcdir)/pbm-figures.mk, + ($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk. + ($(srcdir)/pbm-figures.mk) + ($(srcdir)/pgm-figures.mk) + ($(srcdir)/ppm-figures.mk): + New targets. + (EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES). + (regen-pbm-figures-mk) + (regen-pgm-figures-mk) + (regen-ppm-figures-mk): + New (phony target). + (regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and + regen-ppm-figures-mk instead of calling generate_dist_files.sh to + convert figures. + ($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to + convert figures. + (convert_to_png): New variable. + (SUFFIXES): Add .pbm, .pgm, .ppm and .png. + (.pbm.png, .pgm.png, .ppm.png): New suffix rules. + (PNG_FIGURES): New variable. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES). + (refman_dependencies): + Remove $(srcdir)/figures.stamp. + Add $(PNG_FIGURES). + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Likewise. + No longer include $(srcdir)/figures/figures.mk. + ($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp): + Remove rules. + (EXTRA_DIST, MAINTAINERCLEANFILES): + Remove $(srcdir)/figures.stamp. + (EXTRA_DIST): Add gen-make-variable. + * pbm-figures.mk, pgm-figures.mk, ppm-figures.mk: + New (generated) Make helpers. + * figures/figures.mk: Remove. + 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> Add a rule to forcefully regen doc/examples-outputs.mk. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e31ddc8..8f312a3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -93,6 +93,104 @@ TEXI2DVI_FLAGS += -I $(DOC_SRCDIR)/white_paper DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty +## --------- ## +## 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. # +# ----- # + +convert_to_png = convert -scale 250 -bordercolor black -border 2x2 + +SUFFIXES += .pbm .pgm .ppm .png + +.pbm.png: + $(convert_to_png) $< $@ + +.pgm.png: + $(convert_to_png) $< $@ + +.ppm.png: + $(convert_to_png) $< $@ + +PNG_FIGURES = \ + $(PBM_FIGURES:.pbm=.png) \ + $(PGM_FIGURES:.pgm=.png) \ + $(PPM_FIGURES:.ppm=.png) +EXTRA_DIST += $(PNG_FIGURES) +MAINTAINERCLEANFILES = $(PNG_FIGURES) + + ## ----------------------- ## ## Doxygen documentation. ## ## ----------------------- ## @@ -104,7 +202,7 @@ DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty refman_dependencies = \ $(srcdir)/split-examples.stamp \ $(srcdir)/split-outputs.stamp \ - $(srcdir)/figures.stamp \ + $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -140,7 +238,7 @@ $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ -MAINTAINERCLEANFILES = $(DOXYFILE_USER) +MAINTAINERCLEANFILES += $(DOXYFILE_USER) ## FIXME: Rename USER_REFMAN_PDF to something else? USER_REFMAN_PDF = user-refman.pdf @@ -293,7 +391,7 @@ technical_dir = $(doc_dir)/technical # FIXME: Check these dependencies. And it'd be better to depend on # actual files rather than timestamps corresponding to a bunch of # files. -technical_dependencies = $(doc_dir)/figures.stamp +technical_dependencies = $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -400,7 +498,7 @@ tutorial_dir = $(doc_dir)/tutorial tutorial_dependencies = \ $(doc_dir)/split-examples.stamp \ $(doc_dir)/split-outputs.stamp \ - $(doc_dir)/figures.stamp + $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -600,7 +698,7 @@ ref_guide_dir = $(doc_dir)/ref_guide ref_guide_dependencies = \ $(doc_dir)/split-examples.stamp \ $(doc_dir)/split-outputs.stamp \ - $(doc_dir)/figures.stamp + $(PNG_FIGURES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -690,30 +788,6 @@ EXTRA_DIST += \ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) -## --------- ## -## Figures. ## -## --------- ## - -$(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp -include $(srcdir)/figures/figures.mk - -EXTRA_DIST += $(srcdir)/figures.stamp -MAINTAINERCLEANFILES += $(srcdir)/figures.stamp -$(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m - rm -f $@.tmp - touch $@.tmp - failcom='exit 1'; \ - list="$(FIGURES_SRCDIR)/*.p*m"; for img in $$list; do \ - echo "Converting $$img to PNG"; \ - name=`basename $$img` \ - ext=`echo $$name | cut -d '.' -f 2`; \ - convert -scale 250 -bordercolor black -border 2x2 $$img \ - $(FIGURES_SRCDIR)/`basename $$img $$ext`png \ - || eval $$failcom; \ - done - mv -f $@.tmp $@ - - ## ---------- ## ## Examples. ## ## ---------- ## @@ -1065,9 +1139,11 @@ include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: @rm -f $(srcdir)/headers.stamp.tmp @touch $(srcdir)/headers.stamp.tmp + $(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk + $(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk + $(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk @cd $(srcdir) && \ - ./generate_dist_files.sh figures 'p*m' && \ ./generate_dist_files.sh outputs txt && \ ./generate_dist_files.sh examples cc.raw @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp @@ -1080,7 +1156,6 @@ $(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh @rm -f $@.tmp @touch $@.tmp @cd $(srcdir) && \ - ./generate_dist_files.sh figures 'p*m' && \ ./generate_dist_files.sh outputs txt && \ ./generate_dist_files.sh examples cc.raw @mv -f $@.tmp $@ @@ -1141,4 +1216,7 @@ EXTRA_DIST += \ 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 diff --git a/milena/doc/figures/figures.mk b/milena/doc/figures/figures.mk deleted file mode 100644 index 38fc1d1..0000000 --- a/milena/doc/figures/figures.mk +++ /dev/null @@ -1,41 +0,0 @@ -## Generated by ../generate_dist_files, do not modify. - -EXTRA_DIST += \ -figures/extend-1.ppm \ -figures/extend-2.ppm \ -figures/extend-3.ppm \ -figures/extend-4.ppm \ -figures/extend-5.ppm \ -figures/fill-1.ppm \ -figures/fill-2.ppm \ -figures/fill-imageif-cfun-1.ppm \ -figures/fill-subdomain-1.pbm \ -figures/fill-subdomain-2.ppm \ -figures/fill-subdomain-3.ppm \ -figures/fill-subdomain-4.ppm \ -figures/ima2d-rot-1.ppm \ -figures/ima2d-rot-2.ppm \ -figures/ima_save.pbm \ -figures/labeling-compute-1.pbm \ -figures/labeling-compute-2.ppm \ -figures/logical-not-1.pbm \ -figures/logical-not-2.pbm \ -figures/logical-not-3.pbm \ -figures/tuto2_first_image-1.pbm \ -figures/tuto3_colorize-1.pgm \ -figures/tuto3_colorize-2.ppm \ -figures/tuto3_rw_image-1.ppm \ -figures/tuto3_rw_image-2.ppm \ -figures/tuto3_rw_image-3.ppm \ -figures/tuto4_genericity_and_algorithms-1.ppm \ -figures/tuto4_genericity_and_algorithms-2.ppm \ -figures/tuto4_genericity_and_algorithms-3.pbm \ -figures/tuto4_genericity_and_algorithms-4.ppm \ -figures/tuto4_genericity_and_algorithms-5.ppm \ -figures/tuto4_genericity_and_algorithms-6.ppm \ -figures/tuto4_genericity_and_algorithms-7.pgm \ -figures/tuto4_genericity_and_algorithms-7.ppm \ -figures/tuto4_genericity_and_algorithms-8.pgm \ -figures/tuto4_genericity_and_algorithms-8.ppm \ -figures/tuto4_genericity_and_algorithms-9.pgm \ -figures/tuto4_genericity_and_algorithms-9.ppm diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-make-variable similarity index 54% copy from milena/doc/gen-examples-outputs-mk copy to milena/doc/gen-make-variable index 10692a1..91403ae 100755 --- a/milena/doc/gen-examples-outputs-mk +++ b/milena/doc/gen-make-variable @@ -16,24 +16,37 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# To be used from milena/doc/'s source directory. - me=`basename $0` -test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; } +# Use the C locale to have a deterministic sort. +export LC_ALL=C + +test $# -gt 1 || { echo "usage: $me VARIABLE FILES..."; exit 1; } + +# backslashify +# ------------ +# Read lines from the standard input and write them on the standard +# output with an extra trailing backslash, except for the last line. +backslashify() +{ + # Set IFS to nothing to prevent `read' from trimming spaces or tabs. + IFS= read last_line + while IFS= read line; do + echo "$last_line \\" + last_line=$line + done + echo "$last_line" +} cat<<EOF ## Generated by $me. Do not edit by hand. EOF - -for program; do -cat<<EOF -\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT) - rm -f \$@.tmp - ./\$< >\$@.tmp - cp -f \$@.tmp \$@ - rm -f \$@.tmp - -EOF -done +{ + echo "$1 =" + shift + for var; do + echo "$var" + shift + done | sort | sed 's/$.*$/ \1/' +} | backslashify diff --git a/milena/doc/pbm-figures.mk b/milena/doc/pbm-figures.mk new file mode 100644 index 0000000..dd061a5 --- /dev/null +++ b/milena/doc/pbm-figures.mk @@ -0,0 +1,11 @@ +## 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 new file mode 100644 index 0000000..b65d78f --- /dev/null +++ b/milena/doc/pgm-figures.mk @@ -0,0 +1,7 @@ +## 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 new file mode 100644 index 0000000..835a32e --- /dev/null +++ b/milena/doc/ppm-figures.mk @@ -0,0 +1,30 @@ +## 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/fill-subimage-cfun-1.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

branch next updated: last-svn-commit-8-gfbe0b7f
by git＠lrde.epita.fr 15 Mar '10

15 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via fbe0b7f5ec449ab79dfad0b4d285a745f625e41e (commit) via 851beeb4d1256b38ff6d57b2c0f2944fd0479db2 (commit) via 77004f3748794e5990deca22ecbafb173fd44eef (commit) via 08a77f75484a3b12fcee2cf1f1970aefad936362 (commit) via 501c45e68c71fc00982b8b21a629d7b6757272cc (commit) from f9ac5d4d841e31df0aa208435d302202852a9a6b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- fbe0b7f gluit/gluit.mk: Help Emacs find out the nature of this file. 851beeb Clean up external/trimesh/ChangeLog. 77004f3 Aesthetic changes. 08a77f7 Aesthetic changes. 501c45e AUTHORS: Update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 24 +++++++++++++++------- ChangeLog | 13 ++++++++++++ build-aux/extra-recursive-targets.mk | 23 +++++++++++---------- build-aux/regen-recursive.mk | 27 +++++++++++++------------ external/trimesh/ChangeLog | 6 ++++- external/trimesh/gluit/gluit.mk | 2 +- milena/ChangeLog | 9 ++++++++ milena/tests/tests-recursive.mk | 36 +++++++++++++++++----------------- milena/tests/tests.mk | 36 ++++++++++++++++++--------------- 9 files changed, 108 insertions(+), 68 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch revamp-doc-build updated: last-svn-commit-47-gdc54b19
by git＠lrde.epita.fr 15 Mar '10

15 Mar '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch revamp-doc-build has been updated via dc54b19cb5b39de46f62d04edd7859cb0b35b74a (commit) via 3f607e8f19d0a6d8473d038d502e04edc4b69490 (commit) via 1dde4ec3aa06c7cb628b052bade4d1f41e4c8c5e (commit) via b7b6a7da306ee36e96b3add2bd0843777fbbd003 (commit) via fb992545b50f0d9b5a0ef5db8a31ecc8eb3db625 (commit) via 219aa14bfdc6b234bee00304f5f69cee928db99b (commit) via 45b2ed4e8604b7defe6ba2a56bc5cd859d3c4a7c (commit) via 9693e15791859df0f34eb9781893c768c85777cc (commit) via 735e0af754220c01f0d91a44da748c785a688414 (commit) via b19305ec35a60965caa9f5e059b3ad1ec79ccbb7 (commit) via fbc3cb2efacf69c7b57eb6a68464011ef745eb3a (commit) via 51a165bc18b198c09fbe3dbd89d7a615cb513c35 (commit) via 5fc83d5c255135833e0e5a6a5741bc2f5aa90be0 (commit) via 31c6ffe0c98a9eebcc62ee0a4d06bca2e4182d7b (commit) via 17089da3e2238d2d2097b7f4f48153255c3128c2 (commit) via b370eff1d24c81d6a5267249d1816527c554deb4 (commit) via 0a5e4a1a52c69b45aebd6caad1caf14eea829997 (commit) via 13f1c3cbb14148c33a48aff238a050e96c9d993d (commit) via 1a017e969b927cf1c45c964115d637524a7cea14 (commit) via 840243a55ded80fa6bb4234581cf07aeaca0e320 (commit) from 13af895daaeda0e5c287eb221453bcf1ac5db581 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- dc54b19 Distribute and clean documentation timestamps. 3f607e8 Improve doc/'s cleaning rules. 1dde4ec Prevent todoxygen.sh from generating incomplete outputs. b7b6a7d Adjust todoxygen.sh to TeX4ht outputs. fb99254 Disable the implicit generation of HTML from LaTeX. 219aa14 Adapt HTML generation to TeX4ht. 45b2ed4 Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. 9693e15 Use texi2dvi to produce HTML from LaTeX. 735e0af Support HTML outputs in tex.mk. b19305e Automake configuration. fbc3cb2 Have bootstrap check for HeVeA 1.10. 51a165b Split LaTeX-to-HTML rules to clear things up. 5fc83d5 List non generated documentation outputs separately. 31c6ffe Use texi2dvi to produce PDF from LaTeX. 17089da Add texi2dvi as well as a Make helper to use it. b370eff Merge doc/ Makefile helpers into doc/Makefile.am. 0a5e4a1 Improve dependencies of some documentation products. 13f1c3c Revamp the Makefile machinery in milena/doc/examples/. 1a017e9 configure.ac: Configure milena/doc/tools/data.hh. 840243a Have documentation's examples not depend on hard-coded paths. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 53 + bootstrap | 31 +- build-aux/Makefile.am | 12 +- build-aux/tex.mk | 43 + build-aux/texi2dvi | 1959 ++++++++++++++++++++ configure.ac | 6 +- milena/ChangeLog | 270 +++ milena/doc/.gitignore | 35 +- milena/doc/Makefile.am | 828 ++++++++- milena/doc/doc.mk | 42 - milena/doc/examples-outputs.mk | 296 +++ milena/doc/examples/ima-save.cc | 7 +- milena/doc/examples/make.mk | 279 --- milena/doc/examples/split/ima-save-1.cc.raw | 4 +- .../Makefile.am => doc/gen-examples-outputs-mk} | 29 +- milena/doc/ref_guide/ref_guide.mk | 95 - milena/doc/technical/technical.mk | 95 - milena/{apps => doc/tools}/data.hh.in | 16 +- milena/doc/tools/sample_utils.hh | 15 +- milena/doc/tools/todoxygen.sh | 50 +- milena/doc/tutorial/tutorial.mk | 95 - milena/doc/white_paper/white_paper.mk | 103 - 22 files changed, 3538 insertions(+), 825 deletions(-) create mode 100644 build-aux/tex.mk create mode 100755 build-aux/texi2dvi delete mode 100644 milena/doc/doc.mk create mode 100644 milena/doc/examples-outputs.mk delete mode 100644 milena/doc/examples/make.mk copy milena/{tests/morpho/reconstruction/by_dilation/Makefile.am => doc/gen-examples-outputs-mk} (60%) mode change 100644 => 100755 delete mode 100644 milena/doc/outputs/ima2d-decl-2.txt delete mode 100644 milena/doc/ref_guide/ref_guide.mk delete mode 100644 milena/doc/technical/technical.mk copy milena/{apps => doc/tools}/data.hh.in (78%) delete mode 100644 milena/doc/tutorial/tutorial.mk delete mode 100644 milena/doc/white_paper/white_paper.mk hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-47-gdc54b19 Distribute and clean documentation timestamps.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/Makefile.am (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp, $(srcdir)/figures.stamp, $(srcdir)/split-examples.stamp and $(srcdir)/split-outputs.stamp. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 11 ++++++++++- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 236f155..b0e8778 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Distribute and clean documentation timestamps. + + * doc/Makefile.am (EXTRA_DIST, MAINTAINERCLEANFILES): + Add $(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp, + $(srcdir)/figures.stamp, $(srcdir)/split-examples.stamp and + $(srcdir)/split-outputs.stamp. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Improve doc/'s cleaning rules. * doc/Makefile.am (CLEANFILES): Remove diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 6bd729e..553a8dd 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -157,6 +157,8 @@ $(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/$(USER_REFMAN) cd $(srcdir)/$(USER_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cp -f $(srcdir)/$(USER_REFMAN)/latex/refman.pdf $@ +EXTRA_DIST += $(srcdir)/user-refman.stamp +MAINTAINERCLEANFILES += $(srcdir)/user-refman.stamp ## FIXME: Are dependencies (`$(refman_dependencies)') set on the right ## rule? Does Doxygen make a copy of figures, or does it generate ## LaTeX inputs relying on the existence of such figures in the @@ -238,6 +240,8 @@ $(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ +EXTRA_DIST += $(srcdir)/devel-refman.stamp +MAINTAINERCLEANFILES += $(srcdir)/devel-refman.stamp ## FIXME: Are dependencies (`$(refman_dependencies)') set on the right ## rule? Does Doxygen make a copy of figures, or does it generate ## LaTeX inputs relying on the existence of such figures in the @@ -693,7 +697,8 @@ MAINTAINERCLEANFILES += $(REF_GUIDE_HH) $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp include $(srcdir)/figures/figures.mk -EXTRA_DIST += figures.stamp +EXTRA_DIST += $(srcdir)/figures.stamp +MAINTAINERCLEANFILES += $(srcdir)/figures.stamp $(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m rm -f $@.tmp touch $@.tmp @@ -1005,6 +1010,8 @@ EXAMPLES = \ # files easier. We probably also nee a stamp file to keep track of # dependencies. +EXTRA_DIST += $(srcdir)/split-examples.stamp +MAINTAINERCLEANFILES += $(srcdir)/split-examples.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 examples). Maybe we can @@ -1020,6 +1027,8 @@ $(srcdir)/split-examples.stamp: $(EXAMPLES) done @mv -f $@.tmp $@ +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 -- 1.5.6.5

1 0

last-svn-commit-43-gfb99254 Disable the implicit generation of HTML from LaTeX.
by Roland Levillain 15 Mar '10

15 Mar '10

* build-aux/tex.mk (.tex.html): Remove this rule, since (TeX4ht) HTML outputs may contain more than one file (e.g., CSS style sheets, images, etc.). (SUFFIXES): Remove .html. --- ChangeLog | 9 +++++++++ build-aux/tex.mk | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 567cd69..6195210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Disable the implicit generation of HTML from LaTeX. + + * build-aux/tex.mk (.tex.html): Remove this rule, since (TeX4ht) + HTML outputs may contain more than one file (e.g., CSS style + sheets, images, etc.). + (SUFFIXES): Remove .html. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. * build-aux/tex.mk (TEXI2HTML): Add --tex4ht. diff --git a/build-aux/tex.mk b/build-aux/tex.mk index 79b4644..d93110d 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -30,14 +30,11 @@ TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) TEXI2HTML = $(TEXI2DVI) --html --tex4ht TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) -SUFFIXES = .tex .pdf .html +SUFFIXES = .tex .pdf .tex.pdf: $(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $< -.tex.html: - $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $@ $< - tex-mostlyclean: rm -rf tmp.t2d .PHONY: tex-mostlyclean -- 1.5.6.5

1 0

last-svn-commit-42-g219aa14 Adapt HTML generation to TeX4ht.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/Makefile.am (TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS) (WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS): New variables. ($(TECHNICAL_HTML), $(TUTORIAL_HTML)) ($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)): Remove these targets. Superseded by... ($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)): ...these (new) targets. (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp, ($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and $(REF_GUIDE_HTML).stamp. (dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML), $(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML). Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS), $(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS). --- milena/ChangeLog | 25 +++++++++++ milena/doc/.gitignore | 14 ++++++- milena/doc/Makefile.am | 105 ++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 131 insertions(+), 13 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 99345b1..9c6df10 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,30 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Adapt HTML generation to TeX4ht. + + * doc/Makefile.am + (TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS) + (WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS): + New variables. + ($(TECHNICAL_HTML), $(TUTORIAL_HTML)) + ($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)): + Remove these targets. + Superseded by... + ($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)): + ...these (new) targets. + (EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp, + ($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and + $(REF_GUIDE_HTML).stamp. + (dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML), + $(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML). + Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS), + $(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS). + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Use texi2dvi to produce HTML from LaTeX. * doc/Makefile.am diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index b187492..506bfa4 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -8,17 +8,29 @@ /figures/*.png +/ref_guide/ref_guide.css /ref_guide/ref_guide.hh /ref_guide/ref_guide.html /ref_guide/ref_guide.pdf +/ref_guide/ref_guide0x.png +/technical/technical.css /technical/technical.html /technical/technical.pdf +/tutorial/tutorial.css /tutorial/tutorial.hh /tutorial/tutorial.html /tutorial/tutorial.pdf -/white_paper/figures/*.eps +/white_paper/figures/house.eps +/white_paper/figures/house_rag.eps +/white_paper/figures/house_wshed.eps +/white_paper/figures/house_wshed_mean_colors.eps +/white_paper/white_paper.css /white_paper/white_paper.html /white_paper/white_paper.pdf +/white_paper/white_paper0x.png +/white_paper/white_paper1x.png +/white_paper/white_paper2x.png +/white_paper/white_paper3x.png diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 3dc4bed..17a26bf 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -323,10 +323,28 @@ technical_dependencies = $(doc_dir)/figures.stamp # Final product. TECHNICAL_HTML = $(technical_dir)/technical.html -# Extra dependencies. -$(TECHNICAL_HTML): $(technical_dependencies) +TECHNICAL_HTML_OUTPUTS = $(TECHNICAL_HTML) $(technical_dir)/technical.css + +EXTRA_DIST += $(TECHNICAL_HTML).stamp +MAINTAINERCLEANFILES += $(TECHNICAL_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(TECHNICAL_HTML) $< + @mv -f $@.tmp $@ + +$(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(TECHNICAL_HTML) +dist_doc_DATA += $(TECHNICAL_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(TECHNICAL_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. @@ -402,10 +420,28 @@ tutorial_dependencies = \ # Final product. TUTORIAL_HTML = $(tutorial_dir)/tutorial.html -# Extra dependencies. -$(TUTORIAL_HTML): $(tutorial_dependencies) +TUTORIAL_HTML_OUTPUTS = $(TUTORIAL_HTML) $(tutorial_dir)/tutorial.css + +EXTRA_DIST += $(TUTORIAL_HTML).stamp +MAINTAINERCLEANFILES += $(TUTORIAL_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(TUTORIAL_HTML) $< + @mv -f $@.tmp $@ + +$(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(TUTORIAL_HTML) +dist_doc_DATA += $(TUTORIAL_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(TUTORIAL_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. @@ -490,10 +526,34 @@ white-paper: white-paper-pdf white-paper-html # Final product. WHITE_PAPER_HTML = $(white_paper_dir)/white_paper.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): $(EPSS) -# FIXME: Keep this pass? -# $(doc_dir)/tools/clearbanner.sh $@ +WHITE_PAPER_HTML_OUTPUTS = \ + $(WHITE_PAPER_HTML) \ + $(white_paper_dir)/white_paper.css \ + $(white_paper_dir)/white_paper0x.png \ + $(white_paper_dir)/white_paper1x.png \ + $(white_paper_dir)/white_paper2x.png \ + $(white_paper_dir)/white_paper3x.png + +EXTRA_DIST += $(WHITE_PAPER_HTML).stamp +MAINTAINERCLEANFILES += $(WHITE_PAPER_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(WHITE_PAPER_HTML) $< + @mv -f $@.tmp $@ + +$(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi +dist_doc_DATA += $(WHITE_PAPER_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(WHITE_PAPER_HTML_OUTPUTS) WHITE_PAPER_PDF = $(white_paper_dir)/white_paper.pdf white-paper-pdf: $(WHITE_PAPER_PDF) @@ -560,10 +620,31 @@ ref_guide_dependencies = \ # Final product. REF_GUIDE_HTML = $(ref_guide_dir)/ref_guide.html -# Extra dependencies. -$(REF_GUIDE_HTML): $(ref_guide_dependencies) +REF_GUIDE_HTML_OUTPUTS = \ + $(REF_GUIDE_HTML) \ + $(ref_guide_dir)/ref_guide.css \ + $(ref_guide_dir)/ref_guide0x.png + +EXTRA_DIST += $(REF_GUIDE_HTML).stamp +MAINTAINERCLEANFILES += $(REF_GUIDE_HTML).stamp +# HTML outputs contains several files (the HTML file itself, its CSS +# style sheet, possibly some images). Therefore, we cannot rely on a +# simple suffix rule to produce them. +$(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) + @rm -f $@.tmp + @touch $@.tmp + $(TEXI2HTML) $(TEXI2HTML_FLAGS) -o $(REF_GUIDE_HTML) $< + @mv -f $@.tmp $@ + +$(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp +## Recover from the removal of $@ + @if test -d $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi -dist_doc_DATA += $(REF_GUIDE_HTML) +dist_doc_DATA += $(REF_GUIDE_HTML_OUTPUTS) +MAINTAINERCLEANFILES += $(REF_GUIDE_HTML_OUTPUTS) # Intermediate product for the various doc targets of the parent # directory. -- 1.5.6.5

1 0

last-svn-commit-41-g45b2ed4 Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs.
by Roland Levillain 15 Mar '10

15 Mar '10

* build-aux/tex.mk (TEXI2HTML): Add --tex4ht. * bootstrap (tempdir): Check for TeX4HT, dvipng and convert (from ImageMagick). --- ChangeLog | 8 ++++++++ bootstrap | 22 ++++++++++++++++++++-- build-aux/tex.mk | 2 +- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36bc676..567cd69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. + + * build-aux/tex.mk (TEXI2HTML): Add --tex4ht. + * bootstrap (tempdir): Check for TeX4ht, dvipng and convert (from + ImageMagick). + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Support HTML outputs in tex.mk. * build-aux/tex.mk (SUFFIXES): Add .html. diff --git a/bootstrap b/bootstrap index 2bdd761..18a65b1 100755 --- a/bootstrap +++ b/bootstrap @@ -129,8 +129,26 @@ export LIBTOOLIZE=$libtoolize require $libtoolize 1.5.22 require doxygen 1.5.6 -# FIXME: These should no longer be required when TeX4HT is used. -require hevea 1.10 -version +require convert 6.3.7 + +# Check for TeX4ht. htlatex and friends do not have options like +# `--version', `-version', `-v', etc. Hence this ad hoc procedure. +tempdir=`mktemp -d` +cleanup() { rm -rf "$tempdir"; exit; } +trap cleanup 0 1 2 3 6 15 +( + cd "$tempdir" + cat >test.tex <<EOF + \documentclass{article} + \begin{document} + Test + \end{document} +EOF + htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required" +) +rm -rf "$tempdir" +# dvipnh is required by TeX4ht. +require dvipng 1.11 # Tell what's going on. set -x diff --git a/build-aux/tex.mk b/build-aux/tex.mk index 493a687..79b4644 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -27,7 +27,7 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch TEXI2PDF = $(TEXI2DVI) --pdf TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) -TEXI2HTML = $(TEXI2DVI) --html +TEXI2HTML = $(TEXI2DVI) --html --tex4ht TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) SUFFIXES = .tex .pdf .html -- 1.5.6.5

1 0

last-svn-commit-46-g3f607e8 Improve doc/'s cleaning rules.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/Makefile.am (CLEANFILES): Remove $(technical_dir)/technical.haux, $(tutorial_dir)/tutorial.haux, $(ref_guide_dir)/ref_guide.haux and $(ref_guide_dir)/ref_guide.htoc. (clean-local): Remove (phony) target. ($(EPSS)): Move... (MAINTAINERCLEANFILES): ...here. Add $(TECHNICAL_PDF), $(TECHNICAL_HH), $(TUTORIAL_PDF), $(TUTORIAL_HH), $(WHITE_PAPER_PDF) $(REF_GUIDE_PDF) and $(REF_GUIDE_HH). --- milena/ChangeLog | 17 +++++++++++++++++ milena/doc/Makefile.am | 37 ++++++++++++------------------------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bd96c2e..236f155 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,22 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Improve doc/'s cleaning rules. + + * doc/Makefile.am (CLEANFILES): Remove + $(technical_dir)/technical.haux, + $(tutorial_dir)/tutorial.haux, + $(ref_guide_dir)/ref_guide.haux and + $(ref_guide_dir)/ref_guide.htoc. + (clean-local): Remove (phony) target. + ($(EPSS)): Move... + (MAINTAINERCLEANFILES): ...here. + Add $(TECHNICAL_PDF), $(TECHNICAL_HH), + $(TUTORIAL_PDF), $(TUTORIAL_HH), + $(WHITE_PAPER_PDF) + $(REF_GUIDE_PDF) and $(REF_GUIDE_HH). + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Prevent todoxygen.sh from generating incomplete outputs. * doc/tools/todoxygen.sh: Take an output file as second argument diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 6c035ee..6bd729e 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -1,4 +1,3 @@ - # Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development # Laboratory (LRDE). # @@ -15,7 +14,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# # FIXME: To be overhauled! (See ticket #134). @@ -52,8 +50,6 @@ DOXYFILE = Doxyfile # Initialiaze variables. EXTRA_DIST = dist_doc_DATA = -CLEANFILES = -MAINTAINERCLEANFILES = # FIXME: Simplify all of this. ``Devel'' targets are really # secondary. And we probably don't need so much target aliases! @@ -144,6 +140,7 @@ $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \ | sed -e 's/\\\$$//g'`; \ $(edit) $< >$@ +MAINTAINERCLEANFILES = $(DOXYFILE_USER) ## FIXME: Rename USER_REFMAN_PDF to something else? USER_REFMAN_PDF = user-refman.pdf @@ -220,6 +217,7 @@ $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in $(edit) $< >$@.tmp $(edit_devel) $@.tmp >$@ rm -f $@.tmp +MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL) ## FIXME: Rename DEVEL_REFMAN_PDF to something else? DEVEL_REFMAN_PDF = devel-refman-pdf @@ -373,13 +371,13 @@ technical-pdf: $(TECHNICAL_PDF) $(TECHNICAL_PDF): $(technical_dependencies) dist_doc_DATA += $(TECHNICAL_PDF) +MAINTAINERCLEANFILES += $(TECHNICAL_PDF) EXTRA_DIST += \ $(technical_dir)/technical.tex \ $(TECHNICAL_HH) -CLEANFILES += $(technical_dir)/technical.haux - +MAINTAINERCLEANFILES += $(TECHNICAL_HH) ## ---------- ## ## Tutorial. ## @@ -476,15 +474,13 @@ tutorial-pdf: $(TUTORIAL_PDF) $(TUTORIAL_PDF): $(tutorial_dependencies) dist_doc_DATA += $(TUTORIAL_PDF) +MAINTAINERCLEANFILES += $(TUTORIAL_PDF) EXTRA_DIST += \ $(tutorial_dir)/tutorial.tex \ $(TUTORIAL_HH) -# FIXME: Why is $(TUTORIAL_HH) listed here? It should be -# automatically cleaned. I'm not sure either about the rest of -# CLEANFILES. -CLEANFILES += $(tutorial_dir)/tutorial.haux +MAINTAINERCLEANFILES += $(TUTORIAL_HH) ## ------------- ## @@ -572,19 +568,15 @@ white-paper-pdf: $(WHITE_PAPER_PDF) # Extra dependencies. $(WHITE_PAPER_PDF): $(PNGS) -dist_doc_DATA += \ - $(WHITE_PAPER_HTML) \ - $(WHITE_PAPER_PDF) +dist_doc_DATA += $(WHITE_PAPER_PDF) +MAINTAINERCLEANFILES += $(WHITE_PAPER_PDF) EXTRA_DIST += \ $(white_paper_dir)/white_paper.tex \ $(PNGS) \ $(EPSS) -CLEANFILES += $(EPSS) - -clean-local: - -rm -rf $(white_paper_dir)/white_paper_html +MAINTAINERCLEANFILES += $(EPSS) ## ----------------- ## @@ -685,14 +677,13 @@ ref-guide-pdf: $(REF_GUIDE_PDF) $(REF_GUIDE_PDF): $(ref_guide_dependencies) dist_doc_DATA += $(REF_GUIDE_PDF) +MAINTAINERCLEANFILES += $(REF_GUIDE_PDF) EXTRA_DIST += \ $(ref_guide_dir)/ref_guide.tex \ $(REF_GUIDE_HH) -CLEANFILES += \ - $(ref_guide_dir)/ref_guide.haux \ - $(ref_guide_dir)/ref_guide.htoc +MAINTAINERCLEANFILES += $(REF_GUIDE_HH) ## --------- ## @@ -782,7 +773,7 @@ PROGRAMS_examples += \ tuto4_site_set_create EXTRA_PROGRAMS = $(PROGRAMS_examples) -CLEANFILES += $(PROGRAMS_examples) +CLEANFILES = $(PROGRAMS_examples) # FIXME: Careful, this will only work if this file is included by # `milena/doc/Makefile.am', since `examples/' is a subdirectory of @@ -1128,7 +1119,3 @@ EXTRA_DIST += \ tools/sample_utils.hh \ tools/split_sample.sh \ tools/todoxygen.sh - -MAINTAINERCLEANFILES += \ - Doxyfile_user \ - Doxyfile_devel -- 1.5.6.5

1 0

last-svn-commit-45-g1dde4ec Prevent todoxygen.sh from generating incomplete outputs.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/tools/todoxygen.sh: Take an output file as second argument instead of an output directory. * doc/Makefile.am ($(TECHNICAL_HH), $(TUTORIAL_HH), $(REF_GUIDE_HH)): Adjust. Use a temporary file to prevent todoxygen.sh from generating incomplete outputs. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 24 +++++++++++++++++++++--- milena/doc/tools/todoxygen.sh | 4 ++-- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ccf8b89..bd96c2e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Prevent todoxygen.sh from generating incomplete outputs. + + * doc/tools/todoxygen.sh: Take an output file as second argument + instead of an output directory. + * doc/Makefile.am + ($(TECHNICAL_HH), $(TUTORIAL_HH), $(REF_GUIDE_HH)): Adjust. + Use a temporary file to prevent todoxygen.sh from generating + incomplete outputs. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Adjust todoxygen.sh to TeX4ht outputs. * doc/tools/todoxygen.sh: Here. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 17a26bf..6c035ee 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -357,7 +357,13 @@ TECHNICAL_HH = $(technical_dir)/technical.hh # $(TECHNICAL_HTML). Anyway, this shortcut should vanish soon. technical-html: $(TECHNICAL_HH) $(TECHNICAL_HH): $(TECHNICAL_HTML) $(doc_dir)/tools/todoxygen.sh - $(doc_dir)/tools/todoxygen.sh $< $(technical_dir) $(doc_dir) +# The script `todoxygen.sh' may fail and still create a (partial and +# invalid) file, thus preventing Make from trying to generate it +# again. The solution is to use a temporary file as output and rename +# it if the script succeeds. + rm -f $@.tmp + $(doc_dir)/tools/todoxygen.sh $< $@.tmp $(doc_dir) + mv -f $@.tmp $@ # Final product. @@ -454,7 +460,13 @@ TUTORIAL_HH = $(tutorial_dir)/tutorial.hh # $(TUTORIAL_HTML). Anyway, this shortcut should vanish soon. tutorial-html: $(TUTORIAL_HH) $(TUTORIAL_HH): $(TUTORIAL_HTML) $(doc_dir)/tools/todoxygen.sh - $(doc_dir)/tools/todoxygen.sh $< $(tutorial_dir) $(doc_dir) +# The script `todoxygen.sh' may fail and still create a (partial and +# invalid) file, thus preventing Make from trying to generate it +# again. The solution is to use a temporary file as output and rename +# it if the script succeeds. + rm -f $@.tmp + $(doc_dir)/tools/todoxygen.sh $< $@.tmp $(doc_dir) + mv -f $@.tmp $@ # Final product. @@ -657,7 +669,13 @@ REF_GUIDE_HH = $(ref_guide_dir)/ref_guide.hh # $(REF_GUIDE_HTML). Anyway, this shortcut should vanish soon. ref-guide-html: $(REF_GUIDE_HH) $(REF_GUIDE_HH): $(REF_GUIDE_HTML) $(doc_dir)/tools/todoxygen.sh - $(doc_dir)/tools/todoxygen.sh $< $(ref_guide_dir) $(doc_dir) +# The script `todoxygen.sh' may fail and still create a (partial and +# invalid) file, thus preventing Make from trying to generate it +# again. The solution is to use a temporary file as output and rename +# it if the script succeeds. + rm -f $@.tmp + $(doc_dir)/tools/todoxygen.sh $< $@.tmp $(doc_dir) + mv -f $@.tmp $@ # Final product. diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh index 19a204a..0a85632 100755 --- a/milena/doc/tools/todoxygen.sh +++ b/milena/doc/tools/todoxygen.sh @@ -19,10 +19,10 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. test $# -eq 3 \ - || { echo "Usage: $0 <file.html> <output dir> <path to .sty>"; exit 1; } + || { echo "Usage: $0 <input.html> <output.hh> <path to .sty>"; exit 1; } html="$1" -out="$2/`basename $1 .html`.hh" +out="$2" bodyl=`grep -n -i "<BODY" $html | cut -d ':' -f 1` nlines=`wc -l $html | cut -d ' ' -f 1` -- 1.5.6.5

1 0

last-svn-commit-44-gb7b6a7d Adjust todoxygen.sh to TeX4ht outputs.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/tools/todoxygen.sh: Here. --- milena/ChangeLog | 6 ++++++ milena/doc/tools/todoxygen.sh | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9c6df10..ccf8b89 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Adjust todoxygen.sh to TeX4ht outputs. + + * doc/tools/todoxygen.sh: Here. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Adapt HTML generation to TeX4ht. * doc/Makefile.am diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh index 9acab35..19a204a 100755 --- a/milena/doc/tools/todoxygen.sh +++ b/milena/doc/tools/todoxygen.sh @@ -24,7 +24,7 @@ test $# -eq 3 \ html="$1" out="$2/`basename $1 .html`.hh" -bodyl=`grep -n "<BODY >" $html | cut -d ':' -f 1` +bodyl=`grep -n -i "<BODY" $html | cut -d ':' -f 1` nlines=`wc -l $html | cut -d ' ' -f 1` tail_line=$(($nlines - $bodyl)) -- 1.5.6.5

1 0