* doc/tools/split_sample.sh: Use $(...) instead of `...` so that backslashes are interpreted uniformly. Pass option `-h' to grep to prevent file names from being printed on OS X. Remove useless option `-R' passed to grep. --- milena/ChangeLog | 10 ++++++++++ milena/doc/tools/split_sample.sh | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog index 7d7f92a..8bb7b90 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2013-02-07 Roland Levillain roland@lrde.epita.fr
+ Fix the generation of code excerpts for the documentation. + + * doc/tools/split_sample.sh: Use $(...) instead of `...` so that + backslashes are interpreted uniformly. + Pass option `-h' to grep to prevent file names from being printed + on OS X. + Remove useless option `-R' passed to grep. + +2013-02-06 Roland Levillain roland@lrde.epita.fr + Address warnings reported by clang++ in Milena.
* mln/canvas/browsing/diagonal2d.hh (diagonal2d_t::operator()) diff --git a/milena/doc/tools/split_sample.sh b/milena/doc/tools/split_sample.sh index b9027bd..d85d626 100755 --- a/milena/doc/tools/split_sample.sh +++ b/milena/doc/tools/split_sample.sh @@ -1,6 +1,6 @@ # /bin/sh
-# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -22,8 +22,8 @@ if ! [ $# -eq 4 ]; then exit 1; fi
-begins=`grep -n -R '//[[:space:]]*\{' $1 | cut -d ':' -f 1` -ends=`grep -n -R '//[[:space:]]*\}' $1 | cut -d ':' -f 1` +begins=$(grep -n -h '//[[:space:]]*\{' $1 | cut -d ':' -f 1) +ends=$(grep -n -h '//[[:space:]]*\}' $1 | cut -d ':' -f 1)
if ! [ -z "$3" ]; then suffix=".$3"