Handle comments starting with `//' and `dnl' in strip-lrde.

	* build-aux/strip-lrde: Here.
	Fix copyright header.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@4138 4aad255d-cdde-0310-9447-f3009e2ae8c0

ChangeLog

+2009-06-14  Roland Levillain  <roland@lrde.epita.fr>
+
+	Handle comments starting with `//' and `dnl' in strip-lrde.
+
+	* build-aux/strip-lrde: Here.
+	Fix copyright header.
+
 2009-06-12  Thierry Geraud  <thierry.geraud@lrde.epita.fr>
 
 	De-activate Makefiles kept out of release 1.0.

build-aux/strip-lrde

 #! /bin/sh
-# Copyright (C) 2007  EPITA Research and Development Laboratory
+
+# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE)
+#
+# This file is part of Olena.
 #
-# This file is part of the Olena Library.  This library is free
-# software; you can redistribute it and/or modify it under the terms
-# of the GNU General Public License version 2 as published by the
-# Free Software Foundation.
+# 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.
 #
-# This library is distributed in the hope that it will be useful,
+# 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 this library; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-#
-# As a special exception, you may use this file as part of a free
-# software library without restriction.  Specifically, if other files
-# instantiate templates or use macros or inline functions from this
-# file, or you compile this file and link it with other files to
-# produce an executable, this file does not by itself cause the
-# resulting executable to be covered by the GNU General Public
-# License.  This exception does not however invalidate any other
-# reasons why the executable file might be covered by the GNU General
-# Public License.
-
+# along with Olena.  If not, see <http://www.gnu.org/licenses/>.
 
-# Remove everything between `<<lrde' and `>>'.
-# This is awful, but it's working.
+# Remove everything between `<<lrde' and `>>' (these tags being at the
+# beginning of comment line starting with `#', `//' or `dnl').
 exec perl -0777 -pi -e \
-  's/\n\s*#\s*<<lrde(.|\n)+?\n\s*#\s*>>\s*\n/\n\n/g' \
+  's,\n\s*(#|//|dnl)\s*<<lrde(.|\n)+?\n\s*(#|//|dnl)\s*>>\s*\n,\n\n,g' \
   "$@"