- Olena-patches

last-svn-commit-71-g019eafb bootstrap: Be terser.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 322b639..d116ebe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Be terser. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Don't remove the automatically collected temp dir. 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 566a62f..3187d3b 100755 --- a/bootstrap +++ b/bootstrap @@ -150,9 +150,6 @@ EOF # dvipng is required by TeX4ht. require dvipng 1.11 -# Tell what's going on. -set -x - # Generate milena/headers.mk run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers -- 1.5.6.5

1 0

last-svn-commit-78-g7fe9e76 bootstrap: Be terser.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 39ccbb8..8e5c2a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Be terser. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Don't remove the automatically collected temp dir. 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 566a62f..3187d3b 100755 --- a/bootstrap +++ b/bootstrap @@ -150,9 +150,6 @@ EOF # dvipng is required by TeX4ht. require dvipng 1.11 -# Tell what's going on. -set -x - # Generate milena/headers.mk run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers -- 1.5.6.5

1 0

last-svn-commit-70-g487066b bootstrap: Don't remove the automatically collected temp dir.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7b87fce..322b639 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Don't remove the automatically collected temp dir. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen the list of outputs of the documentation. 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index ac5a455..566a62f 100755 --- a/bootstrap +++ b/bootstrap @@ -134,6 +134,7 @@ 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` +# Set up automatic cleanup. cleanup() { rm -rf "$tempdir"; exit; } trap cleanup 0 1 2 3 6 15 ( @@ -146,8 +147,7 @@ trap cleanup 0 1 2 3 6 15 EOF htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required" ) -rm -rf "$tempdir" -# dvipnh is required by TeX4ht. +# dvipng is required by TeX4ht. require dvipng 1.11 # Tell what's going on. -- 1.5.6.5

1 0

last-svn-commit-77-g3fac2c7 bootstrap: Don't remove the automatically collected temp dir.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index db6a70a..39ccbb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Don't remove the automatically collected temp dir. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen the list of outputs of the documentation. 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index ac5a455..566a62f 100755 --- a/bootstrap +++ b/bootstrap @@ -134,6 +134,7 @@ 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` +# Set up automatic cleanup. cleanup() { rm -rf "$tempdir"; exit; } trap cleanup 0 1 2 3 6 15 ( @@ -146,8 +147,7 @@ trap cleanup 0 1 2 3 6 15 EOF htlatex >/dev/null 2>&1 test.tex || fatal "TeX4ht is required" ) -rm -rf "$tempdir" -# dvipnh is required by TeX4ht. +# dvipng is required by TeX4ht. require dvipng 1.11 # Tell what's going on. -- 1.5.6.5

1 0

last-svn-commit-69-g412e1c2 Update PNG-to-EPS conversion rule.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (.png.eps): No longer try to build figures/ in the build directory. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 051641a..174692d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update PNG-to-EPS conversion rule. + + * doc/Makefile.am (.png.eps): No longer try to build figures/ in + the build directory. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless paths in texi2dvi invocations. * doc/Makefile.am (TEXI2DVI_FLAGS): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e214cf7..f40cd4b 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -639,12 +639,9 @@ PNGS = \ EPSS = $(PNGS:png=eps) -# FIXME: we want to check if 'figures' exists only once! .png.eps: - test -d figures || mkdir figures convert $< $@ - white-paper: white-paper-pdf white-paper-html # FIXME: As in milena/doc/Makefile.am, we should probably strip -- 1.5.6.5

1 0

last-svn-commit-76-g3e079f7 Update PNG-to-EPS conversion rule.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (.png.eps): No longer try to build figures/ in the build directory. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9712e1a..d9517af 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update PNG-to-EPS conversion rule. + + * doc/Makefile.am (.png.eps): No longer try to build figures/ in + the build directory. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless paths in texi2dvi invocations. * doc/Makefile.am (TEXI2DVI_FLAGS): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index e214cf7..f40cd4b 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -639,12 +639,9 @@ PNGS = \ EPSS = $(PNGS:png=eps) -# FIXME: we want to check if 'figures' exists only once! .png.eps: - test -d figures || mkdir figures convert $< $@ - white-paper: white-paper-pdf white-paper-html # FIXME: As in milena/doc/Makefile.am, we should probably strip -- 1.5.6.5

1 0

last-svn-commit-68-gd7477b4 Remove useless paths in texi2dvi invocations.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (TEXI2DVI_FLAGS): Remove -I $(DOC_SRCDIR)/white_paper. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c391b2c..051641a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless paths in texi2dvi invocations. + + * doc/Makefile.am (TEXI2DVI_FLAGS): + Remove -I $(DOC_SRCDIR)/white_paper. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update cleaning rules in doc/. * doc/Makefile.am (maintainer-clean-local): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index ff00de0..e214cf7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -86,9 +86,6 @@ 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 LaTeX compilations. DOC_PACKAGES = doxyfuns.sty milena.sty -- 1.5.6.5

1 0

last-svn-commit-75-g82f86bd Remove useless paths in texi2dvi invocations.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (TEXI2DVI_FLAGS): Remove -I $(DOC_SRCDIR)/white_paper. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a6b4d74..9712e1a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless paths in texi2dvi invocations. + + * doc/Makefile.am (TEXI2DVI_FLAGS): + Remove -I $(DOC_SRCDIR)/white_paper. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update cleaning rules in doc/. * doc/Makefile.am (maintainer-clean-local): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index ff00de0..e214cf7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -86,9 +86,6 @@ 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 LaTeX compilations. DOC_PACKAGES = doxyfuns.sty milena.sty -- 1.5.6.5

1 0

last-svn-commit-67-g08596c4 Update cleaning rules in doc/.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (maintainer-clean-local): Remove outdated actions. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 69114e8..c391b2c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update cleaning rules in doc/. + + * doc/Makefile.am (maintainer-clean-local): + Remove outdated actions. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Add missing dependencies. * doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index ae7df1c..ff00de0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -416,12 +416,6 @@ $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp maintainer-clean-local: -rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) - -rm -f $(EXAMPLES_BUILDDIR)/*.cc -# FIXME: If we remove a *directory*, we are supposed to know how to -# recreate it later. I doubt our rules are all currently able to -# handle this. See how `make maintainer-clean all' behaves. - -rm -rf $(OUTPUTS_BUILDDIR) - -rm -rf $(FIGURES_BUILDDIR) ## ------------------------- ## -- 1.5.6.5

1 0

last-svn-commit-74-g55cb496 Update cleaning rules in doc/.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (maintainer-clean-local): Remove outdated actions. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c9ea983..a6b4d74 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Update cleaning rules in doc/. + + * doc/Makefile.am (maintainer-clean-local): + Remove outdated actions. + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Add missing dependencies. * doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index ae7df1c..ff00de0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -416,12 +416,6 @@ $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp maintainer-clean-local: -rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) - -rm -f $(EXAMPLES_BUILDDIR)/*.cc -# FIXME: If we remove a *directory*, we are supposed to know how to -# recreate it later. I doubt our rules are all currently able to -# handle this. See how `make maintainer-clean all' behaves. - -rm -rf $(OUTPUTS_BUILDDIR) - -rm -rf $(FIGURES_BUILDDIR) ## ------------------------- ## -- 1.5.6.5

1 0