March 2010 - Olena-patches

last-svn-commit-92-gd9609f2 Add options to boostrap.
by Roland Levillain 22 Mar '10

22 Mar '10

* bootstrap: Here. (usage): New function. Call it when invoked with option `-h, --help'. Regen files stored in the repository only if invoked with option `-r, --regen'. --- ChangeLog | 10 ++++ bootstrap | 160 +++++++++++++++++++++++++++++++++++-------------------------- 2 files changed, 102 insertions(+), 68 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bf4a84..7bd8ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Add options to boostrap. + + * bootstrap: Here. + (usage): New function. Call it when invoked with option + `-h, --help'. + Regen files stored in the repository only if invoked with option + `-r, --regen'. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Make a more portable use of mktemp. 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4e8c5d5..59d56c9 100755 --- a/bootstrap +++ b/bootstrap @@ -11,6 +11,22 @@ stderr () echo >&2 "$0: $@" } +usage () +{ + cat <<EOF +Usage: $0 [OPTION] + +Options: + -h, --help display this message + -r, --regen regenerate files stored in the repository + +Report bugs to <olena-bugs(a)lrde.epita.fr> +EOF +} + +# Regenerate files stored in the repository? +regen_p=false + awk_strverscmp=' # Use only awk features that work with 7th edition Unix awk (1978). # My, what an old awk you have, Mr. Solaris! @@ -114,6 +130,15 @@ run () # Failures do matter. set -e +# Process arguments. +for arg in "$@"; do + case "$arg" in + -h|--help) usage; exit 0 ;; + -r|--regen) regen_p=true ;; + *) fatal "error: unrecognized option: $1" ;; + esac +done + # Requirements over bootstrap tools. require autoconf 2.61 require automake 1.10 @@ -151,21 +176,7 @@ EOF # dvipng is required by TeX4ht. require dvipng 1.11 -# Generate milena/headers.mk -run milena `pwd`/build-aux/generate_dist_headers.sh mln ./headers.mk ./nodist-headers - -# Generate scribo/headers.mk -run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers scribo scribo -# Generate files of Milena's documentation. -# * Figures. -( - cd milena/doc - rm -f figures.mk.tmp - ./gen-figures-mk >figures.mk.tmp - mv -f figures.mk.tmp figures.mk - chmod -w figures.mk -) gen_doc_figures() { rm -f "milena/doc/$2-figures.mk.tmp" @@ -175,60 +186,73 @@ gen_doc_figures() mv -f "milena/doc/$2-figures.mk.tmp" "milena/doc/$2-figures.mk" chmod -w "milena/doc/$2-figures.mk" } -gen_doc_figures PBM_FIGURES pbm -gen_doc_figures PGM_FIGURES pgm -gen_doc_figures PPM_FIGURES ppm -# * Examples. -rm -f milena/doc/examples.mk.tmp -milena/doc/gen-make-variable EXAMPLES \ - `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ - >milena/doc/examples.mk.tmp -mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk -chmod -w milena/doc/examples.mk -# * Split examples. -( - cd milena/doc - rm -f split-examples.mk.tmp - ./gen-split-examples-mk >split-examples.mk.tmp - mv -f split-examples.mk.tmp split-examples.mk - chmod -w split-examples.mk -) -# * Outputs. -rm -f milena/doc/outputs.mk.tmp -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$,$(srcdir)/outputs/\1.txt,'` \ - >milena/doc/outputs.mk.tmp -mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk -chmod -w milena/doc/outputs.mk -# * Outputs rules and timestamps. -( - cd milena/doc - rm -f examples-outputs.mk.tmp - ./gen-examples-outputs-mk \ - `find examples -name \*.cc -a \! -path examples/trash/\* \ - | env LC_ALL=C sort` \ - >examples-outputs.mk.tmp - mv -f examples-outputs.mk.tmp examples-outputs.mk - chmod -w examples-outputs.mk -) -# * Split outputs. -( - cd milena/doc - rm -f split-outputs.mk.tmp - ./gen-split-outputs-mk >split-outputs.mk.tmp - mv -f split-outputs.mk.tmp split-outputs.mk - chmod -w split-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 - -# Generate unit test files for Scribo. -run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . + +# Regen files stored in the repository if asked so. +if $regen_p; then + # Generate files of Milena's documentation. + # * Figures. + ( + cd milena/doc + rm -f figures.mk.tmp + ./gen-figures-mk >figures.mk.tmp + mv -f figures.mk.tmp figures.mk + chmod -w figures.mk + ) + gen_doc_figures PBM_FIGURES pbm + gen_doc_figures PGM_FIGURES pgm + gen_doc_figures PPM_FIGURES ppm + # * Examples. + rm -f milena/doc/examples.mk.tmp + milena/doc/gen-make-variable EXAMPLES \ + `find milena/doc/examples -name '*.cc' | sed 's,^milena/doc,\$(srcdir),'` \ + >milena/doc/examples.mk.tmp + mv -f milena/doc/examples.mk.tmp milena/doc/examples.mk + chmod -w milena/doc/examples.mk + # * Split examples. + ( + cd milena/doc + rm -f split-examples.mk.tmp + ./gen-split-examples-mk >split-examples.mk.tmp + mv -f split-examples.mk.tmp split-examples.mk + chmod -w split-examples.mk + ) + # * Outputs. + rm -f milena/doc/outputs.mk.tmp + 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$,$(srcdir)/outputs/\1.txt,'` \ + >milena/doc/outputs.mk.tmp + mv -f milena/doc/outputs.mk.tmp milena/doc/outputs.mk + chmod -w milena/doc/outputs.mk + # * Outputs rules and timestamps. + ( + cd milena/doc + rm -f examples-outputs.mk.tmp + ./gen-examples-outputs-mk \ + `find examples -name \*.cc -a \! -path examples/trash/\* \ + | env LC_ALL=C sort` \ + >examples-outputs.mk.tmp + mv -f examples-outputs.mk.tmp examples-outputs.mk + chmod -w examples-outputs.mk + ) + # * Split outputs. + ( + cd milena/doc + rm -f split-outputs.mk.tmp + ./gen-split-outputs-mk >split-outputs.mk.tmp + mv -f split-outputs.mk.tmp split-outputs.mk + chmod -w split-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 + + # Generate unit test files for Scribo. + run scribo/tests/unit_test ./build_unit_test.sh `pwd`/scribo . +fi # Install the GNU Build System. autoreconf -f -v -i -- 1.5.6.5

1 0

last-svn-commit-98-ge5e506b Distribute doc/gen-split-outputs-mk.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. Aesthetic changes. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 628f569..55db7c1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/gen-split-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Make a more portable use of mktemp. * doc/gen-split-examples-mk, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8209278..b36ad89 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -217,6 +217,9 @@ MAINTAINERCLEANFILES += $(PNG_FIGURES) ## Examples. ## ## ---------- ## +# Generate a Makefile helper containing a variable assignment. +EXTRA_DIST += gen-make-variable + $(srcdir)/examples.mk: $(srcdir)/gen-make-variable rm -f $@.tmp $(srcdir)/gen-make-variable EXAMPLES \ @@ -259,6 +262,8 @@ EXTRA_DIST += $(MORE_EXAMPLES) ## Split examples. ## ## ---------------- ## +# Generate a Makefile helper handling the generation of split examples. +EXTRA_DIST += gen-split-examples-mk $(srcdir)/split-examples.mk: $(srcdir)/gen-split-examples-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-examples-mk >split-examples.mk.tmp @@ -912,6 +917,9 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/win-create-1-display.txt EXTRA_DIST += $(MORE_OUTPUTS) +# FIXME: Can't we implement this using `gen-make-variable'? +EXTRA_DIST += gen-examples-outputs-mk + $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp # Ignore sources in examples/trash/. @@ -939,6 +947,8 @@ regen-examples-outputs-mk: ## Split outputs. ## ## --------------- ## +# Generate a Makefile helper handling the generation of split outputs. +EXTRA_DIST += gen-split-outputs-mk $(srcdir)/split-outputs.mk: $(srcdir)/gen-split-outputs-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp @@ -1025,10 +1035,3 @@ EXTRA_DIST += \ tools/sample_utils.hh \ tools/split_sample.sh \ tools/todoxygen.sh - -# Generate a Makefile helper containing a variable assignment. -EXTRA_DIST += gen-make-variable -# FIXME: Can't we implement this using `gen-make-variable'? -EXTRA_DIST += gen-examples-outputs-mk -# Generate a Makefile handling the generation of split examples. -EXTRA_DIST += gen-split-examples-mk -- 1.5.6.5

1 0

last-svn-commit-91-ge54763c Distribute doc/gen-split-outputs-mk.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. Aesthetic changes. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 17 ++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9f25bf1..d4633d1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Distribute doc/gen-split-outputs-mk. + + * doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk. + Aesthetic changes. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Make a more portable use of mktemp. * doc/gen-split-examples-mk, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8209278..b36ad89 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -217,6 +217,9 @@ MAINTAINERCLEANFILES += $(PNG_FIGURES) ## Examples. ## ## ---------- ## +# Generate a Makefile helper containing a variable assignment. +EXTRA_DIST += gen-make-variable + $(srcdir)/examples.mk: $(srcdir)/gen-make-variable rm -f $@.tmp $(srcdir)/gen-make-variable EXAMPLES \ @@ -259,6 +262,8 @@ EXTRA_DIST += $(MORE_EXAMPLES) ## Split examples. ## ## ---------------- ## +# Generate a Makefile helper handling the generation of split examples. +EXTRA_DIST += gen-split-examples-mk $(srcdir)/split-examples.mk: $(srcdir)/gen-split-examples-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-examples-mk >split-examples.mk.tmp @@ -912,6 +917,9 @@ MORE_OUTPUTS = \ $(srcdir)/outputs/win-create-1-display.txt EXTRA_DIST += $(MORE_OUTPUTS) +# FIXME: Can't we implement this using `gen-make-variable'? +EXTRA_DIST += gen-examples-outputs-mk + $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp # Ignore sources in examples/trash/. @@ -939,6 +947,8 @@ regen-examples-outputs-mk: ## Split outputs. ## ## --------------- ## +# Generate a Makefile helper handling the generation of split outputs. +EXTRA_DIST += gen-split-outputs-mk $(srcdir)/split-outputs.mk: $(srcdir)/gen-split-outputs-mk rm -f $@.tmp cd $(srcdir) && ./gen-split-outputs-mk >split-outputs.mk.tmp @@ -1025,10 +1035,3 @@ EXTRA_DIST += \ tools/sample_utils.hh \ tools/split_sample.sh \ tools/todoxygen.sh - -# Generate a Makefile helper containing a variable assignment. -EXTRA_DIST += gen-make-variable -# FIXME: Can't we implement this using `gen-make-variable'? -EXTRA_DIST += gen-examples-outputs-mk -# Generate a Makefile handling the generation of split examples. -EXTRA_DIST += gen-split-examples-mk -- 1.5.6.5

1 0

last-svn-commit-97-gd637b99 bootstrap: Make a more portable use of mktemp.
by Roland Levillain 22 Mar '10

22 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index af6154e..26f854d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Make a more portable use of mktemp. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen milena/doc/figures.mk. 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4e519c3..4e8c5d5 100755 --- a/bootstrap +++ b/bootstrap @@ -133,7 +133,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` +tempdir=`mktemp -d /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -rf "$tempdir"; exit; } trap cleanup 0 1 2 3 6 15 -- 1.5.6.5

1 0

last-svn-commit-90-gef6cf9c bootstrap: Make a more portable use of mktemp.
by Roland Levillain 22 Mar '10

22 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 263a1c3..1bf4a84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Make a more portable use of mktemp. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen milena/doc/figures.mk. 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4e519c3..4e8c5d5 100755 --- a/bootstrap +++ b/bootstrap @@ -133,7 +133,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` +tempdir=`mktemp -d /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -rf "$tempdir"; exit; } trap cleanup 0 1 2 3 6 15 -- 1.5.6.5

1 0

last-svn-commit-96-g084fcc9 Make a more portable use of mktemp.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Here. --- milena/ChangeLog | 8 ++++++++ milena/doc/gen-split-examples-mk | 2 +- milena/doc/gen-split-outputs-mk | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3b75494..628f569 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Make a more portable use of mktemp. + + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Here. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Sort inputs of generators to make them deterministic w.r.t. outputs. * doc/gen-split-examples-mk, diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index cf18241..b505370 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -59,7 +59,7 @@ inputs() output_dir=examples/split # Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp` +tempfile=`mktemp /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -f "$tempfile"; exit; } trap cleanup 0 1 2 3 6 15 diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk index 9ab6f42..e7c130b 100755 --- a/milena/doc/gen-split-outputs-mk +++ b/milena/doc/gen-split-outputs-mk @@ -60,7 +60,7 @@ inputs() output_dir=outputs/split # Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp` +tempfile=`mktemp /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -f "$tempfile"; exit; } trap cleanup 0 1 2 3 6 15 -- 1.5.6.5

1 0

last-svn-commit-89-g8869ca1 Make a more portable use of mktemp.
by Roland Levillain 22 Mar '10

22 Mar '10

* doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Here. --- milena/ChangeLog | 8 ++++++++ milena/doc/gen-split-examples-mk | 2 +- milena/doc/gen-split-outputs-mk | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e0e2b19..9f25bf1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Make a more portable use of mktemp. + + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Here. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + Sort inputs of generators to make them deterministic w.r.t. outputs. * doc/gen-split-examples-mk, diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index cf18241..b505370 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -59,7 +59,7 @@ inputs() output_dir=examples/split # Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp` +tempfile=`mktemp /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -f "$tempfile"; exit; } trap cleanup 0 1 2 3 6 15 diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk index 9ab6f42..e7c130b 100755 --- a/milena/doc/gen-split-outputs-mk +++ b/milena/doc/gen-split-outputs-mk @@ -60,7 +60,7 @@ inputs() output_dir=outputs/split # Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp` +tempfile=`mktemp /tmp/temp.XXXXXX` # Set up automatic cleanup. cleanup() { rm -f "$tempfile"; exit; } trap cleanup 0 1 2 3 6 15 -- 1.5.6.5

1 0

last-svn-commit-95-g67c299f Sort inputs of generators to make them deterministic w.r.t. outputs.
by Roland Levillain 22 Mar '10

22 Mar '10

* 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 <roland(a)lrde.epita.fr> + 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 <roland(a)lrde.epita.fr> + 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

1 0

last-svn-commit-88-g78b36b9 Sort inputs of generators to make them deterministic w.r.t. outputs.
by Roland Levillain 22 Mar '10

22 Mar '10

* 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 07e3a51..e0e2b19 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + 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 <roland(a)lrde.epita.fr> + 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

1 0

last-svn-commit-94-g9196858 bootstrap: Regen milena/doc/figures.mk.
by Roland Levillain 22 Mar '10

22 Mar '10

--- ChangeLog | 4 ++++ bootstrap | 7 +++++++ 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5040bf..af6154e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Regen milena/doc/figures.mk. + +2010-03-22 Roland Levillain <roland(a)lrde.epita.fr> + * bootstrap: Various fixes. 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/bootstrap b/bootstrap index 4484b9d..4e519c3 100755 --- a/bootstrap +++ b/bootstrap @@ -159,6 +159,13 @@ run scribo `pwd`/build-aux/generate_dist_headers.sh . headers.mk nodist-headers # Generate files of Milena's documentation. # * Figures. +( + cd milena/doc + rm -f figures.mk.tmp + ./gen-figures-mk >figures.mk.tmp + mv -f figures.mk.tmp figures.mk + chmod -w figures.mk +) gen_doc_figures() { rm -f "milena/doc/$2-figures.mk.tmp" -- 1.5.6.5

1 0