March 2010 - Olena-patches

last-svn-commit-88-g9b89467 Typo in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/examples/accu-right-instanciation.cc: Rename as... * doc/examples/accu-right-instantiation.cc: ...this. * doc/examples/accu-wrong-instanciation.cc.raw, * doc/examples/split/accu-right-instanciation-1.cc.raw, * doc/outputs/accu-right-instanciation.txt: Likewise, rename as... * doc/examples/accu-wrong-instantiation.cc.raw, * doc/examples/split/accu-right-instantiation-1.cc.raw, * doc/outputs/accu-right-instantiation.txt: ...these. * doc/ref_guide/ref_guide.tex, * doc/programs-examples.mk, * doc/Makefile.am (MORE_EXAMPLES): s/instanciation/instantiation/. * doc/examples-outputs.mk, * doc/examples.mk, * doc/outputs.mk, * doc/split-examples.mk: Regen. --- milena/ChangeLog | 24 ++++++++++++++++++++ milena/doc/Makefile.am | 2 +- milena/doc/examples-outputs.mk | 14 +++++----- milena/doc/examples.mk | 2 +- ...nstanciation.cc => accu-right-instantiation.cc} | 0 ...tion.cc.raw => accu-wrong-instantiation.cc.raw} | 0 ...-1.cc.raw => accu-right-instantiation-1.cc.raw} | 0 milena/doc/outputs.mk | 2 +- ...tanciation.txt => accu-right-instantiation.txt} | 0 milena/doc/programs-examples.mk | 4 +- milena/doc/ref_guide/ref_guide.tex | 4 +- milena/doc/split-examples.mk | 10 ++++---- 12 files changed, 43 insertions(+), 19 deletions(-) rename milena/doc/examples/{accu-right-instanciation.cc => accu-right-instantiation.cc} (100%) rename milena/doc/examples/{accu-wrong-instanciation.cc.raw => accu-wrong-instantiation.cc.raw} (100%) rename milena/doc/examples/split/{accu-right-instanciation-1.cc.raw => accu-right-instantiation-1.cc.raw} (100%) rename milena/doc/outputs/{accu-right-instanciation.txt => accu-right-instantiation.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 625a873..b853e0b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,29 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Typo in doc/. + + * doc/examples/accu-right-instanciation.cc: Rename as... + * doc/examples/accu-right-instantiation.cc: ...this. + * doc/examples/accu-wrong-instanciation.cc.raw, + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/outputs/accu-right-instanciation.txt: + Likewise, rename as... + * doc/examples/accu-wrong-instantiation.cc.raw, + * doc/examples/split/accu-right-instantiation-1.cc.raw, + * doc/outputs/accu-right-instantiation.txt: + ...these. + * doc/ref_guide/ref_guide.tex, + * doc/programs-examples.mk, + * doc/Makefile.am (MORE_EXAMPLES): + s/instanciation/instantiation/. + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk, + * doc/split-examples.mk: + Regen. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. * doc/Makefile.am (refman_dependencies): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9bd9512..b8999bf 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -234,7 +234,7 @@ EXTRA_DIST += $(TECHNICAL_EXAMPLES) # Non generated examples. MORE_EXAMPLES = \ - examples/accu-wrong-instanciation.cc.raw \ + examples/accu-wrong-instantiation.cc.raw \ examples/fill-proto.cc.raw \ examples/ima2d-restricted-1.cc.raw \ examples/ima2d-restricted-2.cc.raw \ diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index b4b7c43..51bba63 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -1,17 +1,17 @@ ## Generated by gen-examples-outputs-mk. Do not edit by hand. -$(srcdir)/examples/accu-right-instanciation.stamp: examples/accu-right-instanciation.cc +$(srcdir)/examples/accu-right-instantiation.stamp: examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp - $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT) - ./accu-right-instanciation$(EXEEXT) >$(srcdir)/outputs/accu-right-instanciation.txt.tmp - mv $(srcdir)/outputs/accu-right-instanciation.txt.tmp $(srcdir)/outputs/accu-right-instanciation.txt + $(MAKE) $(AM_MAKEFLAGS) accu-right-instantiation$(EXEEXT) + ./accu-right-instantiation$(EXEEXT) >$(srcdir)/outputs/accu-right-instantiation.txt.tmp + mv $(srcdir)/outputs/accu-right-instantiation.txt.tmp $(srcdir)/outputs/accu-right-instantiation.txt @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/accu-right-instanciation.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instanciation.stamp +EXTRA_DIST += $(srcdir)/examples/accu-right-instantiation.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instantiation.stamp -$(srcdir)/outputs/accu-right-instanciation.txt: $(srcdir)/examples/accu-right-instanciation.stamp +$(srcdir)/outputs/accu-right-instantiation.txt: $(srcdir)/examples/accu-right-instantiation.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index c30f111..c6542e4 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. EXAMPLES = \ - $(srcdir)/examples/accu-right-instanciation.cc \ + $(srcdir)/examples/accu-right-instantiation.cc \ $(srcdir)/examples/borderthickness.cc \ $(srcdir)/examples/box2d-bbox.cc \ $(srcdir)/examples/domain-display.cc \ diff --git a/milena/doc/examples/accu-right-instanciation.cc b/milena/doc/examples/accu-right-instantiation.cc similarity index 100% rename from milena/doc/examples/accu-right-instanciation.cc rename to milena/doc/examples/accu-right-instantiation.cc diff --git a/milena/doc/examples/accu-wrong-instanciation.cc.raw b/milena/doc/examples/accu-wrong-instantiation.cc.raw similarity index 100% rename from milena/doc/examples/accu-wrong-instanciation.cc.raw rename to milena/doc/examples/accu-wrong-instantiation.cc.raw diff --git a/milena/doc/examples/split/accu-right-instanciation-1.cc.raw b/milena/doc/examples/split/accu-right-instantiation-1.cc.raw similarity index 100% rename from milena/doc/examples/split/accu-right-instanciation-1.cc.raw rename to milena/doc/examples/split/accu-right-instantiation-1.cc.raw diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 5e60012..383f95a 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. OUTPUTS = \ - $(srcdir)/outputs/accu-right-instanciation.txt \ + $(srcdir)/outputs/accu-right-instantiation.txt \ $(srcdir)/outputs/borderthickness.txt \ $(srcdir)/outputs/box2d-bbox.txt \ $(srcdir)/outputs/domain-display.txt \ diff --git a/milena/doc/outputs/accu-right-instanciation.txt b/milena/doc/outputs/accu-right-instantiation.txt similarity index 100% rename from milena/doc/outputs/accu-right-instanciation.txt rename to milena/doc/outputs/accu-right-instantiation.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 4a38dd3..6a81b02 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -25,7 +25,7 @@ ## If generated, merge examples-outputs.mk and outputs.mk? PROGRAMS_examples = \ - accu-right-instanciation \ + accu-right-instantiation \ borderthickness \ box2d-bbox \ domain-display \ @@ -89,7 +89,7 @@ PROGRAMS_examples += \ # `milena/doc/Makefile.am', since `examples/' is a subdirectory of # `milena/doc/'. Anyway, this file is to be eventually inlined in # `milena/doc/Makefile.am', so this is not a big deal. -accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc +accu_right_instantiation_SOURCES = examples/accu-right-instantiation.cc borderthickness_SOURCES = examples/borderthickness.cc box2d_bbox_SOURCES = examples/box2d-bbox.cc domain_display_SOURCES = examples/domain-display.cc diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex index 29e6a7e..cdd5791 100644 --- a/milena/doc/ref_guide/ref_guide.tex +++ b/milena/doc/ref_guide/ref_guide.tex @@ -1492,9 +1492,9 @@ It exists two versions of each accumulator. \end{itemize} Note that when an accumulator is passed to \code{*::compute()}, it \must be instanciated.You cannot write: -\doxyrawcode{accu-wrong-instanciation} +\doxyrawcode{accu-wrong-instantiation} Instead, you \must write: -\doxycode{accu-right-instanciation} +\doxycode{accu-right-instantiation} \doxysubsection{exlblcompute}{Example with labeling::compute()} diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index ee61d74..37fd4e5 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -2,7 +2,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/ima-save-1.cc.raw \ - $(srcdir)/examples/split/accu-right-instanciation-1.cc.raw \ + $(srcdir)/examples/split/accu-right-instantiation-1.cc.raw \ $(srcdir)/examples/split/borderthickness-1.cc.raw \ $(srcdir)/examples/split/box2d-bbox-1.cc.raw \ $(srcdir)/examples/split/domain-display-1.cc.raw \ @@ -132,15 +132,15 @@ $(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc fi -$(srcdir)/examples/split/accu-right-instanciation.cc.stamp: $(srcdir)/examples/accu-right-instanciation.cc +$(srcdir)/examples/split/accu-right-instantiation.cc.stamp: $(srcdir)/examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp -$(srcdir)/examples/split/accu-right-instanciation-1.cc.raw: $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +$(srcdir)/examples/split/accu-right-instantiation-1.cc.raw: $(srcdir)/examples/split/accu-right-instantiation.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ -- 1.5.6.5

1 0

last-svn-commit-81-g05b1408 Typo in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/examples/accu-right-instanciation.cc: Rename as... * doc/examples/accu-right-instantiation.cc: ...this. * doc/examples/accu-wrong-instanciation.cc.raw, * doc/examples/split/accu-right-instanciation-1.cc.raw, * doc/outputs/accu-right-instanciation.txt: Likewise, rename as... * doc/examples/accu-wrong-instantiation.cc.raw, * doc/examples/split/accu-right-instantiation-1.cc.raw, * doc/outputs/accu-right-instantiation.txt: ...these. * doc/ref_guide/ref_guide.tex, * doc/programs-examples.mk, * doc/Makefile.am (MORE_EXAMPLES): s/instanciation/instantiation/. * doc/examples-outputs.mk, * doc/examples.mk, * doc/outputs.mk, * doc/split-examples.mk: Regen. --- milena/ChangeLog | 24 ++++++++++++++++++++ milena/doc/Makefile.am | 2 +- milena/doc/examples-outputs.mk | 14 +++++----- milena/doc/examples.mk | 2 +- ...nstanciation.cc => accu-right-instantiation.cc} | 0 ...tion.cc.raw => accu-wrong-instantiation.cc.raw} | 0 ...-1.cc.raw => accu-right-instantiation-1.cc.raw} | 0 milena/doc/outputs.mk | 2 +- ...tanciation.txt => accu-right-instantiation.txt} | 0 milena/doc/programs-examples.mk | 4 +- milena/doc/ref_guide/ref_guide.tex | 4 +- milena/doc/split-examples.mk | 10 ++++---- 12 files changed, 43 insertions(+), 19 deletions(-) rename milena/doc/examples/{accu-right-instanciation.cc => accu-right-instantiation.cc} (100%) rename milena/doc/examples/{accu-wrong-instanciation.cc.raw => accu-wrong-instantiation.cc.raw} (100%) rename milena/doc/examples/split/{accu-right-instanciation-1.cc.raw => accu-right-instantiation-1.cc.raw} (100%) rename milena/doc/outputs/{accu-right-instanciation.txt => accu-right-instantiation.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 41a6f7d..f1ebf33 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,29 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Typo in doc/. + + * doc/examples/accu-right-instanciation.cc: Rename as... + * doc/examples/accu-right-instantiation.cc: ...this. + * doc/examples/accu-wrong-instanciation.cc.raw, + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/outputs/accu-right-instanciation.txt: + Likewise, rename as... + * doc/examples/accu-wrong-instantiation.cc.raw, + * doc/examples/split/accu-right-instantiation-1.cc.raw, + * doc/outputs/accu-right-instantiation.txt: + ...these. + * doc/ref_guide/ref_guide.tex, + * doc/programs-examples.mk, + * doc/Makefile.am (MORE_EXAMPLES): + s/instanciation/instantiation/. + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk, + * doc/split-examples.mk: + Regen. + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. * doc/Makefile.am (refman_dependencies): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9bd9512..b8999bf 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -234,7 +234,7 @@ EXTRA_DIST += $(TECHNICAL_EXAMPLES) # Non generated examples. MORE_EXAMPLES = \ - examples/accu-wrong-instanciation.cc.raw \ + examples/accu-wrong-instantiation.cc.raw \ examples/fill-proto.cc.raw \ examples/ima2d-restricted-1.cc.raw \ examples/ima2d-restricted-2.cc.raw \ diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index b4b7c43..51bba63 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -1,17 +1,17 @@ ## Generated by gen-examples-outputs-mk. Do not edit by hand. -$(srcdir)/examples/accu-right-instanciation.stamp: examples/accu-right-instanciation.cc +$(srcdir)/examples/accu-right-instantiation.stamp: examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp - $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT) - ./accu-right-instanciation$(EXEEXT) >$(srcdir)/outputs/accu-right-instanciation.txt.tmp - mv $(srcdir)/outputs/accu-right-instanciation.txt.tmp $(srcdir)/outputs/accu-right-instanciation.txt + $(MAKE) $(AM_MAKEFLAGS) accu-right-instantiation$(EXEEXT) + ./accu-right-instantiation$(EXEEXT) >$(srcdir)/outputs/accu-right-instantiation.txt.tmp + mv $(srcdir)/outputs/accu-right-instantiation.txt.tmp $(srcdir)/outputs/accu-right-instantiation.txt @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/accu-right-instanciation.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instanciation.stamp +EXTRA_DIST += $(srcdir)/examples/accu-right-instantiation.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instantiation.stamp -$(srcdir)/outputs/accu-right-instanciation.txt: $(srcdir)/examples/accu-right-instanciation.stamp +$(srcdir)/outputs/accu-right-instantiation.txt: $(srcdir)/examples/accu-right-instantiation.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index c30f111..c6542e4 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. EXAMPLES = \ - $(srcdir)/examples/accu-right-instanciation.cc \ + $(srcdir)/examples/accu-right-instantiation.cc \ $(srcdir)/examples/borderthickness.cc \ $(srcdir)/examples/box2d-bbox.cc \ $(srcdir)/examples/domain-display.cc \ diff --git a/milena/doc/examples/accu-right-instanciation.cc b/milena/doc/examples/accu-right-instantiation.cc similarity index 100% rename from milena/doc/examples/accu-right-instanciation.cc rename to milena/doc/examples/accu-right-instantiation.cc diff --git a/milena/doc/examples/accu-wrong-instanciation.cc.raw b/milena/doc/examples/accu-wrong-instantiation.cc.raw similarity index 100% rename from milena/doc/examples/accu-wrong-instanciation.cc.raw rename to milena/doc/examples/accu-wrong-instantiation.cc.raw diff --git a/milena/doc/examples/split/accu-right-instanciation-1.cc.raw b/milena/doc/examples/split/accu-right-instantiation-1.cc.raw similarity index 100% rename from milena/doc/examples/split/accu-right-instanciation-1.cc.raw rename to milena/doc/examples/split/accu-right-instantiation-1.cc.raw diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 5e60012..383f95a 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. OUTPUTS = \ - $(srcdir)/outputs/accu-right-instanciation.txt \ + $(srcdir)/outputs/accu-right-instantiation.txt \ $(srcdir)/outputs/borderthickness.txt \ $(srcdir)/outputs/box2d-bbox.txt \ $(srcdir)/outputs/domain-display.txt \ diff --git a/milena/doc/outputs/accu-right-instanciation.txt b/milena/doc/outputs/accu-right-instantiation.txt similarity index 100% rename from milena/doc/outputs/accu-right-instanciation.txt rename to milena/doc/outputs/accu-right-instantiation.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 4a38dd3..6a81b02 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -25,7 +25,7 @@ ## If generated, merge examples-outputs.mk and outputs.mk? PROGRAMS_examples = \ - accu-right-instanciation \ + accu-right-instantiation \ borderthickness \ box2d-bbox \ domain-display \ @@ -89,7 +89,7 @@ PROGRAMS_examples += \ # `milena/doc/Makefile.am', since `examples/' is a subdirectory of # `milena/doc/'. Anyway, this file is to be eventually inlined in # `milena/doc/Makefile.am', so this is not a big deal. -accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc +accu_right_instantiation_SOURCES = examples/accu-right-instantiation.cc borderthickness_SOURCES = examples/borderthickness.cc box2d_bbox_SOURCES = examples/box2d-bbox.cc domain_display_SOURCES = examples/domain-display.cc diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex index 29e6a7e..cdd5791 100644 --- a/milena/doc/ref_guide/ref_guide.tex +++ b/milena/doc/ref_guide/ref_guide.tex @@ -1492,9 +1492,9 @@ It exists two versions of each accumulator. \end{itemize} Note that when an accumulator is passed to \code{*::compute()}, it \must be instanciated.You cannot write: -\doxyrawcode{accu-wrong-instanciation} +\doxyrawcode{accu-wrong-instantiation} Instead, you \must write: -\doxycode{accu-right-instanciation} +\doxycode{accu-right-instantiation} \doxysubsection{exlblcompute}{Example with labeling::compute()} diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index ee61d74..37fd4e5 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -2,7 +2,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/ima-save-1.cc.raw \ - $(srcdir)/examples/split/accu-right-instanciation-1.cc.raw \ + $(srcdir)/examples/split/accu-right-instantiation-1.cc.raw \ $(srcdir)/examples/split/borderthickness-1.cc.raw \ $(srcdir)/examples/split/box2d-bbox-1.cc.raw \ $(srcdir)/examples/split/domain-display-1.cc.raw \ @@ -132,15 +132,15 @@ $(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc fi -$(srcdir)/examples/split/accu-right-instanciation.cc.stamp: $(srcdir)/examples/accu-right-instanciation.cc +$(srcdir)/examples/split/accu-right-instantiation.cc.stamp: $(srcdir)/examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp -$(srcdir)/examples/split/accu-right-instanciation-1.cc.raw: $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +$(srcdir)/examples/split/accu-right-instantiation-1.cc.raw: $(srcdir)/examples/split/accu-right-instantiation.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ -- 1.5.6.5

1 0

last-svn-commit-55-g15b0083 Fix the regeneration of HTML outputs.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML_OUTPUTS)): Fix tests on targets. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bde2cc3..d06de1a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of HTML outputs. + + * doc/Makefile.am + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Fix tests on targets. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> Distribute and clean documentation timestamps. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 553a8dd..7f6c1c2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -340,7 +340,7 @@ $(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -443,7 +443,7 @@ $(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) $(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -559,7 +559,7 @@ $(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) $(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -646,7 +646,7 @@ $(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies $(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -- 1.5.6.5

1 0

last-svn-commit-48-g1202981 Fix the regeneration of HTML outputs.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am ($(TECHNICAL_HTML_OUTPUTS)) ($(TUTORIAL_HTML_OUTPUTS)) ($(WHITE_PAPER_HTML_OUTPUTS)) ($(REF_GUIDE_HTML_OUTPUTS)): Fix tests on targets. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Makefile.am | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b0e8778..058fc20 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of HTML outputs. + + * doc/Makefile.am + ($(TECHNICAL_HTML_OUTPUTS)) + ($(TUTORIAL_HTML_OUTPUTS)) + ($(WHITE_PAPER_HTML_OUTPUTS)) + ($(REF_GUIDE_HTML_OUTPUTS)): + Fix tests on targets. + 2010-03-15 Roland Levillain <roland(a)lrde.epita.fr> Distribute and clean documentation timestamps. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 553a8dd..7f6c1c2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -340,7 +340,7 @@ $(TECHNICAL_HTML).stamp: $(technical_dir)/technical.tex $(technical_dependencies $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -443,7 +443,7 @@ $(TUTORIAL_HTML).stamp: $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) $(TUTORIAL_HTML_OUTPUTS): $(TUTORIAL_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -559,7 +559,7 @@ $(WHITE_PAPER_HTML).stamp: $(white_paper_dir)/white_paper.tex $(EPSS) $(WHITE_PAPER_HTML_OUTPUTS): $(WHITE_PAPER_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi @@ -646,7 +646,7 @@ $(REF_GUIDE_HTML).stamp: $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies $(REF_GUIDE_HTML_OUTPUTS): $(REF_GUIDE_HTML).stamp ## Recover from the removal of $@ - @if test -d $@; then :; else \ + @if test -f $@; then :; else \ rm -f $<; \ $(MAKE) $(AM_MAKEFLAGS) $<; \ fi -- 1.5.6.5

1 0

last-svn-commit-87-g6c5106c Fix dependencies in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (refman_dependencies): Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). (technical_dependencies): Add $(TECHNICAL_EXAMPLES). (tutorial_dependencies, ref_guide_dependencies): Add $(EXAMPLES) and $(OUTPUTS). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8eef77a..625a873 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. * doc/Makefile.am (MORE_FIGURES): New variable. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 63f3ea8..9bd9512 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -267,13 +267,7 @@ regen-split-examples-mk: ## Doxygen documentation. ## ## ----------------------- ## -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. refman_dependencies = \ - $(SPLIT_EXAMPLES) \ - $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -454,10 +448,10 @@ technical: technical-html technical-pdf 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) $(DOC_PACKAGES) +technical_dependencies = \ + $(TECHNICAL_EXAMPLES) \ + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -557,12 +551,10 @@ tutorial: tutorial-html tutorial-pdf tutorial_dir = $(doc_dir)/tutorial -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. tutorial_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -755,12 +747,10 @@ ref-guide: ref-guide-html ref-guide-pdf ref_guide_dir = $(doc_dir)/ref_guide -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. ref_guide_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) -- 1.5.6.5

1 0

last-svn-commit-80-gb6d23f2 Fix dependencies in doc/.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (refman_dependencies): Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). (technical_dependencies): Add $(TECHNICAL_EXAMPLES). (tutorial_dependencies, ref_guide_dependencies): Add $(EXAMPLES) and $(OUTPUTS). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cafa0d4..41a6f7d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. * doc/Makefile.am (MORE_FIGURES): New variable. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 63f3ea8..9bd9512 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -267,13 +267,7 @@ regen-split-examples-mk: ## Doxygen documentation. ## ## ----------------------- ## -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. refman_dependencies = \ - $(SPLIT_EXAMPLES) \ - $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -454,10 +448,10 @@ technical: technical-html technical-pdf 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) $(DOC_PACKAGES) +technical_dependencies = \ + $(TECHNICAL_EXAMPLES) \ + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -557,12 +551,10 @@ tutorial: tutorial-html tutorial-pdf tutorial_dir = $(doc_dir)/tutorial -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. tutorial_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -755,12 +747,10 @@ ref-guide: ref-guide-html ref-guide-pdf ref_guide_dir = $(doc_dir)/ref_guide -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. ref_guide_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) -- 1.5.6.5

1 0

last-svn-commit-86-gfca5428 Distribute non generated figures in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (MORE_FIGURES): New variable. Add figures/accu_image_morpher_big_picture.pdf. (EXTRA_DIST): Add $(MORE_FIGURES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f561db9..8eef77a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. + + * doc/Makefile.am (MORE_FIGURES): New variable. + Add figures/accu_image_morpher_big_picture.pdf. + (EXTRA_DIST): Add $(MORE_FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8e1a4f0..63f3ea8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,6 +102,10 @@ include $(srcdir)/figures.mk # variables may be removed someday (see FIXME below). MAINTAINERCLEANFILES = $(FIGURES) +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + # ----- # # PBM. # # ----- # -- 1.5.6.5

1 0

last-svn-commit-79-g4c961ee Distribute non generated figures in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (MORE_FIGURES): New variable. Add figures/accu_image_morpher_big_picture.pdf. (EXTRA_DIST): Add $(MORE_FIGURES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 ++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c7e2924..cafa0d4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. + + * doc/Makefile.am (MORE_FIGURES): New variable. + Add figures/accu_image_morpher_big_picture.pdf. + (EXTRA_DIST): Add $(MORE_FIGURES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8e1a4f0..63f3ea8 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -102,6 +102,10 @@ include $(srcdir)/figures.mk # variables may be removed someday (see FIXME below). MAINTAINERCLEANFILES = $(FIGURES) +# This image seems to be used nowhere. +MORE_FIGURES = figures/accu_image_morpher_big_picture.pdf +EXTRA_DIST += $(MORE_FIGURES) + # ----- # # PBM. # # ----- # -- 1.5.6.5

1 0

last-svn-commit-85-g55f2622 Distribute non generated examples in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): New variables. (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 90dc6e6..f561db9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. + + * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): + New variables. + (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. * doc/figures.mk diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d71933..8e1a4f0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -221,6 +221,23 @@ regen-examples-mk: mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk chmod -w $(srcdir)/examples.mk +# Examples used in the technical documentation. +TECHNICAL_EXAMPLES = \ + examples/devel/dispatch.cc.raw \ + examples/devel/facade.cc.raw \ + examples/devel/impl.cc.raw +EXTRA_DIST += $(TECHNICAL_EXAMPLES) + +# Non generated examples. +MORE_EXAMPLES = \ + examples/accu-wrong-instanciation.cc.raw \ + examples/fill-proto.cc.raw \ + examples/ima2d-restricted-1.cc.raw \ + examples/ima2d-restricted-2.cc.raw \ + examples/ima2d-restricted-3.cc.raw \ + examples/tuto3/fill_non_generic.cc.raw +EXTRA_DIST += $(MORE_EXAMPLES) + ## ---------------- ## ## Split examples. ## ## ---------------- ## -- 1.5.6.5

1 0

last-svn-commit-78-gcc8f9ba Distribute non generated examples in the documentation.
by Roland Levillain 18 Mar '10

18 Mar '10

* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): New variables. (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dff8465..c7e2924 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated examples in the documentation. + + * doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES): + New variables. + (EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Have ``make maintainer-clean'' remove generated figures in doc/. * doc/figures.mk diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 5d71933..8e1a4f0 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -221,6 +221,23 @@ regen-examples-mk: mv -f $(srcdir)/examples.mk.tmp $(srcdir)/examples.mk chmod -w $(srcdir)/examples.mk +# Examples used in the technical documentation. +TECHNICAL_EXAMPLES = \ + examples/devel/dispatch.cc.raw \ + examples/devel/facade.cc.raw \ + examples/devel/impl.cc.raw +EXTRA_DIST += $(TECHNICAL_EXAMPLES) + +# Non generated examples. +MORE_EXAMPLES = \ + examples/accu-wrong-instanciation.cc.raw \ + examples/fill-proto.cc.raw \ + examples/ima2d-restricted-1.cc.raw \ + examples/ima2d-restricted-2.cc.raw \ + examples/ima2d-restricted-3.cc.raw \ + examples/tuto3/fill_non_generic.cc.raw +EXTRA_DIST += $(MORE_EXAMPLES) + ## ---------------- ## ## Split examples. ## ## ---------------- ## -- 1.5.6.5

1 0