March 2010 - Olena-patches

last-svn-commit-40-g9693e15 Use texi2dvi to produce HTML from LaTeX.
by Roland Levillain 15 Mar '10

15 Mar '10

* doc/Makefile.am (TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper. ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): Reduce these rules to a list of extra dependencies and let the generic tex-to-html rule do the job. --- milena/ChangeLog | 11 +++++++++++ milena/doc/.gitignore | 31 +++++++++++-------------------- milena/doc/Makefile.am | 31 +++++++++++++++++-------------- 3 files changed, 39 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 35aa08a..99345b1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Use texi2dvi to produce HTML from LaTeX. + + * doc/Makefile.am + (TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper. + ($(TECHNICAL_PDF), $(TUTORIAL_PDF)) + ($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)): + Reduce these rules to a list of extra dependencies and let the + generic tex-to-html rule do the job. + 2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> Split LaTeX-to-HTML rules to clear things up. diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 9c55456..b187492 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -1,33 +1,24 @@ -/Doxyfile_devel /Doxyfile_user -/devel-refman -/devel-refman.pdf /user-refman /user-refman.pdf + +/Doxyfile_devel +/devel-refman +/devel-refman.pdf + /figures/*.png -/ref_guide/ref_guide.haux + /ref_guide/ref_guide.hh -/ref_guide/ref_guide.hh-e /ref_guide/ref_guide.html -/ref_guide/ref_guide.htoc /ref_guide/ref_guide.pdf -/technical/technical.haux -/technical/technical.hh -/technical/technical.hh-e + /technical/technical.html /technical/technical.pdf -/tutorial/tutorial.haux + /tutorial/tutorial.hh -/tutorial/tutorial.hh-e /tutorial/tutorial.html /tutorial/tutorial.pdf -/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_html/index.haux -/white_paper/white_paper_html/index.html -/white_paper/white_paper_html/index.html-e -/white_paper/white_paper_html/index.htoc -/white_paper/white_paper_html/index.image.tex + +/white_paper/figures/*.eps +/white_paper/white_paper.html /white_paper/white_paper.pdf diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 0d74098..3dc4bed 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -90,6 +90,9 @@ TEXI2DVI_FLAGS += \ -I $(DOC_SRCDIR) -I $(OUTPUTS_SRCDIR) -I $(SPLIT_OUTPUTS_SRCDIR) \ -I $(IMG_SRCDIR) -I $(SPLIT_EXAMPLES_SRCDIR) +# Illustrations of the white paper. +TEXI2DVI_FLAGS += -I $(DOC_SRCDIR)/white_paper + # Additional files for HeVeA compilations. DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty @@ -318,9 +321,10 @@ technical_dependencies = $(doc_dir)/figures.stamp ## Doyxgen documentation); remove its generation? Careful, ## technical/technical.html *is* probably required, though. +# Final product. TECHNICAL_HTML = $(technical_dir)/technical.html -$(TECHNICAL_HTML): $(technical_dir)/technical.tex $(technical_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(TECHNICAL_HTML): $(technical_dependencies) dist_doc_DATA += $(TECHNICAL_HTML) @@ -396,9 +400,10 @@ tutorial_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +# Final product. TUTORIAL_HTML = $(tutorial_dir)/tutorial.html -$(TUTORIAL_HTML): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(TUTORIAL_HTML): $(tutorial_dependencies) dist_doc_DATA += $(TUTORIAL_HTML) @@ -482,15 +487,12 @@ white-paper: white-paper-pdf white-paper-html # product is a directory, also refresh a timestamp (in the source # dir). -# FIXME: Use texi2dvi/TeX4ht instead of plain hevea. -# FIXME: Why is WHITE_PAPER_HTML generated in a subdirectory? -WHITE_PAPER_HTML = $(white_paper_dir)/white_paper_html/index.html +# Final product. +WHITE_PAPER_HTML = $(white_paper_dir)/white_paper.html white-paper-html: $(WHITE_PAPER_HTML) -$(WHITE_PAPER_HTML): $(white_paper_dir)/white_paper.tex $(EPSS) - test -d $(white_paper_dir)/white_paper_html \ - || mkdir $(white_paper_dir)/white_paper_html - TEXINPUTS="$(DOC_SRCDIR):$(white_paper_dir):" hevea -O -fix $< -o $@ - $(doc_dir)/tools/clearbanner.sh $@ +$(WHITE_PAPER_HTML): $(EPSS) +# FIXME: Keep this pass? +# $(doc_dir)/tools/clearbanner.sh $@ WHITE_PAPER_PDF = $(white_paper_dir)/white_paper.pdf @@ -556,9 +558,10 @@ ref_guide_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +# Final product. REF_GUIDE_HTML = $(ref_guide_dir)/ref_guide.html -$(REF_GUIDE_HTML): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) - hevea -O -fix $(DOC_PACKAGES) $< -o $@ +# Extra dependencies. +$(REF_GUIDE_HTML): $(ref_guide_dependencies) dist_doc_DATA += $(REF_GUIDE_HTML) -- 1.5.6.5

1 0

last-svn-commit-39-g735e0af Support HTML outputs in tex.mk.
by Roland Levillain 15 Mar '10

15 Mar '10

* build-aux/tex.mk (SUFFIXES): Add .html. (.tex.html): New rule. (TEXI2HTML, TEXI2HTML_FLAGS): New variables. --- ChangeLog | 8 ++++++++ build-aux/tex.mk | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91abb6e..36bc676 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Support HTML outputs in tex.mk. + + * build-aux/tex.mk (SUFFIXES): Add .html. + (.tex.html): New rule. + (TEXI2HTML, TEXI2HTML_FLAGS): New variables. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Automake configuration. * configure.ac: Remove option `foreign'. diff --git a/build-aux/tex.mk b/build-aux/tex.mk index 9fa00ff..493a687 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -27,11 +27,17 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch TEXI2PDF = $(TEXI2DVI) --pdf TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) -SUFFIXES = .pdf .tex +TEXI2HTML = $(TEXI2DVI) --html +TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) + +SUFFIXES = .tex .pdf .html .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-8-gfbe0b7f gluit/gluit.mk: Help Emacs find out the nature of this file.
by Roland Levillain 15 Mar '10

15 Mar '10

--- external/trimesh/ChangeLog | 4 ++++ external/trimesh/gluit/gluit.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 0122709..62ddb64 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -1,3 +1,7 @@ +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + * gluit/gluit.mk: Help Emacs find out the nature of this file. + 2009-09-09 Guillaume Lazzara <guillaume.lazzara(a)epita.fr> Add extra LD_FLAGS in Trimesh. diff --git a/external/trimesh/gluit/gluit.mk b/external/trimesh/gluit/gluit.mk index 0d8f7b9..9a2043c 100644 --- a/external/trimesh/gluit/gluit.mk +++ b/external/trimesh/gluit/gluit.mk @@ -1,4 +1,4 @@ -## Linking with gluit and GLUT/OpenGL. -*- Automake -*- +## Linking with gluit and GLUT/OpenGL. -*- Makefile-Automake -*- ## ------------------------------------------------------------------ ## ## Before loading this file, you must define `gluit_builddir' first. ## -- 1.5.6.5

1 0

last-svn-commit-7-g851beeb Clean up external/trimesh/ChangeLog.
by Roland Levillain 15 Mar '10

15 Mar '10

--- external/trimesh/ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/external/trimesh/ChangeLog b/external/trimesh/ChangeLog index 0f1a80f..0122709 100644 --- a/external/trimesh/ChangeLog +++ b/external/trimesh/ChangeLog @@ -3,7 +3,7 @@ Add extra LD_FLAGS in Trimesh. * gluit/Makefile.am, - * libsrc/Makefile.am: Add extra LD_FLAGS. + * libsrc/Makefile.am: Add extra LD_FLAGS. 2009-06-16 Guillaume Lazzara <guillaume.lazzara(a)epita.fr> -- 1.5.6.5

1 0

last-svn-commit-6-g77004f3 Aesthetic changes.
by Roland Levillain 15 Mar '10

15 Mar '10

* tests/tests.mk, * tests/tests-recursive.mk: Here. Help Emacs find out the nature of these files. --- milena/ChangeLog | 9 +++++++++ milena/tests/tests-recursive.mk | 36 ++++++++++++++++++------------------ milena/tests/tests.mk | 36 ++++++++++++++++++++---------------- 3 files changed, 47 insertions(+), 34 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2c40c47..608d1cd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Aesthetic changes. + + * tests/tests.mk, + * tests/tests-recursive.mk: + Here. + Help Emacs find out the nature of these files. + 2010-03-02 Roland Levillain <roland(a)lrde.epita.fr> Regen Milena's Makefile helpers. diff --git a/milena/tests/tests-recursive.mk b/milena/tests/tests-recursive.mk index 0cd6375..1a2227e 100644 --- a/milena/tests/tests-recursive.mk +++ b/milena/tests/tests-recursive.mk @@ -1,23 +1,23 @@ -# tests-recursive.mk -*- Automake -*- +## tests-recursive.mk -*- Makefile-Automake -*- -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -# (LRDE) -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. +## Compile tests recursively, but don't run them. -# Compile tests recursively, but don't run them. +## Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +## (LRDE) +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Olena. If not, see <http://www.gnu.org/licenses/>. include $(top_srcdir)/build-aux/extra-recursive-targets.mk diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 9ca0803..85ee5d5 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -1,19 +1,23 @@ -## -*- Automake -*- -# Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. +## tests.mk -*- Makefile-Automake -*- + +## Shared configuration for tests. + +## Copyright (C) 2007, 2008, 2009 EPITA Research and Development +## Laboratory (LRDE) +## +## This file is part of Olena. +## +## Olena is free software: you can redistribute it and/or modify it under +## the terms of the GNU General Public License as published by the Free +## Software Foundation, version 2 of the License. +## +## Olena is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +## General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with Olena. If not, see <http://www.gnu.org/licenses/>. # FIXME: Revamp (see Olena 0.11's test suite). -- 1.5.6.5

1 0

last-svn-commit-5-g08a77f7 Aesthetic changes.
by Roland Levillain 15 Mar '10

15 Mar '10

* build-aux/regen-recursive.mk, * build-aux/extra-recursive-targets.mk: Here. Help Emacs find out the nature of these files. --- ChangeLog | 9 +++++++++ build-aux/extra-recursive-targets.mk | 23 ++++++++++++----------- build-aux/regen-recursive.mk | 27 ++++++++++++++------------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a325c9..1778f82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Aesthetic changes. + + * build-aux/regen-recursive.mk, + * build-aux/extra-recursive-targets.mk: + Here. + Help Emacs find out the nature of these files. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + * AUTHORS: Update. 2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/build-aux/extra-recursive-targets.mk b/build-aux/extra-recursive-targets.mk index 7c1ef1e..f66e0b2 100644 --- a/build-aux/extra-recursive-targets.mk +++ b/build-aux/extra-recursive-targets.mk @@ -1,16 +1,17 @@ -# extra-recursive-targets.mk -*- Automake -*- -# Factor the installation of additional recursive targets. +## extra-recursive-targets.mk -*- Makefile-Automake -*- -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +## Factor the installation of additional recursive targets. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +## 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. +## This Makefile.in is free software; the Free Software Foundation +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. + +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY, to the extent permitted by law; without +## even the implied warranty of MERCHANTABILITY or FITNESS FOR A +## PARTICULAR PURPOSE. EXTRA_RECURSIVE_TARGETS = diff --git a/build-aux/regen-recursive.mk b/build-aux/regen-recursive.mk index cfa7e69..c736cf0 100644 --- a/build-aux/regen-recursive.mk +++ b/build-aux/regen-recursive.mk @@ -1,20 +1,21 @@ -# regen-recursive.mk -*- Automake -*- -# Regenerate files recursively. +## regen-recursive.mk -*- Makefile-Automake -*- -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +## Regenerate files recursively. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +## 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. +## This Makefile.in is free software; the Free Software Foundation +## gives unlimited permission to copy and/or distribute it, +## with or without modifications, as long as this notice is preserved. +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY, to the extent permitted by law; without +## even the implied warranty of MERCHANTABILITY or FITNESS FOR A +## PARTICULAR PURPOSE. -# To use this file, include it in Makefile.am and populate -# REGEN_SUBDIRS (using `+=') with the subdirectories to visit. + +## To use this file, include it in Makefile.am and populate +## REGEN_SUBDIRS (using `+=') with the subdirectories to visit. REGEN_SUBDIRS = -- 1.5.6.5

1 0

last-svn-commit-4-g501c45e AUTHORS: Update.
by Roland Levillain 15 Mar '10

15 Mar '10

--- AUTHORS | 24 ++++++++++++++++-------- ChangeLog | 4 ++++ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/AUTHORS b/AUTHORS index 8d66f48..f6478dc 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,10 +5,6 @@ This package was written by and with the assistance of Active LRDE Staff. ================== -* Fabien Freling fabien.freling(a)lrde.epita.fr - - Work on Melimage with IGR. - - Library improvements. - * Thierry Géraud theo(a)lrde.epita.fr - Management of the project in the first place. - Type system. @@ -18,13 +14,15 @@ Active LRDE Staff. - Olena 1.0 core. - Numerous hours spent thinking about Olena. +* Yann Jacquelet jacquelet(a)lrde.epita.fr + * Guillaume Lazzara z(a)lrde.epita.fr - Work on Scribo - Library improvements. * Roland Levillain roland(a)lrde.epita.fr - Project manager. - - Theoritical mentor. + - Theoretical mentor. - Renovation of Swilena (Olena 0.10a). - G++ 4.0 and 4.1 compatibility (Olena 0.10a). - Integration of GNU Libtool (Olena 0.10a). @@ -55,15 +53,25 @@ Past contributors of LRDE Staff. - First documentation system. - Numerous hours spent on Olena to make it better. +* Fabien Freling fabien.freling(a)lrde.epita.fr + - Work on Melimage with IGR. + - Library improvements. + ========================= -Students from Class 2011. +Students from Class 2012. ========================= -* Frédéric Bour +* Frédéric Bour frederic.bour(a)lrde.epita.fr - Prototype of the upcoming functions system. -* Edwin Carlinet +* Julien Marquegnies julien.marquegnies(a)lrde.epita.fr + +========================= +Students from Class 2011. +========================= + +* Edwin Carlinet edwin.carlinet(a)lrde.epita.fr - Accumulators. - Morphological connected filters. diff --git a/ChangeLog b/ChangeLog index 76c3a44..7a325c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + * AUTHORS: Update. + 2009-10-27 Roland Levillain <roland(a)lrde.epita.fr> Add missing copyright headers to M4 files. -- 1.5.6.5

1 0

last-svn-commit-38-gb19305e Automake configuration.
by Roland Levillain 15 Mar '10

15 Mar '10

* configure.ac: Remove option `foreign'. Pass option `subdir-objects'. --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e44548c..91abb6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Automake configuration. + + * configure.ac: Remove option `foreign'. + Pass option `subdir-objects'. + +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + Have bootstrap check for HeVeA 1.10. * bootstrap (require): Take a flag as an optional second argument. diff --git a/configure.ac b/configure.ac index a07bec6..9b825a7 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) # Automake. -AM_INIT_AUTOMAKE([1.10 foreign check-news dist-bzip2 nostdinc -Wall]) +AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall]) # Package metadata. AC_CONFIG_FILES([milena/mln/version.hh]) -- 1.5.6.5

1 0

last-svn-commit-37-gfbc3cb2 Have bootstrap check for HeVeA 1.10.
by Roland Levillain 15 Mar '10

15 Mar '10

* bootstrap (require): Take a flag as an optional second argument. Use it to check for HeVeA 1.10. --- ChangeLog | 7 +++++++ bootstrap | 13 +++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3b7971..e44548c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> + + Have bootstrap check for HeVeA 1.10. + + * bootstrap (require): Take a flag as an optional second argument. + Use it to check for HeVeA 1.10. + 2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> Add texi2dvi as well as a Make helper to use it. diff --git a/bootstrap b/bootstrap index 62cc724..2bdd761 100755 --- a/bootstrap +++ b/bootstrap @@ -78,14 +78,17 @@ version_compare () esac } -# require TOOL REQUIREMENT -# ------------------------ +# require TOOL REQUIREMENT [OPTION] +# --------------------------------- # Test that TOOL exists, and its version is at least REQUIREMENT. +# If given, use OPTION to query TOOL; use `--version' otherwise. require () { - local version=$($1 --version | sed -n 's/[^0-9.]*$[0-9][0-9.]*$.*/\1/p;q') + local option + if test $# -eq 3; then option=$3; else option=--version; fi + local version=$($1 $option | sed -n 's/[^0-9.]*$[0-9][0-9.]*$.*/\1/p;q') test x"$version" != x || - fatal "$1 is required" + fatal "$1 (version $2 or better) is required" case $(version_compare "$2" "$version") in '>') fatal "$1 $2 or better is required: this is $1 $version";; esac @@ -126,6 +129,8 @@ 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 # Tell what's going on. set -x -- 1.5.6.5

1 0

last-svn-commit-36-g51a165b Split LaTeX-to-HTML rules to clear things up.
by Roland Levillain 12 Mar '10

12 Mar '10

* doc/tools/todoxygen.sh: Take a HTML file as input instead of a LaTeX one. * doc/Makefile.am (DOC_PACKAGES): New variable. (TECHNICAL_HTML, TUTORIAL_HTML, REF_GUIDE_HTML): New variables. ($(TECHNICAL_HTML), $(TUTORIAL_HTML), $(REF_GUIDE_HTML)): New targets. (dist_doc_DATA): Add $(TECHNICAL_HTML), $(TUTORIAL_HTML) and $(REF_GUIDE_HTML). ($(TECHNICAL_HH)): Depend on and process $(TECHNICAL_HTML) instead of $(technical_dir)/technical.tex. ($(TUTORIAL_HH)): Depend on and process $(TUTORIAL_HTML) instead of $(tutorial_dir)/tutorial.tex. ($(REF_GUIDE_HH)): Depend on and process $(REF_GUIDE_HTML) instead of $(ref_guide_dir)/ref_guide.tex. (CLEANFILES): Remove now useless patterns. (clean-local): Likewise. Adjust paths. --- milena/ChangeLog | 23 ++++++++++ milena/doc/Makefile.am | 94 +++++++++++++++++++---------------------- milena/doc/tools/todoxygen.sh | 46 ++++++++++++-------- 3 files changed, 94 insertions(+), 69 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 23fb296..35aa08a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,28 @@ 2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + Split LaTeX-to-HTML rules to clear things up. + + * doc/tools/todoxygen.sh: Take a HTML file as input instead of a + LaTeX one. + * doc/Makefile.am (DOC_PACKAGES): New variable. + (TECHNICAL_HTML, TUTORIAL_HTML, REF_GUIDE_HTML): + New variables. + ($(TECHNICAL_HTML), $(TUTORIAL_HTML), $(REF_GUIDE_HTML)): + New targets. + (dist_doc_DATA): Add $(TECHNICAL_HTML), $(TUTORIAL_HTML) and + $(REF_GUIDE_HTML). + ($(TECHNICAL_HH)): Depend on and process $(TECHNICAL_HTML) instead + of $(technical_dir)/technical.tex. + ($(TUTORIAL_HH)): Depend on and process $(TUTORIAL_HTML) instead + of $(tutorial_dir)/tutorial.tex. + ($(REF_GUIDE_HH)): Depend on and process $(REF_GUIDE_HTML) instead + of $(ref_guide_dir)/ref_guide.tex. + (CLEANFILES): Remove now useless patterns. + (clean-local): Likewise. + Adjust paths. + +2010-03-12 Roland Levillain <roland(a)lrde.epita.fr> + List non generated documentation outputs separately. * doc/Makefile.am (OUTPUTS, EXAMPLES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 98e3332..0d74098 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -90,6 +90,10 @@ TEXI2DVI_FLAGS += \ -I $(DOC_SRCDIR) -I $(OUTPUTS_SRCDIR) -I $(SPLIT_OUTPUTS_SRCDIR) \ -I $(IMG_SRCDIR) -I $(SPLIT_EXAMPLES_SRCDIR) +# Additional files for HeVeA compilations. +DOC_PACKAGES = $(srcdir)/doxyfuns.sty $(srcdir)/milena.sty + + ## ----------------------- ## ## Doxygen documentation. ## ## ----------------------- ## @@ -310,6 +314,16 @@ technical_dependencies = $(doc_dir)/figures.stamp # product is a directory, also refresh a timestamp (in the source # dir). +## FIXME: technical technical.hh does not seem to be used (by the +## Doyxgen documentation); remove its generation? Careful, +## technical/technical.html *is* probably required, though. + +TECHNICAL_HTML = $(technical_dir)/technical.html +$(TECHNICAL_HTML): $(technical_dir)/technical.tex $(technical_dependencies) + hevea -O -fix $(DOC_PACKAGES) $< -o $@ + +dist_doc_DATA += $(TECHNICAL_HTML) + # Intermediate product for the various doc targets of the parent # directory. # @@ -317,8 +331,10 @@ technical_dependencies = $(doc_dir)/figures.stamp # extension, since it is later parsed by Doxygen, which complains # about `.html' files. TECHNICAL_HH = $(technical_dir)/technical.hh +# FIXME: Careful, technical-html depends on $(TECHNICAL_HH), not +# $(TECHNICAL_HTML). Anyway, this shortcut should vanish soon. technical-html: $(TECHNICAL_HH) -$(TECHNICAL_HH): $(technical_dir)/technical.tex $(technical_dependencies) +$(TECHNICAL_HH): $(TECHNICAL_HTML) $(doc_dir)/tools/todoxygen.sh $(doc_dir)/tools/todoxygen.sh $< $(technical_dir) $(doc_dir) @@ -334,20 +350,7 @@ EXTRA_DIST += \ $(technical_dir)/technical.tex \ $(TECHNICAL_HH) -# FIXME: Remove `tutorial.aux tutorial.toc tutorial.log tutorial.bbl -# tutorial.out *blg *.lot' when texi2dvi is used. -# -# FIXME: Why is $(TUTORIAL_PDF) listed here? It should be -# automatically cleaned. I'm not sure either about the rest of -# CLEANFILES. -CLEANFILES += \ - technical.aux technical.toc technical.log technical.bbl technical.out \ - *blg *.lot \ - $(TECHNICAL_PDF) \ - *.haux *.hh *.html *.htoc \ - technical.html \ - technical.idx \ - $(TECHNICAL_HH) +CLEANFILES += $(technical_dir)/technical.haux ## ---------- ## @@ -393,6 +396,12 @@ tutorial_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +TUTORIAL_HTML = $(tutorial_dir)/tutorial.html +$(TUTORIAL_HTML): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) + hevea -O -fix $(DOC_PACKAGES) $< -o $@ + +dist_doc_DATA += $(TUTORIAL_HTML) + # Intermediate product for the various doc targets of the parent # directory. # @@ -400,10 +409,13 @@ tutorial_dependencies = \ # since it is later parsed by Doxygen, which complains about `.html' # files. TUTORIAL_HH = $(tutorial_dir)/tutorial.hh +# FIXME: Careful, tutorial-html depends on $(TUTORIAL_HH), not +# $(TUTORIAL_HTML). Anyway, this shortcut should vanish soon. tutorial-html: $(TUTORIAL_HH) -$(TUTORIAL_HH): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) +$(TUTORIAL_HH): $(TUTORIAL_HTML) $(doc_dir)/tools/todoxygen.sh $(doc_dir)/tools/todoxygen.sh $< $(tutorial_dir) $(doc_dir) + # Final product. TUTORIAL_PDF = $(tutorial_dir)/tutorial.pdf tutorial-pdf: $(TUTORIAL_PDF) @@ -416,20 +428,10 @@ EXTRA_DIST += \ $(tutorial_dir)/tutorial.tex \ $(TUTORIAL_HH) -# FIXME: Remove `tutorial.aux tutorial.toc tutorial.log tutorial.bbl -# tutorial.out *blg *.lot' when texi2dvi is used. -# -# FIXME: Why is $(TUTORIAL_PDF) listed here? It should be +# FIXME: Why is $(TUTORIAL_HH) listed here? It should be # automatically cleaned. I'm not sure either about the rest of # CLEANFILES. -CLEANFILES += \ - tutorial.aux tutorial.toc tutorial.log tutorial.bbl tutorial.out \ - *blg *.lot \ - $(TUTORIAL_PDF) \ - *.haux *.hh *.html *.htoc \ - tutorial.html \ - tutorial.idx \ - $(TUTORIAL_HH) +CLEANFILES += $(tutorial_dir)/tutorial.haux ## ------------- ## @@ -505,15 +507,10 @@ EXTRA_DIST += \ $(PNGS) \ $(EPSS) -# FIXME: Remove unnecessary patterns. -CLEANFILES += \ - white_paper_image.* \ - white_paper.pdf \ - *.log *.idx *.out *.aux +CLEANFILES += $(EPSS) -# FIXME: Likewise. clean-local: - -rm -rf white_paper_html figures + -rm -rf $(white_paper_dir)/white_paper_html ## ----------------- ## @@ -559,6 +556,12 @@ ref_guide_dependencies = \ # product is a directory, also refresh a timestamp (in the source # dir). +REF_GUIDE_HTML = $(ref_guide_dir)/ref_guide.html +$(REF_GUIDE_HTML): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) + hevea -O -fix $(DOC_PACKAGES) $< -o $@ + +dist_doc_DATA += $(REF_GUIDE_HTML) + # Intermediate product for the various doc targets of the parent # directory. # @@ -566,8 +569,10 @@ ref_guide_dependencies = \ # since it is later parsed by Doxygen, which complains about `.html' # files. REF_GUIDE_HH = $(ref_guide_dir)/ref_guide.hh +# FIXME: Careful, ref-guide-html depends on $(REF_GUIDE_HH), not +# $(REF_GUIDE_HTML). Anyway, this shortcut should vanish soon. ref-guide-html: $(REF_GUIDE_HH) -$(REF_GUIDE_HH): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) +$(REF_GUIDE_HH): $(REF_GUIDE_HTML) $(doc_dir)/tools/todoxygen.sh $(doc_dir)/tools/todoxygen.sh $< $(ref_guide_dir) $(doc_dir) @@ -583,20 +588,9 @@ EXTRA_DIST += \ $(ref_guide_dir)/ref_guide.tex \ $(REF_GUIDE_HH) -# FIXME: Remove `ref_guide.aux ref_guide.toc ref_guide.log -# ref_guide.bbl ref_guide.out *blg *.lot' when texi2dvi is used. -# -# FIXME: Why is $(REF_GUIDE_PDF) listed here? It should be -# automatically cleaned. I'm not sure either about the rest of -# CLEANFILES. -CLEANFILES += \ - ref_guide.aux ref_guide.toc ref_guide.log ref_guide.bbl ref_guide.out \ - *blg *.lot \ - $(REF_GUIDE_PDF) \ - *.haux *.hh *.html *.htoc \ - ref_guide.html \ - ref_guide.idx \ - $(REF_GUIDE_HH) +CLEANFILES += \ + $(ref_guide_dir)/ref_guide.haux \ + $(ref_guide_dir)/ref_guide.htoc ## --------- ## diff --git a/milena/doc/tools/todoxygen.sh b/milena/doc/tools/todoxygen.sh index c61f5e1..9acab35 100755 --- a/milena/doc/tools/todoxygen.sh +++ b/milena/doc/tools/todoxygen.sh @@ -1,19 +1,28 @@ -#!/bin/sh - -if [ $# -ne 3 ]; then - echo "Usage: $0 <file.tex> <output dir> <path to .sty>"; - exit 1; -fi - -out="$2/`basename $1 .tex`.hh" -html="$2/`basename $1 .tex`.html" - -DOC_PACKAGES=" - $3/doxyfuns.sty \ - $3/milena.sty" - -#Convert .tex to .html -hevea -O -fix $DOC_PACKAGES $1 -o $html +#! /bin/sh + +# todoxygen.sh: Turn HTML files into suitable inputs for doxygen. + +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). +# +# This file is part of Olena. +# +# Olena is free software: you can redistribute it and/or modify it under +# the terms of the GNU General Public License as published by the Free +# Software Foundation, version 2 of the License. +# +# Olena is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Olena. If not, see <http://www.gnu.org/licenses/>. + +test $# -eq 3 \ + || { echo "Usage: $0 <file.html> <output dir> <path to .sty>"; exit 1; } + +html="$1" +out="$2/`basename $1 .html`.hh" bodyl=`grep -n "<BODY >" $html | cut -d ':' -f 1` nlines=`wc -l $html | cut -d ' ' -f 1` @@ -32,11 +41,10 @@ sed -i -e 's/&#X201C/\&ldquo/g' $out sed -i -e 's/&#X201D/\&rdquo/g' $out sed -i -e 's/&#X2261/\&equiv/g' $out -#Doxygen wants us to preserve '\n' after commands. -#\ref and \see do not need that extra new line. +# Doxygen wants us to preserve '\n' after commands. +# \ref and \see do not need that extra new line. for keyword in include section page subpage subsection subsubsection image; do sed -i -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out sed -i -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out sed -i -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out done - -- 1.5.6.5

1 0