- Olena-patches

last-svn-commit-66-g8c468bf Add missing dependencies.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. (technical_dependencies) (tutorial_dependencies) (ref_guide_dependencies): Add $(DOC_PACKAGES). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 12 +++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 68fb521..69114e8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Add missing dependencies. + + * doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Add $(DOC_PACKAGES). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Ship non generated outputs. * doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b4d41df..ae7df1c 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -89,8 +89,8 @@ TEXI2DVI_FLAGS += \ # 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 +# Additional files for LaTeX compilations. +DOC_PACKAGES = doxyfuns.sty milena.sty ## --------- ## @@ -437,7 +437,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 = $(PNG_FIGURES) +technical_dependencies = $(PNG_FIGURES) $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -544,7 +544,8 @@ tutorial_dir = $(doc_dir)/tutorial tutorial_dependencies = \ $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ - $(PNG_FIGURES) + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -744,7 +745,8 @@ ref_guide_dir = $(doc_dir)/ref_guide ref_guide_dependencies = \ $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ - $(PNG_FIGURES) + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: -- 1.5.6.5

1 0

last-svn-commit-73-g378fc00 Add missing dependencies.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. (technical_dependencies) (tutorial_dependencies) (ref_guide_dependencies): Add $(DOC_PACKAGES). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 12 +++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 1801dea..c9ea983 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Add missing dependencies. + + * doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes. + (technical_dependencies) + (tutorial_dependencies) + (ref_guide_dependencies): + Add $(DOC_PACKAGES). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Ship non generated outputs. * doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b4d41df..ae7df1c 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -89,8 +89,8 @@ TEXI2DVI_FLAGS += \ # 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 +# Additional files for LaTeX compilations. +DOC_PACKAGES = doxyfuns.sty milena.sty ## --------- ## @@ -437,7 +437,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 = $(PNG_FIGURES) +technical_dependencies = $(PNG_FIGURES) $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -544,7 +544,8 @@ tutorial_dir = $(doc_dir)/tutorial tutorial_dependencies = \ $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ - $(PNG_FIGURES) + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -744,7 +745,8 @@ ref_guide_dir = $(doc_dir)/ref_guide ref_guide_dependencies = \ $(SPLIT_EXAMPLES) \ $(doc_dir)/split-outputs.stamp \ - $(PNG_FIGURES) + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: -- 1.5.6.5

1 0

last-svn-commit-65-g5333046 Ship non generated outputs.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). --- milena/ChangeLog | 6 ++++++ milena/doc/Makefile.am | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e2c3756..68fb521 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Ship non generated outputs. + + * doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of outputs in the documentation. * doc/Makefile.am (OUTPUTS): Remove this variable that used to be diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 32e9395..b4d41df 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -876,7 +876,7 @@ regen-outputs-mk: mv -f $(srcdir)/outputs.mk.tmp $(srcdir)/outputs.mk chmod -w $(srcdir)/outputs.mk -## FIXME: These outpouts are also required by the (LaTeX) +## FIXME: These outputs are also required by the (LaTeX) ## documentation. However, they have no corresponding program in ## examples/, hence they cannot be regenerated. Are they hand-made ## outputs? Or maybe outputs of which program has been removed since? @@ -888,6 +888,7 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/ima2d-display-output-2.txt \ $(srcdir)/outputs/parray-display-1.txt \ $(srcdir)/outputs/win-create-1-display.txt +EXTRA_DIST += $(MORE_OUTPUTS) $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp -- 1.5.6.5

1 0

last-svn-commit-72-g8a2626d Ship non generated outputs.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). --- milena/ChangeLog | 6 ++++++ milena/doc/Makefile.am | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5c38891..1801dea 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Ship non generated outputs. + + * doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS). + +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + Generate the list of outputs in the documentation. * doc/Makefile.am (OUTPUTS): Remove this variable that used to be diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 32e9395..b4d41df 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -876,7 +876,7 @@ regen-outputs-mk: mv -f $(srcdir)/outputs.mk.tmp $(srcdir)/outputs.mk chmod -w $(srcdir)/outputs.mk -## FIXME: These outpouts are also required by the (LaTeX) +## FIXME: These outputs are also required by the (LaTeX) ## documentation. However, they have no corresponding program in ## examples/, hence they cannot be regenerated. Are they hand-made ## outputs? Or maybe outputs of which program has been removed since? @@ -888,6 +888,7 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/ima2d-display-output-2.txt \ $(srcdir)/outputs/parray-display-1.txt \ $(srcdir)/outputs/win-create-1-display.txt +EXTRA_DIST += $(MORE_OUTPUTS) $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp -- 1.5.6.5

1 0

last-svn-commit-64-gdeef345 bootstrap: Regen the list of outputs of the documentation.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b87df8..7b87fce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 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> + * bootstrap: Regen the list of outputs rules and timestamps. 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 8b50cb3..ac5a455 100755 --- a/bootstrap +++ b/bootstrap @@ -179,6 +179,14 @@ milena/doc/gen-make-variable EXAMPLES \ >milena/doc/examples.mk # * Split examples. cd milena/doc && ./gen-split-examples-mk >split-examples.mk +# * Outputs. +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 # * Outputs rules and timestamps. cd milena/doc && \ ./gen-examples-outputs-mk \ -- 1.5.6.5

1 0

last-svn-commit-71-g5ef318c bootstrap: Regen the list of outputs of the documentation.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2a72e19..db6a70a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 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> + * bootstrap: Regen the list of outputs rules and timestamps. 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 8b50cb3..ac5a455 100755 --- a/bootstrap +++ b/bootstrap @@ -179,6 +179,14 @@ milena/doc/gen-make-variable EXAMPLES \ >milena/doc/examples.mk # * Split examples. cd milena/doc && ./gen-split-examples-mk >split-examples.mk +# * Outputs. +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 # * Outputs rules and timestamps. cd milena/doc && \ ./gen-examples-outputs-mk \ -- 1.5.6.5

1 0

last-svn-commit-59-gd4d289f bootstrap: Regen the list of outputs rules and timestamps.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3166c4..8b87df8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Regen the list of outputs rules and timestamps. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Regen the list of split examples of the documentation. diff --git a/bootstrap b/bootstrap index 9dada3f..8b50cb3 100755 --- a/bootstrap +++ b/bootstrap @@ -179,6 +179,12 @@ milena/doc/gen-make-variable EXAMPLES \ >milena/doc/examples.mk # * Split examples. cd milena/doc && ./gen-split-examples-mk >split-examples.mk +# * Outputs rules and timestamps. +cd milena/doc && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-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-66-g1d9cee3 bootstrap: Regen the list of outputs rules and timestamps.
by Roland Levillain 17 Mar '10

17 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 6 ++++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 04d5d88..2a72e19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + * bootstrap: Regen the list of outputs rules and timestamps. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> * bootstrap: Regen the list of split examples of the documentation. diff --git a/bootstrap b/bootstrap index 9dada3f..8b50cb3 100755 --- a/bootstrap +++ b/bootstrap @@ -179,6 +179,12 @@ milena/doc/gen-make-variable EXAMPLES \ >milena/doc/examples.mk # * Split examples. cd milena/doc && ./gen-split-examples-mk >split-examples.mk +# * Outputs rules and timestamps. +cd milena/doc && \ + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-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-50-g247e151 Add a rule to forcefully regen doc/examples-outputs.mk.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (regen-examples-outputs-mk): New (phony) target. (regen-am): Invoke regen-examples-outputs-mk. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d48cb6c..ab828ac 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Add a rule to forcefully regen doc/examples-outputs.mk. + + * doc/Makefile.am (regen-examples-outputs-mk): New (phony) target. + (regen-am): Invoke regen-examples-outputs-mk. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> Ship doc/gen-examples-outputs-mk. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9ba03c0..e31ddc8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -913,6 +913,14 @@ $(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdi chmod -w $@ include $(DOC_SRCDIR)/examples-outputs.mk +.PHONY: regen-examples-outputs-mk +regen-examples-outputs-mk: + $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \ + >$(DOC_SRCDIR)/examples-outputs.mk.tmp + mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \ + $(DOC_SRCDIR)/examples-outputs.mk + chmod -w $(DOC_SRCDIR)/examples-outputs.mk + MAINTAINERCLEANFILES += $(OUTPUTS) # FIXME: Warning: $(SPLIT_EXAMPLES_SRCDIR) might not exist. Ensure it @@ -1045,6 +1053,10 @@ $(srcdir)/split-outputs.stamp: $(OUTPUTS) @mv -f $@.tmp $@ +## -------------- ## +## Regeneration. ## +## -------------- ## + # Regen Make helpers. EXTRA_DIST += generate_dist_files.sh headers.stamp include $(top_srcdir)/build-aux/regen-recursive.mk @@ -1053,12 +1065,12 @@ 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-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 -## FIXME: Regen examples-outputs.mk as well? $(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp $(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp -- 1.5.6.5

1 0

last-svn-commit-57-g4289904 Add a rule to forcefully regen doc/examples-outputs.mk.
by Roland Levillain 17 Mar '10

17 Mar '10

* doc/Makefile.am (regen-examples-outputs-mk): New (phony) target. (regen-am): Invoke regen-examples-outputs-mk. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 14 +++++++++++++- 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6033617..51f1159 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-03-17 Roland Levillain <roland(a)lrde.epita.fr> + + Add a rule to forcefully regen doc/examples-outputs.mk. + + * doc/Makefile.am (regen-examples-outputs-mk): New (phony) target. + (regen-am): Invoke regen-examples-outputs-mk. + 2010-03-16 Roland Levillain <roland(a)lrde.epita.fr> Ship doc/gen-examples-outputs-mk. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9ba03c0..e31ddc8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -913,6 +913,14 @@ $(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdi chmod -w $@ include $(DOC_SRCDIR)/examples-outputs.mk +.PHONY: regen-examples-outputs-mk +regen-examples-outputs-mk: + $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \ + >$(DOC_SRCDIR)/examples-outputs.mk.tmp + mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \ + $(DOC_SRCDIR)/examples-outputs.mk + chmod -w $(DOC_SRCDIR)/examples-outputs.mk + MAINTAINERCLEANFILES += $(OUTPUTS) # FIXME: Warning: $(SPLIT_EXAMPLES_SRCDIR) might not exist. Ensure it @@ -1045,6 +1053,10 @@ $(srcdir)/split-outputs.stamp: $(OUTPUTS) @mv -f $@.tmp $@ +## -------------- ## +## Regeneration. ## +## -------------- ## + # Regen Make helpers. EXTRA_DIST += generate_dist_files.sh headers.stamp include $(top_srcdir)/build-aux/regen-recursive.mk @@ -1053,12 +1065,12 @@ 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-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 -## FIXME: Regen examples-outputs.mk as well? $(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp $(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp -- 1.5.6.5

1 0