[Olena-patches] olena: olena-2.0-873-g6ff853d Remove mentions to trash/ directories in Milena.

* doc/Doxyfile.in (EXCLUDE) * doc/Makefile.am ($(srcdir)/outputs.mk, regen-outputs-mk) ($(srcdir)/examples-outputs.mk, regen-examples-outputs-mk) * doc/gen-figures-mk, * doc/gen-split-outputs-mk: Here. --- milena/ChangeLog | 11 +++++++++++ milena/doc/Doxyfile.in | 2 -- milena/doc/Makefile.am | 17 +++++------------ milena/doc/gen-figures-mk | 8 ++++---- milena/doc/gen-split-outputs-mk | 3 +-- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 2515919..aa0c433 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Remove mentions to trash/ directories in Milena. + + * doc/Doxyfile.in (EXCLUDE) + * doc/Makefile.am ($(srcdir)/outputs.mk, regen-outputs-mk) + ($(srcdir)/examples-outputs.mk, regen-examples-outputs-mk) + * doc/gen-figures-mk, + * doc/gen-split-outputs-mk: + Here. + +2014-06-20 Roland Levillain <roland(a)lrde.epita.fr> + Regen files in Milena. * doc/examples.mk: Regen. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index 7a70e8d..5b04918 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -705,9 +705,7 @@ RECURSIVE = YES # run. EXCLUDE = @top_srcdir@/milena/sandbox \ - @top_srcdir@/milena/trash \ @top_srcdir@/milena/mln/core/concept/proxy.hxx \ - @top_srcdir@/milena/doc/examples/trash \ @top_srcdir@/milena/doc/user-refman \ @top_srcdir@/milena/doc/devel-refman \ @top_srcdir@/milena/tests/unit_test diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index fbb6d5f..69b783d 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Copyright (C) 2007, 2008, 2009, 2010, 2013, 2014 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -601,10 +601,8 @@ CLEANFILES = $(PROGRAMS_examples) $(srcdir)/outputs.mk: $(srcdir)/gen-make-variable rm -f $@.tmp -# Ignore sources in examples/trash/. $(srcdir)/gen-make-variable OUTPUTS \ - `find $(srcdir)/examples \ - -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \ + `find $(srcdir)/examples -name \*.cc \ | sed -e 's,$(srcdir)/examples/,,' \ -e 'y,/,_,' \ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \ @@ -618,10 +616,8 @@ MAINTAINERCLEANFILES += $(OUTPUTS) .PHONY: regen-outputs-mk regen-outputs-mk: rm -f $(srcdir)/outputs.mk.tmp -# Ignore sources in examples/trash/. $(srcdir)/gen-make-variable OUTPUTS \ - `find $(srcdir)/examples \ - -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \ + `find $(srcdir)/examples -name \*.cc \ | sed -e 's,$(srcdir)/examples/,,' \ -e 'y,/,_,' \ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \ @@ -647,11 +643,9 @@ EXTRA_DIST += gen-examples-outputs-mk $(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk rm -f $@.tmp -# Ignore sources in examples/trash/. cd $(srcdir) && \ ./gen-examples-outputs-mk \ - `find examples -name \*.cc -a \! -path examples/trash/\* \ - | env LC_ALL=C sort` \ + `find examples -name \*.cc | env LC_ALL=C sort` \ mv -f $@.tmp $@ chmod -w $@ @@ -662,8 +656,7 @@ regen-examples-outputs-mk: rm -f $(srcdir)/examples-outputs.mk.tmp cd $(srcdir) && \ ./gen-examples-outputs-mk \ - `find examples -name \*.cc -a \! -path examples/trash/\* \ - | env LC_ALL=C sort` \ + `find examples -name \*.cc | env LC_ALL=C sort` \ mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk chmod -w $(srcdir)/examples-outputs.mk diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index ca20fc9..80a55a5 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -25,9 +25,9 @@ export LC_ALL=C inputs() { # Remove the .cc extension before sorting file names. - find examples -name \*.cc -a \! -path examples/trash/\* \ - | sed 's/.cc$//' \ - | sort \ + find examples -name \*.cc \ + | sed 's/.cc$//' \ + | sort \ | sed 's/$/.cc/' } diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk index e7c130b..a2313be 100755 --- a/milena/doc/gen-split-outputs-mk +++ b/milena/doc/gen-split-outputs-mk @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -50,7 +50,6 @@ backslashify() inputs() { # Remove the .cc extension before sorting file names. - # FIXME: Or � find examples -name \*.cc -a \! -path examples/trash/\* � ? find examples -name \*.cc \ | sed 's/.cc$//' \ | sort \ -- 1.7.10.4