[Olena-patches] last-svn-commit-95-g67c299f Sort inputs of generators to make them deterministic w.r.t. outputs.

* doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Here. * doc/split-examples.mk: Regen. --- milena/ChangeLog | 9 +++ milena/doc/gen-split-examples-mk | 9 +++- milena/doc/gen-split-outputs-mk | 9 +++- milena/doc/split-examples.mk | 102 +++++++++++++++++++------------------- 4 files changed, 76 insertions(+), 53 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3094f44..3b75494 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-03-22 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Sort inputs of generators to make them deterministic w.r.t. outputs. + + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Here. + * doc/split-examples.mk: Regen. + +2010-03-22 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Generate the list of figures in the documentation. * doc/Makefile.am ($(srcdir)/figures.mk): New rule. diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index a049c46..cf18241 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -22,6 +22,9 @@ me=`basename $0` +# Use the C locale to have a deterministic sort. +export LC_ALL=C + die () { echo >&2 "$me: $@" @@ -46,7 +49,11 @@ backslashify() # Get this list as argument? inputs() { - find examples -name \*.cc + # Remove the .cc extension before sorting file names. + find examples -name \*.cc \ + | sed 's/.cc$//' \ + | sort \ + | sed 's/$/.cc/' } output_dir=examples/split diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk index 22d0a71..9ab6f42 100755 --- a/milena/doc/gen-split-outputs-mk +++ b/milena/doc/gen-split-outputs-mk @@ -22,6 +22,9 @@ me=`basename $0` +# Use the C locale to have a deterministic sort. +export LC_ALL=C + die () { echo >&2 "$me: $@" @@ -46,8 +49,12 @@ backslashify() # Get this list as argument? inputs() { + # Remove the .cc extension before sorting file names. # FIXME: Or « find examples -name \*.cc -a \! -path examples/trash/\* » ? - find examples -name \*.cc + find examples -name \*.cc \ + | sed 's/.cc$//' \ + | sort \ + | sed 's/$/.cc/' } output_dir=outputs/split diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index 37fd4e5..f7141ba 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -1,7 +1,6 @@ ## Generated by gen-split-examples-mk. Do not edit by hand. SPLIT_EXAMPLES = \ - $(srcdir)/examples/split/ima-save-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 \ @@ -14,6 +13,9 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/extend-4.cc.raw \ $(srcdir)/examples/split/extend-5.cc.raw \ $(srcdir)/examples/split/extension-ignore-1.cc.raw \ + $(srcdir)/examples/split/fill-1.cc.raw \ + $(srcdir)/examples/split/fill-2.cc.raw \ + $(srcdir)/examples/split/fill-3.cc.raw \ $(srcdir)/examples/split/fill-call-1-1.cc.raw \ $(srcdir)/examples/split/fill-call-1-2.cc.raw \ $(srcdir)/examples/split/fill-call-1-3.cc.raw \ @@ -22,15 +24,12 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw \ $(srcdir)/examples/split/fill-part-image-1.cc.raw \ $(srcdir)/examples/split/fill-part-image-2.cc.raw \ - $(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw \ - $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw \ $(srcdir)/examples/split/fill-subdomain-1.cc.raw \ $(srcdir)/examples/split/fill-subdomain-2.cc.raw \ $(srcdir)/examples/split/fill-subdomain-3.cc.raw \ $(srcdir)/examples/split/fill-subdomain-4.cc.raw \ - $(srcdir)/examples/split/fill-1.cc.raw \ - $(srcdir)/examples/split/fill-2.cc.raw \ - $(srcdir)/examples/split/fill-3.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw \ + $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw \ $(srcdir)/examples/split/forall-piter-1.cc.raw \ $(srcdir)/examples/split/fun-p2v-1-1.cc.raw \ $(srcdir)/examples/split/graph-data-1.cc.raw \ @@ -45,6 +44,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/graph-iter-4.cc.raw \ $(srcdir)/examples/split/ima-has-1.cc.raw \ $(srcdir)/examples/split/ima-load-1.cc.raw \ + $(srcdir)/examples/split/ima-save-1.cc.raw \ $(srcdir)/examples/split/ima-size-1.cc.raw \ $(srcdir)/examples/split/ima2d-1-1.cc.raw \ $(srcdir)/examples/split/ima2d-2-1.cc.raw \ @@ -66,8 +66,8 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/mln_var-3.cc.raw \ $(srcdir)/examples/split/parray-append-1.cc.raw \ $(srcdir)/examples/split/parray-bbox-1.cc.raw \ - $(srcdir)/examples/split/paste-call-1-1.cc.raw \ $(srcdir)/examples/split/paste-1.cc.raw \ + $(srcdir)/examples/split/paste-call-1-1.cc.raw \ $(srcdir)/examples/split/point-1-1.cc.raw \ $(srcdir)/examples/split/predicate-1-1.cc.raw \ $(srcdir)/examples/split/tuto2_first_image-1.cc.raw \ @@ -116,22 +116,6 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/win-create-2-1.cc.raw -$(srcdir)/examples/split/ima-save.cc.stamp: $(srcdir)/examples/ima-save.cc - @rm -f $@.tmp - @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split - @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/ima-save.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-save.cc.stamp - -$(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc.stamp -## Recover from the removal of $@ - @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ - fi - - $(srcdir)/examples/split/accu-right-instantiation.cc.stamp: $(srcdir)/examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp @@ -260,15 +244,15 @@ $(srcdir)/examples/split/extension-ignore-1.cc.raw: $(srcdir)/examples/split/ext fi -$(srcdir)/examples/split/fill-call-1.cc.stamp: $(srcdir)/examples/fill-call-1.cc +$(srcdir)/examples/split/fill.cc.stamp: $(srcdir)/examples/fill.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/fill-call-1.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-call-1.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/fill.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill.cc.stamp -$(srcdir)/examples/split/fill-call-1-1.cc.raw $(srcdir)/examples/split/fill-call-1-2.cc.raw $(srcdir)/examples/split/fill-call-1-3.cc.raw: $(srcdir)/examples/split/fill-call-1.cc.stamp +$(srcdir)/examples/split/fill-1.cc.raw $(srcdir)/examples/split/fill-2.cc.raw $(srcdir)/examples/split/fill-3.cc.raw: $(srcdir)/examples/split/fill.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -276,15 +260,15 @@ $(srcdir)/examples/split/fill-call-1-1.cc.raw $(srcdir)/examples/split/fill-call fi -$(srcdir)/examples/split/fill-imageif-cfun.cc.stamp: $(srcdir)/examples/fill-imageif-cfun.cc +$(srcdir)/examples/split/fill-call-1.cc.stamp: $(srcdir)/examples/fill-call-1.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/fill-call-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-call-1.cc.stamp -$(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-2.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw: $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp +$(srcdir)/examples/split/fill-call-1-1.cc.raw $(srcdir)/examples/split/fill-call-1-2.cc.raw $(srcdir)/examples/split/fill-call-1-3.cc.raw: $(srcdir)/examples/split/fill-call-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -292,15 +276,15 @@ $(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw $(srcdir)/examples/split/fil fi -$(srcdir)/examples/split/fill-part-image.cc.stamp: $(srcdir)/examples/fill-part-image.cc +$(srcdir)/examples/split/fill-imageif-cfun.cc.stamp: $(srcdir)/examples/fill-imageif-cfun.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/fill-part-image.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-part-image.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp -$(srcdir)/examples/split/fill-part-image-1.cc.raw $(srcdir)/examples/split/fill-part-image-2.cc.raw: $(srcdir)/examples/split/fill-part-image.cc.stamp +$(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-2.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw: $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -308,15 +292,15 @@ $(srcdir)/examples/split/fill-part-image-1.cc.raw $(srcdir)/examples/split/fill- fi -$(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp: $(srcdir)/examples/fill-subdomain-shorter.cc +$(srcdir)/examples/split/fill-part-image.cc.stamp: $(srcdir)/examples/fill-part-image.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/fill-part-image.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-part-image.cc.stamp -$(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw: $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp +$(srcdir)/examples/split/fill-part-image-1.cc.raw $(srcdir)/examples/split/fill-part-image-2.cc.raw: $(srcdir)/examples/split/fill-part-image.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -340,15 +324,15 @@ $(srcdir)/examples/split/fill-subdomain-1.cc.raw $(srcdir)/examples/split/fill-s fi -$(srcdir)/examples/split/fill.cc.stamp: $(srcdir)/examples/fill.cc +$(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp: $(srcdir)/examples/fill-subdomain-shorter.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/fill.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp -$(srcdir)/examples/split/fill-1.cc.raw $(srcdir)/examples/split/fill-2.cc.raw $(srcdir)/examples/split/fill-3.cc.raw: $(srcdir)/examples/split/fill.cc.stamp +$(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw: $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -452,6 +436,22 @@ $(srcdir)/examples/split/ima-load-1.cc.raw: $(srcdir)/examples/split/ima-load.cc fi +$(srcdir)/examples/split/ima-save.cc.stamp: $(srcdir)/examples/ima-save.cc + @rm -f $@.tmp + @touch $@.tmp + $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + @mv -f $@.tmp $@ +EXTRA_DIST += $(srcdir)/examples/split/ima-save.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-save.cc.stamp + +$(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc.stamp +## Recover from the removal of $@ + @if test -f $@; then :; else \ + rm -f $<; \ + $(MAKE) $(AM_MAKEFLAGS) $<; \ + fi + + $(srcdir)/examples/split/ima-size.cc.stamp: $(srcdir)/examples/ima-size.cc @rm -f $@.tmp @touch $@.tmp @@ -676,15 +676,15 @@ $(srcdir)/examples/split/parray-bbox-1.cc.raw: $(srcdir)/examples/split/parray-b fi -$(srcdir)/examples/split/paste-call-1.cc.stamp: $(srcdir)/examples/paste-call-1.cc +$(srcdir)/examples/split/paste.cc.stamp: $(srcdir)/examples/paste.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/paste-call-1.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste-call-1.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/paste.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste.cc.stamp -$(srcdir)/examples/split/paste-call-1-1.cc.raw: $(srcdir)/examples/split/paste-call-1.cc.stamp +$(srcdir)/examples/split/paste-1.cc.raw: $(srcdir)/examples/split/paste.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ @@ -692,15 +692,15 @@ $(srcdir)/examples/split/paste-call-1-1.cc.raw: $(srcdir)/examples/split/paste-c fi -$(srcdir)/examples/split/paste.cc.stamp: $(srcdir)/examples/paste.cc +$(srcdir)/examples/split/paste-call-1.cc.stamp: $(srcdir)/examples/paste-call-1.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/paste.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/paste-call-1.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste-call-1.cc.stamp -$(srcdir)/examples/split/paste-1.cc.raw: $(srcdir)/examples/split/paste.cc.stamp +$(srcdir)/examples/split/paste-call-1-1.cc.raw: $(srcdir)/examples/split/paste-call-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ -- 1.5.6.5