Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena: olena-2.0-877-g7375666 Partly re-enable Milena's test value/interop.

by Roland Levillain

* tests/value/interop.cc: Here. Remove dead code. --- milena/ChangeLog | 7 +++ milena/tests/value/interop.cc | 100 ++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 47 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa0c433..22fd714 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2014-06-23 Roland Levillain <roland(a)lrde.epita.fr> + + Partly re-enable Milena's test value/interop. + + * tests/value/interop.cc: Here. + Remove dead code. + 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> Remove mentions to trash/ directories in Milena. diff --git a/milena/tests/value/interop.cc b/milena/tests/value/interop.cc index 672b231..5334bcb 100644 --- a/milena/tests/value/interop.cc +++ b/milena/tests/value/interop.cc @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -28,6 +29,8 @@ #include <mln/value/int_u16.hh> #include <mln/value/float01_8.hh> +// FIXME: Overhaul this test. + int main() { using namespace mln; @@ -45,63 +48,66 @@ int main() using value::int_s8; - // FIXME: Dead code? -// { -// // Operations on int_u<n> -// int_u8 i = 128; -// int_u16 j = 42; -// int_s8 k = 42; -// float01_8 x; - -// (j = j + i) = i + j; -// mln_assertion(j == (128 + 42)); - -// (k = j - i) = i - j; -// mln_assertion(k == (-42)); + { + // Operations on int_u<n> + int_u8 i = 128; + int_u16 j = 42; + int_s8 k = 42; + float01_8 x; -// j = 2; -// (j = j * i) = i * j; -// mln_assertion(j == (2 * 128)); + (j = j + i) = i + j; + mln_assertion(j == (128 + 42)); -// (x = (j / i) / ((j / i) + 0.1)) -// = (i / j) / ((i / j) + 0.1); + (k = j - i) = i - j; + mln_assertion(k == (-42)); -// // std::cout << i + i << std::endl; -// // float01_8 f = i / 200.5; -// // std::cout << x << std::endl; -// } + j = 2; + (j = j * i) = i * j; + mln_assertion(j == (2 * 128)); -// { -// // Operations on int_u<n> and int / float -// int_u16 j = 42; -// int_s8 k = 42; -// float x; + (x = (j / i) / ((j / i) + 0.1)) + = (i / j) / ((i / j) + 0.1); -// // int -// (k = j - 123) = 123 - j; -// (j = j + 123) = 123 + j; -// (j = j * 4) = 4 * j; + } -// (j = j / 4) = 4 / j; + { + // Operations on int_u<n> and int / float + int_u16 j = 42; + int_s8 k = 42; + float x; -// // float -// x = (j / 4.5 * 3.4 + 3.5 - 5.6) / 0.0234; -// } + // int + (k = j - 123) = 123 - j; + (j = j + 123) = 123 + j; + (j = j * 4) = 4 * j; + (j = j / 4) = 4 / j; -// { -// // Operations on int_u<n> and float01_8 -// int_u16 j = 42; -// float01_8 x = 0.456; + // float + x = (j / 4.5 * 3.4 + 3.5 - 5.6) / 0.0234; -// x = x / j; -// mln_assertion(x < 0 && x < 1); + // Prevent ``unused variable'' warnings from the compiler. + (void) x; + } -// x = x * j; -// mln_assertion(x < 0 && x < 1); -// x = x * j; -// mln_assertion(x < 0 && x < 1); -// } + { +#if 0 + // Operations on int_u<n> and float01_8 + int_u16 j = 42; + float01_8 x = 0.456; + + /* FIXME: Does not work: the results of these operation are + outsided the range [0, 1]. */ + x = x / j; + mln_assertion(x < 0 && x < 1); + + x = x * j; + mln_assertion(x < 0 && x < 1); + + x = x * j; + mln_assertion(x < 0 && x < 1); +#endif + } } -- 1.7.10.4

10 years, 6 months

olena: olena-2.0-876-g26ad0e3 Typo in scribo/ChangeLog.

by Roland Levillain

--- scribo/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 014dbee..f21db64 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -442,7 +442,7 @@ 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> - * doc/Doxyflile.in: Fix include paths in documentation. + * doc/Doxyfile.in: Fix include paths in documentation. 2013-04-17 Guillaume Lazzara <z(a)lrde.epita.fr> -- 1.7.10.4

10 years, 6 months

olena: branch next updated: olena-2.0-875-g112dabb

by git＠lrde.epita.fr

10 years, 6 months

olena: olena-2.0-875-g112dabb Remove useless parts from the Scribo documentation machinery.

by Roland Levillain

* doc/doxyfuns.sty, * doc/examples-outputs.mk, * doc/examples.mk, * doc/examples/dummy.cc, * doc/figures.mk, * doc/gen-examples-outputs-mk, * doc/gen-figures-mk, * doc/gen-make-variable, * doc/gen-split-examples-mk, * doc/gen-split-outputs-mk, * doc/graphicx.hva, * doc/outputs.mk, * doc/outputs/dummy.txt, * doc/programs-examples.mk, * doc/scribo.sty, * doc/split-examples.mk, * doc/split-outputs.mk, * doc/tools/todoxygen.sh, * doc/tutorial.tex: Remove. * doc/Makefile.am: Adjust and remove useless bits. --- scribo/ChangeLog | 26 ++++ scribo/doc/.gitignore | 6 - scribo/doc/Makefile.am | 21 +--- scribo/doc/doxyfuns.sty | 234 ------------------------------------ scribo/doc/examples.mk | 4 - scribo/doc/gen-examples-outputs-mk | 71 ----------- scribo/doc/gen-figures-mk | 192 ----------------------------- scribo/doc/gen-make-variable | 52 -------- scribo/doc/gen-split-examples-mk | 136 --------------------- scribo/doc/gen-split-outputs-mk | 139 --------------------- scribo/doc/graphicx.hva | 19 --- scribo/doc/outputs.mk | 4 - scribo/doc/scribo.sty | 155 ------------------------ scribo/doc/tools/todoxygen.sh | 51 -------- 14 files changed, 28 insertions(+), 1082 deletions(-) delete mode 100644 scribo/doc/doxyfuns.sty delete mode 100644 scribo/doc/examples-outputs.mk delete mode 100644 scribo/doc/examples.mk delete mode 100644 scribo/doc/examples/dummy.cc delete mode 100644 scribo/doc/figures.mk delete mode 100755 scribo/doc/gen-examples-outputs-mk delete mode 100755 scribo/doc/gen-figures-mk delete mode 100755 scribo/doc/gen-make-variable delete mode 100755 scribo/doc/gen-split-examples-mk delete mode 100755 scribo/doc/gen-split-outputs-mk delete mode 100644 scribo/doc/graphicx.hva delete mode 100644 scribo/doc/outputs.mk delete mode 100644 scribo/doc/outputs/dummy.txt delete mode 100644 scribo/doc/programs-examples.mk delete mode 100644 scribo/doc/scribo.sty delete mode 100644 scribo/doc/split-examples.mk delete mode 100644 scribo/doc/split-outputs.mk delete mode 100755 scribo/doc/tools/todoxygen.sh delete mode 100644 scribo/doc/tutorial.tex diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 020df73..014dbee 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,31 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless parts from the Scribo documentation machinery. + + * doc/doxyfuns.sty, + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/examples/dummy.cc, + * doc/figures.mk, + * doc/gen-examples-outputs-mk, + * doc/gen-figures-mk, + * doc/gen-make-variable, + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk, + * doc/graphicx.hva, + * doc/outputs.mk, + * doc/outputs/dummy.txt, + * doc/programs-examples.mk, + * doc/scribo.sty, + * doc/split-examples.mk, + * doc/split-outputs.mk, + * doc/tools/todoxygen.sh, + * doc/tutorial.tex: + Remove. + * doc/Makefile.am: Adjust and remove useless bits. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to trash/ directories in Scribo. * doc/gen-figures-mk, diff --git a/scribo/doc/.gitignore b/scribo/doc/.gitignore index c858430..f3ffa9c 100644 --- a/scribo/doc/.gitignore +++ b/scribo/doc/.gitignore @@ -5,9 +5,3 @@ /Doxyfile_devel /devel-refman /devel-refman.pdf - -/figures/*.png - -/tutorial.hh -/tutorial.pdf -/tutorial/ diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index ea60133..16a5b6c 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011, 2013 EPITA Research and Development Laboratory +# Copyright (C) 2011, 2013, 2014 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -23,20 +23,6 @@ DOXYFILE = Doxyfile DATA_html_dirs = -## --------------------- ## -## LaTeX configuration. ## -## --------------------- ## - -include $(top_srcdir)/build-aux/tex.mk - -TEXI2DVI_FLAGS += \ - -I $(srcdir) -I $(srcdir)/outputs -I $(srcdir)/outputs/split \ - -I $(srcdir)/img -I $(srcdir)/examples/split - -# Additional files for LaTeX compilations. -DOC_PACKAGES = doxyfuns.sty scribo.sty - - # ----------------------- # # User Reference Manual. # # ----------------------- # @@ -200,10 +186,7 @@ $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp EXTRA_DIST += \ $(DATA_html_dirs) \ - $(DOXYFILE).in \ - doxyfuns.sty \ - scribo.sty \ - tools/todoxygen.sh + $(DOXYFILE).in ## ---------- ## diff --git a/scribo/doc/doxyfuns.sty b/scribo/doc/doxyfuns.sty deleted file mode 100644 index cd8d8bf..0000000 --- a/scribo/doc/doxyfuns.sty +++ /dev/null @@ -1,234 +0,0 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -%% -%% This file is part of Olena. -%% -%% Olena is free software: you can redistribute it and/or modify it under -%% the terms of the GNU General Public License as published by the Free -%% Software Foundation, version 2 of the License. -%% -%% Olena is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%% General Public License for more details. -%% -%% You should have received a copy of the GNU General Public License -%% along with Olena. If not, see <http://www.gnu.org/licenses/>. - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Set of commands to handle Doxygen and latex output. % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - -% #1 - sub page ref name (one word in lower case). -% #2 - sub page title. -\newcommand{\doxychapter}[2]{% -\label{#1} -\backslash endhtmlonly% -*/ -/*! -\backslash page #1 #2% -\backslash htmlonly % -} - -% #1 - section ref name (one word in lower case). -% #2 - section title. -\newcommand{\doxysection}[2]{% -\vspace{1cm} -\label{#1} -\backslash endhtmlonly% -\backslash section #1 #2% -\backslash htmlonly % -} - -% #1 - subsection name (one word in lower case). -% #2 - subsection title. -\newcommand{\doxysubsection}[2]{% -\label{#1} -\backslash endhtmlonly% -\backslash subsection #1 #2% -\backslash htmlonly % -} - -% #1 - subsubsection name (one word in lower case). -% #2 - subsubsection title. -\newcommand{\doxysubsubsection}[2]{% -\label{#1} -\backslash endhtmlonly% -\backslash subsubsection #1 #2% -\backslash htmlonly % -} - -% #1 - part number (Optional). -% #2 - sample file name. -\newcommand{\doxycode}[2][1]{ -\backslash endhtmlonly% -\backslash include #2-#1.cc.raw% -\backslash htmlonly % -} - -% #1 - sample file name. -\newcommand{\doxyrawcode}[1]{ -\backslash endhtmlonly% -\backslash include #1.cc.raw% -\backslash htmlonly % -} - -% #1 - output file name. -\newcommand{\doxyoutput}[1]{ -\backslash endhtmlonly% -\backslash include #1.txt% -\backslash htmlonly % -} - -% Include file '#1' from a split output. -% #1 - part number (Optional). -% #2 - sample file name. -\newcommand{\doxymoutput}[2][1]{ -\backslash endhtmlonly% -\backslash include #2-#1.txt% -\backslash htmlonly % -} - -% Include an output image. -% #1 - output image number. -% #2 - related sample file name. -% #3 - Size of the picture (Latex ONLY) -\newcommand{\doxyfigure}[3][1]{ -\backslash endhtmlonly% -\backslash image html #2-#1.png% -\backslash htmlonly % -} - -% Include an image from located in one of the path specified in IMAGE_PATH. -% #1 - image name. -% #2 - Size of the picture (Latex ONLY) -\newcommand{\doxyimg}[2]{ -\backslash endhtmlonly% -\backslash image html #1.png% -\backslash htmlonly % -} - -% Refer to a chapter, section... -% #1 - the reference name. -\newcommand{\doxyref}[1]{ -\backslash endhtmlonly% -\backslash ref #1% -\backslash htmlonly % -} - -% Refers to classes, functions, methods, variables files or URL. -% #1 - the reference name. -\newcommand{\doxysee}[1]{ -\backslash endhtmlonly% -\backslash see #1% -\backslash htmlonly % -} - -\newcommand{\tutotoc}[2]{% -\begin{center}% - \longleftarrow ~Go to \doxyref{#1} \hspace{1cm} | \hspace{1cm} Go to \doxyref{#2}~ \longrightarrow% -\end{center}% -} - -\newcommand{\tutotocnext}[1]{% -\begin{center}% - Go to \doxyref{#1}~ \longrightarrow% -\end{center}% -} - -\newcommand{\tutotocprev}[1]{% -\begin{center}% - \longleftarrow ~Go to \doxyref{#1} \hspace{1cm}% -\end{center}% -} - -\newenvironment{doxymath} -{ -%\backslash endhtmlonly% -%\backslash f\$ -%\begin{rawtext} -$$ -} -{ -$$ -%\end{rawtext} -%\backslash f\$ -%\backslash htmlonly% -} - - -% -% renew the previous command for latex only documents. -% - -%\begin{latexonly} -\renewcommand{\doxychapter}[2]{\chapter{#2}\label{#1}} -\renewcommand{\doxysection}[2]{\section{#2}\label{#1}} -\renewcommand{\doxysubsection}[2]{\subsection{#2}\label{#1}} -\renewcommand{\doxysubsubsection}[2]{\subsubsection{#2}\label{#1}} -\renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{examples/split/#2-#1.cc.raw}} -\renewcommand{\doxyrawcode}[1]{\lstinputlisting[frame=single]{examples/#1.cc.raw}} -\renewcommand{\doxyoutput}[1]{\lstinputlisting[frame=single]{outputs/#1.txt}} -\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/split/#2-#1.txt}} -\renewcommand{\doxyfigure}[3][1]{% -\pgfimage[width=#3]{figures/#2-#1}% -\label{#1}% -} -\renewcommand{\doxyimg}[2]{% -\pgfimage[width=#2]{#1}% -\label{#1}% -} -\renewcommand{\doxyref}[1]{\ref{#1}} -\renewcommand{\doxysee}[1]{\ref{#1}} -\renewcommand{\tutotoc}[2]{} -\renewcommand{\tutotocnext}[1]{} -\renewcommand{\tutotocprev}[1]{} -\renewenvironment{doxymath} -{ - $$ -} -{ - $$ -} - -%\end{latexonly} - - -\newcommand{\code}[1]{% -\textit{#1}% -} -\newcommand{\var}[1]{% -\textit{$#1$}% -} -\newcommand{\val}[1]{% -\textit{#1}% -} -\newcommand{\type}[1]{% -\textit{#1}% -} -\newcommand{\namespace}[1]{% -\textit{#1}% -} -\newcommand{\header}[1]{% -\textit{#1}% -} -\newcommand{\hpath}[1]{% -\textit{#1}% -} - -\newcommand{\must}{% -\textbf{must} -} -\newcommand{\should}{% -\textbf{should} -} - -\newcommand{\dir}[1]{ -\textbf{\textit{#1}} -} - -\newcommand{\B}[1]{ -\textbf{#1} -} - diff --git a/scribo/doc/examples-outputs.mk b/scribo/doc/examples-outputs.mk deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/examples.mk b/scribo/doc/examples.mk deleted file mode 100644 index c7181cc..0000000 --- a/scribo/doc/examples.mk +++ /dev/null @@ -1,4 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -EXAMPLES = \ - $(srcdir)/examples/dummy.cc diff --git a/scribo/doc/examples/dummy.cc b/scribo/doc/examples/dummy.cc deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/figures.mk b/scribo/doc/figures.mk deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/gen-examples-outputs-mk b/scribo/doc/gen-examples-outputs-mk deleted file mode 100755 index 440d960..0000000 --- a/scribo/doc/gen-examples-outputs-mk +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -me=`basename $0` - -test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; } - -cat<<EOF -## Generated by $me. Do not edit by hand. -EOF - -for source; do - base=`basename "$source" .cc` - source_dir=`dirname "$source"` - timestamp="\$(srcdir)/$source_dir/$base.stamp" - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$source" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - program="$canonical_name\$(EXEEXT)" - output="\$(srcdir)/outputs/$canonical_name.txt" - - # Programs generate a textual output, and possibly one or several - # images (as a ``side effect''). Use a timestamp to keep track of - # these multiple outputs. - # - # Also, have outputs depend on sources rather than programs, and - # recompile the latter to regen the former only when needed. This - # way, we can ship generated outputs without forcing the user of the - # distribution to recompile the programs. - cat<<EOF - - -$timestamp: $source - @rm -f \$@.tmp - @touch \$@.tmp - \$(MAKE) \$(AM_MAKEFLAGS) $program - ./$program >$output.tmp - mv $output.tmp $output - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$output: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF -done diff --git a/scribo/doc/gen-figures-mk b/scribo/doc/gen-figures-mk deleted file mode 100755 index 80a55a5..0000000 --- a/scribo/doc/gen-figures-mk +++ /dev/null @@ -1,192 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -# get_outputs FILE -# ---------------- -get_outputs() -{ - local outputs= - local i=1 - # Use Perl instead of sed for portability reasons. - for output in `perl -ne \ - "print if s|^\\s*doc::(p.m)save\\s*\$[^;]+,\\s*\"([^\"]+)\"\$;\$|\\2.\\1|" \ - "$1"` - do - # Add a number to the file name. - # FIXME: Maybe we should let the Perl script above do this... - num_output=`echo $output | sed "s,\$.p.m\$,-$i\\1,"` - if test -z "$outputs"; then - outputs="$num_output" - else - outputs="$outputs $num_output" - fi - i=`expr $i + 1` - done - echo "$outputs" -} - -# upcase STRING -# ------------- -upcase() -{ - # Use enumerated sets to be portable. - echo "$1" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} - -# canonicalize STRING -# ------------------- -canonicalize() -{ - echo "$1" | tr .- _ -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# List of generated figures. -fig_vars= - -# gen_var VARIABLE [ITEMS...] -# --------------------------- -# Generate a Make variable named VARIABLE containing ITEMS. -gen_var() -{ - local v - { - echo "$1 =" - shift - for v; do - echo " $v" - done - } | backslashify -} - -# List of paths to PBM figures. -pbm_fig_paths= -# List of paths to PGM figures. -pgg_fig_paths= -# List of paths to PPM figures. -ppm_fig_paths= - -cat<<EOF -## Generated by $me. Do not edit by hand. - -## Figures depend on the timestamp associated with their generator. -## See also examples-outputs.mk. - -EOF - -for file in `inputs`; do - # FIXME: Ugly hack to handle the case of examples/ima-save.cc, since - # this program does not use a `doc::p?msave' routine... - if test "X$file" = "Xexamples/ima-save.cc"; then - # Hard-coded value. - figures="ima_save.pbm" - else - figures=`get_outputs "$file"` - fi - - if test -n "$figures"; then - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - canonical_var=`canonicalize "$canonical_name"` - fig_var="`upcase "$canonical_var"`_FIGURES" - - # Populate the list of variables of figures. - fig_vars="$fig_vars \$($fig_var)" - - # Populate the list of paths to figures of a given format. - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - case "$figure" in - *.pbm) pbm_fig_paths="$pbm_fig_paths $fig_path";; - *.pgm) pgm_fig_paths="$pgm_fig_paths $fig_path";; - *.ppm) ppm_fig_paths="$ppm_fig_paths $fig_path";; - esac - done - - # Generate a Make variable for the figures produced by FILE. - { - echo "$fig_var =" - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - echo "$fig_path" - done - } | backslashify - - # Generate a Make rule to regen the figures produced by FILE. - base=`basename "$file" .cc` - dir=`dirname "$file"` - timestamp="\$(srcdir)/$dir/$base.stamp" - cat <<EOF -\$($fig_var): $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi - -EOF - fi -done - - -# More Make variables. -echo "# The list of all generated figures." -gen_var FIGURES $fig_vars -echo -echo "# The list of all generated PBM figures." -gen_var PBM_FIGURES $pbm_fig_paths -echo -echo "# The list of all generated PGM figures." -gen_var PGM_FIGURES $pgm_fig_paths -echo -echo "# The list of all generated PPM figures." -gen_var PPM_FIGURES $ppm_fig_paths diff --git a/scribo/doc/gen-make-variable b/scribo/doc/gen-make-variable deleted file mode 100755 index 91403ae..0000000 --- a/scribo/doc/gen-make-variable +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -test $# -gt 1 || { echo "usage: $me VARIABLE FILES..."; exit 1; } - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -cat<<EOF -## Generated by $me. Do not edit by hand. - -EOF -{ - echo "$1 =" - shift - for var; do - echo "$var" - shift - done | sort | sed 's/$.*$/ \1/' -} | backslashify diff --git a/scribo/doc/gen-split-examples-mk b/scribo/doc/gen-split-examples-mk deleted file mode 100755 index b505370..0000000 --- a/scribo/doc/gen-split-examples-mk +++ /dev/null @@ -1,136 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=examples/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_EXAMPLES =" - inputs | while read file; do - # Count the number of opening and closing marks. - nopening=`grep -c '// *\\\{' "$file"` - nclosing=`grep -c '// *\\\}' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Timestamp split examples (outputs) depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: \$(srcdir)/$file - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/scribo/doc/gen-split-outputs-mk b/scribo/doc/gen-split-outputs-mk deleted file mode 100755 index a2313be..0000000 --- a/scribo/doc/gen-split-outputs-mk +++ /dev/null @@ -1,139 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=outputs/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_OUTPUTS =" - inputs | while read file; do - - # Count the number of opening and closing marks. - nopening=`grep -c 'doc::begin_output' "$file"` - nclosing=`grep -c 'doc::end_output' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Output file to be split. - output="\$(srcdir)/outputs/$canonical_name.txt" - # Timestamp split outputs depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.txt.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.txt" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: $output - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/scribo/doc/graphicx.hva b/scribo/doc/graphicx.hva deleted file mode 100644 index ce81120..0000000 --- a/scribo/doc/graphicx.hva +++ /dev/null @@ -1,19 +0,0 @@ - % -*- LaTeX -*- - -% Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -% -% This file is part of Olena. -% -% Olena is free software: you can redistribute it and/or modify it under -% the terms of the GNU General Public License as published by the Free -% Software Foundation, version 2 of the License. -% -% Olena is distributed in the hope that it will be useful, -% but WITHOUT ANY WARRANTY; without even the implied warranty of -% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -% General Public License for more details. -% -% You should have received a copy of the GNU General Public License -% along with Olena. If not, see <http://www.gnu.org/licenses/>. - -\newcommand{\includegraphics}[2][]{\imgsrc{#2.png}} diff --git a/scribo/doc/outputs.mk b/scribo/doc/outputs.mk deleted file mode 100644 index 09a1efd..0000000 --- a/scribo/doc/outputs.mk +++ /dev/null @@ -1,4 +0,0 @@ -## Generated by gen-make-variable. Do not edit by hand. - -OUTPUTS = \ - $(srcdir)/outputs/dummy.txt diff --git a/scribo/doc/outputs/dummy.txt b/scribo/doc/outputs/dummy.txt deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/programs-examples.mk b/scribo/doc/programs-examples.mk deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/scribo.sty b/scribo/doc/scribo.sty deleted file mode 100644 index f4df262..0000000 --- a/scribo/doc/scribo.sty +++ /dev/null @@ -1,155 +0,0 @@ -%% Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE) -%% -%% This file is part of Olena. -%% -%% Olena is free software: you can redistribute it and/or modify it under -%% the terms of the GNU General Public License as published by the Free -%% Software Foundation, version 2 of the License. -%% -%% Olena is distributed in the hope that it will be useful, -%% but WITHOUT ANY WARRANTY; without even the implied warranty of -%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -%% General Public License for more details. -%% -%% You should have received a copy of the GNU General Public License -%% along with Olena. If not, see <http://www.gnu.org/licenses/>. - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Common set of commands related to Milena. % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - - - -% -%------------------------------------------ -% Doxygen color theme for listings. -%------------------------------------------ -% -\usepackage{listings} - -%%%LISTINGS SETTINGS -%\begin{latexonly} -\definecolor{ccomment}{rgb}{0.5,0,0} -\definecolor{cstring}{rgb}{0,0.32,0.5} -\definecolor{cidentifier}{rgb}{0,0.5,0} -\definecolor{cbg}{rgb}{0.95,0.95,0.95} - -\lstset{frameround=fttt} -\lstloadlanguages{[ISO]C++} -\lstset{language=[ISO]C++, - captionpos=b, - basicstyle={\small\sffamily}, % normal small footnotesize scriptsize tiny - commentstyle=\itshape, - showstringspaces=false, - numberstyle=\tiny, - morekeywords={where, auto, concept, concept_map, axiom, late_check, final, abstract}, - morecomment=[s]{/*}{*/}, - backgroundcolor=\color{cbg}, - identifierstyle=\color{black}, - stringstyle=\color{cstring} -} -%\end{latexonly} - - - -% -%------------------------------------------ -% Set of Tikz drawings. -%------------------------------------------ -% - -\usepackage{tikz} - -\usetikzlibrary{er} - -\newcommand{\neighcfour}{% -\begin{latexonly} -\begin{tikzpicture}% - \tikzstyle{every entity}=[draw=blue!50,fill=blue!20,thick]% - %center - \draw (0,0) node[fill=orange!20,draw=orange] {} ; - %left - \draw (-0.25,0) node[entity,draw] {}; - %right - \draw (0.26,0) node[entity,draw] {};% - %top - \draw (0,0.25) node[entity,draw] {};% - %bottom - \draw (0,-0.25) node[entity,draw] {};% -\end{tikzpicture}% -\end{latexonly} -} - -\newcommand{\neighceight}{% -\begin{latexonly} -\begin{tikzpicture}% - \tikzstyle{every entity}=[draw=blue!50,fill=blue!20,thick]% - %center - \draw (0,0) node[fill=orange!20,draw=orange] {} ; - %left - \draw (-0.25,0) node[entity,draw] {}; - %right - \draw (0.26,0) node[entity,draw] {};% - %top - \draw (0,0.25) node[entity,draw] {};% - %bottom - \draw (0,-0.25) node[entity,draw] {};% - %Top left - \draw (-0.25,0.25) node[entity,draw] {}; - %Top right - \draw (0.26,0.25) node[entity,draw] {};% - %Bottom left - \draw (-0.25,-0.25) node[entity,draw] {};% - %Bottom Right - \draw (0.26,-0.25) node[entity,draw] {};% -\end{tikzpicture}% -\end{latexonly} -} - -\newcommand{\wincfour}{% -\begin{latexonly} -\begin{tikzpicture}% - \tikzstyle{every entity}=[draw=blue!50,fill=blue!20,thick]% - %center - \draw (0,0) node[entity,draw] {} ; - %left - \draw (-0.25,0) node[entity,draw] {}; - %right - \draw (0.26,0) node[entity,draw] {};% - %top - \draw (0,0.25) node[entity,draw] {};% - %bottom - \draw (0,-0.25) node[entity,draw] {};% - -\end{tikzpicture}% -\end{latexonly} -} - -\newcommand{\winceight}{% -\begin{latexonly} -\begin{tikzpicture}% - \tikzstyle{every entity}=[draw=blue!50,fill=blue!20,thick]% - %center - \draw (0,0) node[entity,draw] {} ; - %left - \draw (-0.25,0) node[entity,draw] {}; - %right - \draw (0.26,0) node[entity,draw] {};% - %top - \draw (0,0.25) node[entity,draw] {};% - %bottom - \draw (0,-0.25) node[entity,draw] {};% - %Top left - \draw (-0.25,0.25) node[entity,draw] {}; - %Top right - \draw (0.26,0.25) node[entity,draw] {};% - %Bottom left - \draw (-0.25,-0.25) node[entity,draw] {};% - %Bottom Right - \draw (0.26,-0.25) node[entity,draw] {};% -\end{tikzpicture}% -\end{latexonly} -} - diff --git a/scribo/doc/split-examples.mk b/scribo/doc/split-examples.mk deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/split-outputs.mk b/scribo/doc/split-outputs.mk deleted file mode 100644 index e69de29..0000000 diff --git a/scribo/doc/tools/todoxygen.sh b/scribo/doc/tools/todoxygen.sh deleted file mode 100755 index 29199ae..0000000 --- a/scribo/doc/tools/todoxygen.sh +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh - -# todoxygen.sh: Turn HTML files into suitable inputs for doxygen. - -# Copyright (C) 2009, 2010, 2013 EPITA Research and Development -# Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -test $# -eq 3 \ - || { echo "Usage: $0 <input.html> <output.hh> <path to .sty>"; exit 1; } - -html="$1" -out="$2" - -bodyl=`grep -n -i "<BODY" $html | cut -d ':' -f 1` -nlines=`wc -l $html | cut -d ' ' -f 1` -tail_line=$(($nlines - $bodyl)) - -echo '/*! ' > $out -echo '\htmlonly' >> $out -tail -n $tail_line $html >> $out -echo '\endhtmlonly */' >> $out - -perl -pi -e 's/&#XA0/\&nbsp/g' $out -perl -pi -e 's/&#X21A6/\&map/g' $out -perl -pi -e 's/&#X2019/\&rsquo/g' $out -perl -pi -e 's/&#X2192/\&rarr/g' $out -perl -pi -e 's/&#X201C/\&ldquo/g' $out -perl -pi -e 's/&#X201D/\&rdquo/g' $out -perl -pi -e 's/&#X2261/\&equiv/g' $out - -# Doxygen wants us to preserve '\n' after commands. -# \ref and \see do not need that extra new line. -for keyword in include section page subpage subsection subsubsection image; do - perl -pi -e "s/\\\\endhtmlonly\\\\$keyword/\\\\endhtmlonly\n\n\\\\$keyword/g" $out - perl -pi -e "s/\\\\endhtmlonly\*\//\\\\endhtmlonly\n\n\*\/\n\n/g" $out - perl -pi -e "s/\\\\$keyword $.*$\\\\htmlonly/\\\\$keyword \1\n\n\\\\htmlonly\n/g" $out -done diff --git a/scribo/doc/tutorial.tex b/scribo/doc/tutorial.tex deleted file mode 100644 index e69de29..0000000 -- 1.7.10.4

10 years, 6 months

olena: branch next updated: olena-2.0-877-gc4d57b5

by git＠lrde.epita.fr

10 years, 6 months

olena: olena-2.0-877-gc4d57b5 Factor generators used in Scribo's doc/ directory.

by Roland Levillain

* doc/gen-examples-outputs-mk, * doc/gen-figures-mk, * doc/gen-make-variable, * doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Replace with symlinks to the scripts located in Olena's build-aux/ directory. --- scribo/ChangeLog | 12 +++ scribo/doc/gen-examples-outputs-mk | 72 +------------- scribo/doc/gen-figures-mk | 193 +----------------------------------- scribo/doc/gen-make-variable | 53 +--------- scribo/doc/gen-split-examples-mk | 137 +------------------------ scribo/doc/gen-split-outputs-mk | 140 +------------------------- 6 files changed, 17 insertions(+), 590 deletions(-) mode change 100755 => 120000 scribo/doc/gen-examples-outputs-mk mode change 100755 => 120000 scribo/doc/gen-figures-mk mode change 100755 => 120000 scribo/doc/gen-make-variable mode change 100755 => 120000 scribo/doc/gen-split-examples-mk mode change 100755 => 120000 scribo/doc/gen-split-outputs-mk diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 020df73..300b79c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,17 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Factor generators used in Scribo's doc/ directory. + + * doc/gen-examples-outputs-mk, + * doc/gen-figures-mk, + * doc/gen-make-variable, + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Replace with symlinks to the scripts located in Olena's build-aux/ + directory. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to trash/ directories in Scribo. * doc/gen-figures-mk, diff --git a/scribo/doc/gen-examples-outputs-mk b/scribo/doc/gen-examples-outputs-mk deleted file mode 100755 index 440d960..0000000 --- a/scribo/doc/gen-examples-outputs-mk +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -me=`basename $0` - -test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; } - -cat<<EOF -## Generated by $me. Do not edit by hand. -EOF - -for source; do - base=`basename "$source" .cc` - source_dir=`dirname "$source"` - timestamp="\$(srcdir)/$source_dir/$base.stamp" - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$source" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - program="$canonical_name\$(EXEEXT)" - output="\$(srcdir)/outputs/$canonical_name.txt" - - # Programs generate a textual output, and possibly one or several - # images (as a ``side effect''). Use a timestamp to keep track of - # these multiple outputs. - # - # Also, have outputs depend on sources rather than programs, and - # recompile the latter to regen the former only when needed. This - # way, we can ship generated outputs without forcing the user of the - # distribution to recompile the programs. - cat<<EOF - - -$timestamp: $source - @rm -f \$@.tmp - @touch \$@.tmp - \$(MAKE) \$(AM_MAKEFLAGS) $program - ./$program >$output.tmp - mv $output.tmp $output - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$output: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF -done diff --git a/scribo/doc/gen-examples-outputs-mk b/scribo/doc/gen-examples-outputs-mk new file mode 120000 index 0000000..66a252d --- /dev/null +++ b/scribo/doc/gen-examples-outputs-mk @@ -0,0 +1 @@ +../../build-aux/gen-examples-outputs-mk \ No newline at end of file diff --git a/scribo/doc/gen-figures-mk b/scribo/doc/gen-figures-mk deleted file mode 100755 index 80a55a5..0000000 --- a/scribo/doc/gen-figures-mk +++ /dev/null @@ -1,192 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -# get_outputs FILE -# ---------------- -get_outputs() -{ - local outputs= - local i=1 - # Use Perl instead of sed for portability reasons. - for output in `perl -ne \ - "print if s|^\\s*doc::(p.m)save\\s*\$[^;]+,\\s*\"([^\"]+)\"\$;\$|\\2.\\1|" \ - "$1"` - do - # Add a number to the file name. - # FIXME: Maybe we should let the Perl script above do this... - num_output=`echo $output | sed "s,\$.p.m\$,-$i\\1,"` - if test -z "$outputs"; then - outputs="$num_output" - else - outputs="$outputs $num_output" - fi - i=`expr $i + 1` - done - echo "$outputs" -} - -# upcase STRING -# ------------- -upcase() -{ - # Use enumerated sets to be portable. - echo "$1" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} - -# canonicalize STRING -# ------------------- -canonicalize() -{ - echo "$1" | tr .- _ -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# List of generated figures. -fig_vars= - -# gen_var VARIABLE [ITEMS...] -# --------------------------- -# Generate a Make variable named VARIABLE containing ITEMS. -gen_var() -{ - local v - { - echo "$1 =" - shift - for v; do - echo " $v" - done - } | backslashify -} - -# List of paths to PBM figures. -pbm_fig_paths= -# List of paths to PGM figures. -pgg_fig_paths= -# List of paths to PPM figures. -ppm_fig_paths= - -cat<<EOF -## Generated by $me. Do not edit by hand. - -## Figures depend on the timestamp associated with their generator. -## See also examples-outputs.mk. - -EOF - -for file in `inputs`; do - # FIXME: Ugly hack to handle the case of examples/ima-save.cc, since - # this program does not use a `doc::p?msave' routine... - if test "X$file" = "Xexamples/ima-save.cc"; then - # Hard-coded value. - figures="ima_save.pbm" - else - figures=`get_outputs "$file"` - fi - - if test -n "$figures"; then - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - canonical_var=`canonicalize "$canonical_name"` - fig_var="`upcase "$canonical_var"`_FIGURES" - - # Populate the list of variables of figures. - fig_vars="$fig_vars \$($fig_var)" - - # Populate the list of paths to figures of a given format. - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - case "$figure" in - *.pbm) pbm_fig_paths="$pbm_fig_paths $fig_path";; - *.pgm) pgm_fig_paths="$pgm_fig_paths $fig_path";; - *.ppm) ppm_fig_paths="$ppm_fig_paths $fig_path";; - esac - done - - # Generate a Make variable for the figures produced by FILE. - { - echo "$fig_var =" - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - echo "$fig_path" - done - } | backslashify - - # Generate a Make rule to regen the figures produced by FILE. - base=`basename "$file" .cc` - dir=`dirname "$file"` - timestamp="\$(srcdir)/$dir/$base.stamp" - cat <<EOF -\$($fig_var): $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi - -EOF - fi -done - - -# More Make variables. -echo "# The list of all generated figures." -gen_var FIGURES $fig_vars -echo -echo "# The list of all generated PBM figures." -gen_var PBM_FIGURES $pbm_fig_paths -echo -echo "# The list of all generated PGM figures." -gen_var PGM_FIGURES $pgm_fig_paths -echo -echo "# The list of all generated PPM figures." -gen_var PPM_FIGURES $ppm_fig_paths diff --git a/scribo/doc/gen-figures-mk b/scribo/doc/gen-figures-mk new file mode 120000 index 0000000..a53b3ed --- /dev/null +++ b/scribo/doc/gen-figures-mk @@ -0,0 +1 @@ +../../build-aux/gen-figures-mk \ No newline at end of file diff --git a/scribo/doc/gen-make-variable b/scribo/doc/gen-make-variable deleted file mode 100755 index 91403ae..0000000 --- a/scribo/doc/gen-make-variable +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -test $# -gt 1 || { echo "usage: $me VARIABLE FILES..."; exit 1; } - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -cat<<EOF -## Generated by $me. Do not edit by hand. - -EOF -{ - echo "$1 =" - shift - for var; do - echo "$var" - shift - done | sort | sed 's/$.*$/ \1/' -} | backslashify diff --git a/scribo/doc/gen-make-variable b/scribo/doc/gen-make-variable new file mode 120000 index 0000000..06c3379 --- /dev/null +++ b/scribo/doc/gen-make-variable @@ -0,0 +1 @@ +../../build-aux/gen-make-variable \ No newline at end of file diff --git a/scribo/doc/gen-split-examples-mk b/scribo/doc/gen-split-examples-mk deleted file mode 100755 index b505370..0000000 --- a/scribo/doc/gen-split-examples-mk +++ /dev/null @@ -1,136 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=examples/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_EXAMPLES =" - inputs | while read file; do - # Count the number of opening and closing marks. - nopening=`grep -c '// *\\\{' "$file"` - nclosing=`grep -c '// *\\\}' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Timestamp split examples (outputs) depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: \$(srcdir)/$file - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/scribo/doc/gen-split-examples-mk b/scribo/doc/gen-split-examples-mk new file mode 120000 index 0000000..b0137b2 --- /dev/null +++ b/scribo/doc/gen-split-examples-mk @@ -0,0 +1 @@ +../../build-aux/gen-split-examples-mk \ No newline at end of file diff --git a/scribo/doc/gen-split-outputs-mk b/scribo/doc/gen-split-outputs-mk deleted file mode 100755 index a2313be..0000000 --- a/scribo/doc/gen-split-outputs-mk +++ /dev/null @@ -1,139 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=outputs/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_OUTPUTS =" - inputs | while read file; do - - # Count the number of opening and closing marks. - nopening=`grep -c 'doc::begin_output' "$file"` - nclosing=`grep -c 'doc::end_output' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Output file to be split. - output="\$(srcdir)/outputs/$canonical_name.txt" - # Timestamp split outputs depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.txt.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.txt" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: $output - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/scribo/doc/gen-split-outputs-mk b/scribo/doc/gen-split-outputs-mk new file mode 120000 index 0000000..9ca6a48 --- /dev/null +++ b/scribo/doc/gen-split-outputs-mk @@ -0,0 +1 @@ +../../build-aux/gen-split-outputs-mk \ No newline at end of file -- 1.7.10.4

10 years, 6 months

olena: olena-2.0-876-g450e319 Factor generators used in Milena's doc/ directory.

by Roland Levillain

* doc/gen-examples-outputs-mk, * doc/gen-figures-mk, * doc/gen-make-variable, * doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Replace with symlinks to the scripts located in Olena's build-aux/ directory. --- milena/ChangeLog | 12 +++ milena/doc/gen-examples-outputs-mk | 72 +------------- milena/doc/gen-figures-mk | 193 +----------------------------------- milena/doc/gen-make-variable | 53 +--------- milena/doc/gen-split-examples-mk | 137 +------------------------ milena/doc/gen-split-outputs-mk | 140 +------------------------- 6 files changed, 17 insertions(+), 590 deletions(-) mode change 100755 => 120000 milena/doc/gen-examples-outputs-mk mode change 100755 => 120000 milena/doc/gen-figures-mk mode change 100755 => 120000 milena/doc/gen-make-variable mode change 100755 => 120000 milena/doc/gen-split-examples-mk mode change 100755 => 120000 milena/doc/gen-split-outputs-mk diff --git a/milena/ChangeLog b/milena/ChangeLog index aa0c433..262513b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Factor generators used in Milena's doc/ directory. + + * doc/gen-examples-outputs-mk, + * doc/gen-figures-mk, + * doc/gen-make-variable, + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Replace with symlinks to the scripts located in Olena's build-aux/ + directory. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to trash/ directories in Milena. * doc/Doxyfile.in (EXCLUDE) diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk deleted file mode 100755 index 440d960..0000000 --- a/milena/doc/gen-examples-outputs-mk +++ /dev/null @@ -1,71 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -me=`basename $0` - -test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; } - -cat<<EOF -## Generated by $me. Do not edit by hand. -EOF - -for source; do - base=`basename "$source" .cc` - source_dir=`dirname "$source"` - timestamp="\$(srcdir)/$source_dir/$base.stamp" - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$source" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - program="$canonical_name\$(EXEEXT)" - output="\$(srcdir)/outputs/$canonical_name.txt" - - # Programs generate a textual output, and possibly one or several - # images (as a ``side effect''). Use a timestamp to keep track of - # these multiple outputs. - # - # Also, have outputs depend on sources rather than programs, and - # recompile the latter to regen the former only when needed. This - # way, we can ship generated outputs without forcing the user of the - # distribution to recompile the programs. - cat<<EOF - - -$timestamp: $source - @rm -f \$@.tmp - @touch \$@.tmp - \$(MAKE) \$(AM_MAKEFLAGS) $program - ./$program >$output.tmp - mv $output.tmp $output - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$output: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF -done diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk new file mode 120000 index 0000000..66a252d --- /dev/null +++ b/milena/doc/gen-examples-outputs-mk @@ -0,0 +1 @@ +../../build-aux/gen-examples-outputs-mk \ No newline at end of file diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk deleted file mode 100755 index 80a55a5..0000000 --- a/milena/doc/gen-figures-mk +++ /dev/null @@ -1,192 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -# get_outputs FILE -# ---------------- -get_outputs() -{ - local outputs= - local i=1 - # Use Perl instead of sed for portability reasons. - for output in `perl -ne \ - "print if s|^\\s*doc::(p.m)save\\s*\$[^;]+,\\s*\"([^\"]+)\"\$;\$|\\2.\\1|" \ - "$1"` - do - # Add a number to the file name. - # FIXME: Maybe we should let the Perl script above do this... - num_output=`echo $output | sed "s,\$.p.m\$,-$i\\1,"` - if test -z "$outputs"; then - outputs="$num_output" - else - outputs="$outputs $num_output" - fi - i=`expr $i + 1` - done - echo "$outputs" -} - -# upcase STRING -# ------------- -upcase() -{ - # Use enumerated sets to be portable. - echo "$1" | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ -} - -# canonicalize STRING -# ------------------- -canonicalize() -{ - echo "$1" | tr .- _ -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# List of generated figures. -fig_vars= - -# gen_var VARIABLE [ITEMS...] -# --------------------------- -# Generate a Make variable named VARIABLE containing ITEMS. -gen_var() -{ - local v - { - echo "$1 =" - shift - for v; do - echo " $v" - done - } | backslashify -} - -# List of paths to PBM figures. -pbm_fig_paths= -# List of paths to PGM figures. -pgg_fig_paths= -# List of paths to PPM figures. -ppm_fig_paths= - -cat<<EOF -## Generated by $me. Do not edit by hand. - -## Figures depend on the timestamp associated with their generator. -## See also examples-outputs.mk. - -EOF - -for file in `inputs`; do - # FIXME: Ugly hack to handle the case of examples/ima-save.cc, since - # this program does not use a `doc::p?msave' routine... - if test "X$file" = "Xexamples/ima-save.cc"; then - # Hard-coded value. - figures="ima_save.pbm" - else - figures=`get_outputs "$file"` - fi - - if test -n "$figures"; then - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - canonical_var=`canonicalize "$canonical_name"` - fig_var="`upcase "$canonical_var"`_FIGURES" - - # Populate the list of variables of figures. - fig_vars="$fig_vars \$($fig_var)" - - # Populate the list of paths to figures of a given format. - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - case "$figure" in - *.pbm) pbm_fig_paths="$pbm_fig_paths $fig_path";; - *.pgm) pgm_fig_paths="$pgm_fig_paths $fig_path";; - *.ppm) ppm_fig_paths="$ppm_fig_paths $fig_path";; - esac - done - - # Generate a Make variable for the figures produced by FILE. - { - echo "$fig_var =" - for figure in $figures; do - fig_path=" \$(srcdir)/figures/$figure" - echo "$fig_path" - done - } | backslashify - - # Generate a Make rule to regen the figures produced by FILE. - base=`basename "$file" .cc` - dir=`dirname "$file"` - timestamp="\$(srcdir)/$dir/$base.stamp" - cat <<EOF -\$($fig_var): $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi - -EOF - fi -done - - -# More Make variables. -echo "# The list of all generated figures." -gen_var FIGURES $fig_vars -echo -echo "# The list of all generated PBM figures." -gen_var PBM_FIGURES $pbm_fig_paths -echo -echo "# The list of all generated PGM figures." -gen_var PGM_FIGURES $pgm_fig_paths -echo -echo "# The list of all generated PPM figures." -gen_var PPM_FIGURES $ppm_fig_paths diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk new file mode 120000 index 0000000..a53b3ed --- /dev/null +++ b/milena/doc/gen-figures-mk @@ -0,0 +1 @@ +../../build-aux/gen-figures-mk \ No newline at end of file diff --git a/milena/doc/gen-make-variable b/milena/doc/gen-make-variable deleted file mode 100755 index 91403ae..0000000 --- a/milena/doc/gen-make-variable +++ /dev/null @@ -1,52 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -test $# -gt 1 || { echo "usage: $me VARIABLE FILES..."; exit 1; } - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -cat<<EOF -## Generated by $me. Do not edit by hand. - -EOF -{ - echo "$1 =" - shift - for var; do - echo "$var" - shift - done | sort | sed 's/$.*$/ \1/' -} | backslashify diff --git a/milena/doc/gen-make-variable b/milena/doc/gen-make-variable new file mode 120000 index 0000000..06c3379 --- /dev/null +++ b/milena/doc/gen-make-variable @@ -0,0 +1 @@ +../../build-aux/gen-make-variable \ No newline at end of file diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk deleted file mode 100755 index b505370..0000000 --- a/milena/doc/gen-split-examples-mk +++ /dev/null @@ -1,136 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=examples/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_EXAMPLES =" - inputs | while read file; do - # Count the number of opening and closing marks. - nopening=`grep -c '// *\\\{' "$file"` - nclosing=`grep -c '// *\\\}' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Timestamp split examples (outputs) depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.cc.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.cc.raw" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: \$(srcdir)/$file - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk new file mode 120000 index 0000000..b0137b2 --- /dev/null +++ b/milena/doc/gen-split-examples-mk @@ -0,0 +1 @@ +../../build-aux/gen-split-examples-mk \ No newline at end of file diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk deleted file mode 100755 index a2313be..0000000 --- a/milena/doc/gen-split-outputs-mk +++ /dev/null @@ -1,139 +0,0 @@ -#! /bin/sh - -# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). -# -# This file is part of Olena. -# -# Olena is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, version 2 of the License. -# -# Olena is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Olena. If not, see <http://www.gnu.org/licenses/>. - -# To be used from milena/doc/'s source directory. - -# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk. - -me=`basename $0` - -# Use the C locale to have a deterministic sort. -export LC_ALL=C - -die () -{ - echo >&2 "$me: $@" - exit 1 -} - -# backslashify -# ------------ -# Read lines from the standard input and write them on the standard -# output with an extra trailing backslash, except for the last line. -backslashify() -{ - # Set IFS to nothing to prevent `read' from trimming spaces or tabs. - IFS= read last_line - while IFS= read line; do - echo "$last_line \\" - last_line=$line - done - echo "$last_line" -} - -# Get this list as argument? -inputs() -{ - # Remove the .cc extension before sorting file names. - find examples -name \*.cc \ - | sed 's/.cc$//' \ - | sort \ - | sed 's/$/.cc/' -} - -output_dir=outputs/split - -# Use a temporary file to dump rules at the end of the output. -tempfile=`mktemp /tmp/temp.XXXXXX` -# Set up automatic cleanup. -cleanup() { rm -f "$tempfile"; exit; } -trap cleanup 0 1 2 3 6 15 - -# Header. -cat <<EOF -## Generated by $me. Do not edit by hand. - -EOF - -# Output target names in a variable. -{ - echo "SPLIT_OUTPUTS =" - inputs | while read file; do - - # Count the number of opening and closing marks. - nopening=`grep -c 'doc::begin_output' "$file"` - nclosing=`grep -c 'doc::end_output' "$file"` - test "$nopening" -eq "$nclosing" \ - || die "Unbalanced marks in $file ($nopening vs $nclosing)" - - # If there is no mark, skip this file. - test "$nopening" -eq 0 && continue - - # FIXME: Programs of which sources are located in a subdirectory of - # examples/ take the path as prefix of their name. This is a pain. - # It'd be much simpler to have all sources in the same directory. - canonical_name=`echo "$file" \ - | sed -e 's,examples/,,' \ - -e 'y,/,_,' \ - -e 's,\.cc$,,'` - # Output file to be split. - output="\$(srcdir)/outputs/$canonical_name.txt" - # Timestamp split outputs depend on. - timestamp="\$(srcdir)/$output_dir/$canonical_name.txt.stamp" - # List of targets associated to FILE. - targets= - { - i=1 - while test "$i" -le "$nopening"; do - # i-th part of the split file. - part="\$(srcdir)/$output_dir/$canonical_name-$i.txt" - - if test -z "$targets"; then - targets="$part" - else - targets="$targets $part" - fi - echo " $part" - i=`expr $i + 1` - done - - # Collect rules in a temporary file... - cat >>"$tempfile" <<EOF - - -$timestamp: $output - @rm -f \$@.tmp - @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir - @mv -f \$@.tmp \$@ -EXTRA_DIST += $timestamp -MAINTAINERCLEANFILES += $timestamp - -$targets: $timestamp -## Recover from the removal of \$@ - @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ - fi -EOF - } - done -} | backslashify - -# ...and output them at the end. -cat "$tempfile" diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk new file mode 120000 index 0000000..9ca6a48 --- /dev/null +++ b/milena/doc/gen-split-outputs-mk @@ -0,0 +1 @@ +../../build-aux/gen-split-outputs-mk \ No newline at end of file -- 1.7.10.4

10 years, 6 months

olena: olena-2.0-875-ga6814c6 Factor generators used in doc/ directories.

by Roland Levillain

* build-aux/gen-examples-outputs-mk, * build-aux/gen-figures-mk, * build-aux/gen-make-variable, * build-aux/gen-split-examples-mk, * build-aux/gen-split-outputs-mk: New. Imported from milena/doc/. * build-aux/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk, gen-figures-mk, gen-make-variable, gen-split-examples-mk and gen-split-outputs-mk. --- ChangeLog | 15 +++++++++++++++ build-aux/Makefile.am | 10 +++++++++- {milena/doc => build-aux}/gen-examples-outputs-mk | 0 {milena/doc => build-aux}/gen-figures-mk | 0 {milena/doc => build-aux}/gen-make-variable | 0 {milena/doc => build-aux}/gen-split-examples-mk | 0 {milena/doc => build-aux}/gen-split-outputs-mk | 0 7 files changed, 24 insertions(+), 1 deletion(-) copy {milena/doc => build-aux}/gen-examples-outputs-mk (100%) copy {milena/doc => build-aux}/gen-figures-mk (100%) copy {milena/doc => build-aux}/gen-make-variable (100%) copy {milena/doc => build-aux}/gen-split-examples-mk (100%) copy {milena/doc => build-aux}/gen-split-outputs-mk (100%) diff --git a/ChangeLog b/ChangeLog index 352e0f0..65d3ddc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,20 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Factor generators used in doc/ directories. + + * build-aux/gen-examples-outputs-mk, + * build-aux/gen-figures-mk, + * build-aux/gen-make-variable, + * build-aux/gen-split-examples-mk, + * build-aux/gen-split-outputs-mk: + New. + Imported from milena/doc/. + * build-aux/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk, + gen-figures-mk, gen-make-variable, gen-split-examples-mk and + gen-split-outputs-mk. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to trash/ directories in Olena. * bootstrap: Here. diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am index 0e1ad0f..eb5d89d 100644 --- a/build-aux/Makefile.am +++ b/build-aux/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2009, 2010 EPITA Research and Development +# Copyright (C) 2006, 2009, 2010, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -21,3 +21,11 @@ EXTRA_DIST = texi2dvi # File generators. EXTRA_DIST += generate_dist_headers.sh build_unit_test.sh + +# Generators used in doc/ directories. +EXTRA_DIST += \ + gen-examples-outputs-mk \ + gen-figures-mk \ + gen-make-variable \ + gen-split-examples-mk \ + gen-split-outputs-mk diff --git a/milena/doc/gen-examples-outputs-mk b/build-aux/gen-examples-outputs-mk similarity index 100% copy from milena/doc/gen-examples-outputs-mk copy to build-aux/gen-examples-outputs-mk diff --git a/milena/doc/gen-figures-mk b/build-aux/gen-figures-mk similarity index 100% copy from milena/doc/gen-figures-mk copy to build-aux/gen-figures-mk diff --git a/milena/doc/gen-make-variable b/build-aux/gen-make-variable similarity index 100% copy from milena/doc/gen-make-variable copy to build-aux/gen-make-variable diff --git a/milena/doc/gen-split-examples-mk b/build-aux/gen-split-examples-mk similarity index 100% copy from milena/doc/gen-split-examples-mk copy to build-aux/gen-split-examples-mk diff --git a/milena/doc/gen-split-outputs-mk b/build-aux/gen-split-outputs-mk similarity index 100% copy from milena/doc/gen-split-outputs-mk copy to build-aux/gen-split-outputs-mk -- 1.7.10.4

10 years, 6 months

olena: branch next updated: olena-2.0-874-g14be913

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 14be913d040a216aac41080b548dbf06afe4e59c (commit) via 6ff853df7844d30132e70fc4542cc8e8cd545001 (commit) via 2957d5177ec84984b5d540b582327b7b09f93300 (commit) via d5d24ad356ba486742b03faea73a8e78f560eae9 (commit) via 5ea13e376a63f9c8835f1df3a2c2a33515e179ee (commit) from f13d23b02d4e54978969dce1192832f37de16d65 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 14be913 Remove mentions to trash/ directories in Scribo. 6ff853d Remove mentions to trash/ directories in Milena. 2957d51 Remove mentions to trash/ directories in Olena. d5d24ad Regen files in Milena. 5ea13e3 Remove trash/ directories. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 + bootstrap | 5 +- milena/ChangeLog | 110 ++++++ milena/doc/Doxyfile.in | 2 - milena/doc/Makefile.am | 17 +- milena/doc/examples.mk | 31 -- milena/doc/examples/trash/accu.cc | 20 - milena/doc/examples/trash/box.cc | 36 -- milena/doc/examples/trash/cpp_issue.cc | 29 -- milena/doc/examples/trash/erosion.cc | 106 ----- milena/doc/examples/trash/for_Z.cc | 224 ----------- milena/doc/examples/trash/graph.cc | 159 -------- milena/doc/examples/trash/image2d.cc | 82 ---- milena/doc/examples/trash/image_flat.cc | 12 - milena/doc/examples/trash/image_if.cc | 93 ----- milena/doc/examples/trash/image_plain.cc | 42 -- milena/doc/examples/trash/image_safe.cc | 24 -- milena/doc/examples/trash/labeling_algo.cc | 80 ---- milena/doc/examples/trash/mk_graph.cc | 91 ----- milena/doc/examples/trash/p_array.2.cc | 93 ----- milena/doc/examples/trash/p_array.cc | 103 ----- milena/doc/examples/trash/p_image.cc | 52 --- milena/doc/examples/trash/p_key.2.cc | 34 -- milena/doc/examples/trash/p_key.cc | 96 ----- milena/doc/examples/trash/p_line2d.cc | 34 -- milena/doc/examples/trash/p_mutable_array_of.cc | 60 --- milena/doc/examples/trash/p_queue.cc | 93 ----- milena/doc/examples/trash/p_run.cc | 48 --- milena/doc/examples/trash/p_vaccess.cc | 157 -------- milena/doc/examples/trash/proxy.cc | 105 ----- milena/doc/examples/trash/sub_image.cc | 29 -- milena/doc/examples/trash/sub_image_if.cc | 101 ----- milena/doc/examples/trash/tuto_bis.cc | 273 ------------- milena/doc/examples/trash/tuto_one.cc | 128 ------ milena/doc/examples/trash/vec.cc | 14 - milena/doc/examples/trash/win_multiple.cc | 65 ---- milena/doc/examples/trash/window.cc | 92 ----- milena/doc/gen-figures-mk | 8 +- milena/doc/gen-split-outputs-mk | 3 +- milena/trash/bgraph_image.cc | 105 ----- milena/trash/bgraph_image.hh | 288 -------------- milena/trash/bgraph_psite.hh | 176 --------- milena/trash/boost_graph.cc | 114 ------ milena/trash/boost_graph.hh | 218 ----------- milena/trash/boost_graph_access.hh | 292 -------------- milena/trash/boost_graph_property.hh | 170 -------- milena/trash/boost_graph_structure.hh | 288 -------------- milena/trash/clock_neighb.hh | 168 -------- milena/trash/clock_neighb2d.cc | 90 ----- milena/trash/clock_neighb2d.hh | 199 ---------- milena/trash/clock_neighb2d_bis.cc | 199 ---------- milena/trash/display_color_pretty.cc | 90 ----- milena/trash/display_color_pretty.hh | 221 ----------- milena/trash/display_remove.hh | 90 ----- milena/trash/display_save.hh | 132 ------- milena/trash/display_save_and_show.hh | 97 ----- milena/trash/display_show.cc | 86 ---- milena/trash/display_show.hh | 131 ------- milena/trash/fi_adaptor.cc | 87 ----- milena/trash/fi_adaptor.hh | 476 ----------------------- milena/trash/freeimageplus.mk | 9 - milena/trash/graph_image.hh | 300 -------------- milena/trash/line_graph_image.hh | 344 ---------------- milena/trash/mono_obased_rle_encode.hh | 120 ------ milena/trash/mono_obased_rle_image.cc | 78 ---- milena/trash/mono_obased_rle_image.hh | 266 ------------- milena/trash/mono_rle_encode.hh | 108 ----- milena/trash/mono_rle_image.cc | 84 ---- milena/trash/mono_rle_image.hh | 254 ------------ milena/trash/neighb_get.hh | 190 --------- milena/trash/neighb_image.cc | 57 --- milena/trash/neighb_image.hh | 255 ------------ milena/trash/obased_rle_encode.hh | 120 ------ milena/trash/obased_rle_image.cc | 78 ---- milena/trash/obased_rle_image.hh | 289 -------------- milena/trash/p_bgraph.cc | 85 ---- milena/trash/p_bgraph.hh | 220 ----------- milena/trash/p_bgraph_piter.hh | 245 ------------ milena/trash/rle_encode.hh | 113 ------ milena/trash/rle_image.cc | 78 ---- milena/trash/rle_image.hh | 230 ----------- milena/trash/save_and_show.cc | 79 ---- milena/trash/sparse_encode.hh | 118 ------ milena/trash/sparse_image.cc | 79 ---- milena/trash/sparse_image.hh | 261 ------------- milena/trash/t_image.cc | 53 --- milena/trash/t_image.hh | 304 --------------- milena/trash/to_tiles.cc | 88 ----- milena/trash/to_tiles.hh | 98 ----- milena/trash/translate_image.cc | 74 ---- milena/trash/translate_image.hh | 209 ---------- milena/trash/value_enc_image.cc | 155 -------- milena/trash/value_enc_image.hh | 254 ------------ milena/trash/value_encode.hh | 113 ------ scribo/ChangeLog | 8 + scribo/doc/gen-figures-mk | 8 +- scribo/doc/gen-split-outputs-mk | 3 +- 97 files changed, 141 insertions(+), 11760 deletions(-) delete mode 100644 milena/doc/examples/trash/accu.cc delete mode 100644 milena/doc/examples/trash/box.cc delete mode 100644 milena/doc/examples/trash/cpp_issue.cc delete mode 100644 milena/doc/examples/trash/erosion.cc delete mode 100644 milena/doc/examples/trash/for_Z.cc delete mode 100644 milena/doc/examples/trash/graph.cc delete mode 100644 milena/doc/examples/trash/image2d.cc delete mode 100644 milena/doc/examples/trash/image_flat.cc delete mode 100644 milena/doc/examples/trash/image_if.cc delete mode 100644 milena/doc/examples/trash/image_plain.cc delete mode 100644 milena/doc/examples/trash/image_safe.cc delete mode 100644 milena/doc/examples/trash/labeling_algo.cc delete mode 100644 milena/doc/examples/trash/mk_graph.cc delete mode 100644 milena/doc/examples/trash/p_array.2.cc delete mode 100644 milena/doc/examples/trash/p_array.cc delete mode 100644 milena/doc/examples/trash/p_image.cc delete mode 100644 milena/doc/examples/trash/p_key.2.cc delete mode 100644 milena/doc/examples/trash/p_key.cc delete mode 100644 milena/doc/examples/trash/p_line2d.cc delete mode 100644 milena/doc/examples/trash/p_mutable_array_of.cc delete mode 100644 milena/doc/examples/trash/p_queue.cc delete mode 100644 milena/doc/examples/trash/p_run.cc delete mode 100644 milena/doc/examples/trash/p_vaccess.cc delete mode 100644 milena/doc/examples/trash/proxy.cc delete mode 100644 milena/doc/examples/trash/sub_image.cc delete mode 100644 milena/doc/examples/trash/sub_image_if.cc delete mode 100644 milena/doc/examples/trash/tuto_bis.cc delete mode 100644 milena/doc/examples/trash/tuto_one.cc delete mode 100644 milena/doc/examples/trash/vec.cc delete mode 100644 milena/doc/examples/trash/win_multiple.cc delete mode 100644 milena/doc/examples/trash/window.cc delete mode 100644 milena/trash/bgraph_image.cc delete mode 100644 milena/trash/bgraph_image.hh delete mode 100644 milena/trash/bgraph_psite.hh delete mode 100644 milena/trash/boost_graph.cc delete mode 100644 milena/trash/boost_graph.hh delete mode 100644 milena/trash/boost_graph_access.hh delete mode 100644 milena/trash/boost_graph_property.hh delete mode 100644 milena/trash/boost_graph_structure.hh delete mode 100644 milena/trash/clock_neighb.hh delete mode 100644 milena/trash/clock_neighb2d.cc delete mode 100644 milena/trash/clock_neighb2d.hh delete mode 100644 milena/trash/clock_neighb2d_bis.cc delete mode 100644 milena/trash/display_color_pretty.cc delete mode 100644 milena/trash/display_color_pretty.hh delete mode 100644 milena/trash/display_remove.hh delete mode 100644 milena/trash/display_save.hh delete mode 100644 milena/trash/display_save_and_show.hh delete mode 100644 milena/trash/display_show.cc delete mode 100644 milena/trash/display_show.hh delete mode 100644 milena/trash/fi_adaptor.cc delete mode 100644 milena/trash/fi_adaptor.hh delete mode 100644 milena/trash/freeimageplus.mk delete mode 100644 milena/trash/graph_image.hh delete mode 100644 milena/trash/line_graph_image.hh delete mode 100644 milena/trash/mono_obased_rle_encode.hh delete mode 100644 milena/trash/mono_obased_rle_image.cc delete mode 100644 milena/trash/mono_obased_rle_image.hh delete mode 100644 milena/trash/mono_rle_encode.hh delete mode 100644 milena/trash/mono_rle_image.cc delete mode 100644 milena/trash/mono_rle_image.hh delete mode 100644 milena/trash/neighb_get.hh delete mode 100644 milena/trash/neighb_image.cc delete mode 100644 milena/trash/neighb_image.hh delete mode 100644 milena/trash/obased_rle_encode.hh delete mode 100644 milena/trash/obased_rle_image.cc delete mode 100644 milena/trash/obased_rle_image.hh delete mode 100644 milena/trash/p_bgraph.cc delete mode 100644 milena/trash/p_bgraph.hh delete mode 100644 milena/trash/p_bgraph_piter.hh delete mode 100644 milena/trash/rle_encode.hh delete mode 100644 milena/trash/rle_image.cc delete mode 100644 milena/trash/rle_image.hh delete mode 100644 milena/trash/save_and_show.cc delete mode 100644 milena/trash/sparse_encode.hh delete mode 100644 milena/trash/sparse_image.cc delete mode 100644 milena/trash/sparse_image.hh delete mode 100644 milena/trash/t_image.cc delete mode 100644 milena/trash/t_image.hh delete mode 100644 milena/trash/to_tiles.cc delete mode 100644 milena/trash/to_tiles.hh delete mode 100644 milena/trash/translate_image.cc delete mode 100644 milena/trash/translate_image.hh delete mode 100644 milena/trash/value_enc_image.cc delete mode 100644 milena/trash/value_enc_image.hh delete mode 100644 milena/trash/value_encode.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

10 years, 6 months

olena: olena-2.0-871-gd5d24ad Regen files in Milena.

by Roland Levillain

* doc/examples.mk: Regen. --- milena/ChangeLog | 6 ++++++ milena/doc/examples.mk | 31 ------------------------------- 2 files changed, 6 insertions(+), 31 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bd63611..2515919 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Regen files in Milena. + + * doc/examples.mk: Regen. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove trash/ directories. * doc/examples/trash/accu.cc, diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index c6542e4..5cb69e1 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -40,37 +40,6 @@ EXAMPLES = \ $(srcdir)/examples/paste.cc \ $(srcdir)/examples/point-1.cc \ $(srcdir)/examples/predicate-1.cc \ - $(srcdir)/examples/trash/accu.cc \ - $(srcdir)/examples/trash/box.cc \ - $(srcdir)/examples/trash/cpp_issue.cc \ - $(srcdir)/examples/trash/erosion.cc \ - $(srcdir)/examples/trash/for_Z.cc \ - $(srcdir)/examples/trash/graph.cc \ - $(srcdir)/examples/trash/image2d.cc \ - $(srcdir)/examples/trash/image_flat.cc \ - $(srcdir)/examples/trash/image_if.cc \ - $(srcdir)/examples/trash/image_plain.cc \ - $(srcdir)/examples/trash/image_safe.cc \ - $(srcdir)/examples/trash/labeling_algo.cc \ - $(srcdir)/examples/trash/mk_graph.cc \ - $(srcdir)/examples/trash/p_array.2.cc \ - $(srcdir)/examples/trash/p_array.cc \ - $(srcdir)/examples/trash/p_image.cc \ - $(srcdir)/examples/trash/p_key.2.cc \ - $(srcdir)/examples/trash/p_key.cc \ - $(srcdir)/examples/trash/p_line2d.cc \ - $(srcdir)/examples/trash/p_mutable_array_of.cc \ - $(srcdir)/examples/trash/p_queue.cc \ - $(srcdir)/examples/trash/p_run.cc \ - $(srcdir)/examples/trash/p_vaccess.cc \ - $(srcdir)/examples/trash/proxy.cc \ - $(srcdir)/examples/trash/sub_image.cc \ - $(srcdir)/examples/trash/sub_image_if.cc \ - $(srcdir)/examples/trash/tuto_bis.cc \ - $(srcdir)/examples/trash/tuto_one.cc \ - $(srcdir)/examples/trash/vec.cc \ - $(srcdir)/examples/trash/win_multiple.cc \ - $(srcdir)/examples/trash/window.cc \ $(srcdir)/examples/tuto2_first_image.cc \ $(srcdir)/examples/tuto3/colorize.cc \ $(srcdir)/examples/tuto3/first_routine.cc \ -- 1.7.10.4

10 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
963
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches