July 2009 - Olena-patches

4277: Add new dev tools.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* build-aux/check_source_has_test.sh, * build-aux/check_test_hierarchy.sh: rename to... * build-aux/mln_check_source_has_test, * build-aux/mln_check_test_hierarchy: ... this. * build-aux/devtools.sh: Set the path to these tools. * build-aux/mln_add_file, * build-aux/mln_check_all_hh_headers, * build-aux/mln_check_guards: new tools. Signed-off-by: Guillaume Lazzara <z(a)lrde.epita.fr> --- ChangeLog | 23 +++- build-aux/check_source_has_test.sh | 70 ---------- build-aux/check_test_hierarchy.sh | 57 -------- build-aux/devtools.sh | 9 ++ build-aux/mln_add_file | 242 +++++++++++++++++++++++++++++++++++ build-aux/mln_check_all_hh_headers | 55 ++++++++ build-aux/mln_check_guards | 134 +++++++++++++++++++ build-aux/mln_check_source_has_test | 88 +++++++++++++ build-aux/mln_check_test_hierarchy | 75 +++++++++++ 9 files changed, 625 insertions(+), 128 deletions(-) delete mode 100755 build-aux/check_source_has_test.sh delete mode 100755 build-aux/check_test_hierarchy.sh create mode 100644 build-aux/devtools.sh create mode 100755 build-aux/mln_add_file create mode 100755 build-aux/mln_check_all_hh_headers create mode 100755 build-aux/mln_check_guards create mode 100755 build-aux/mln_check_source_has_test create mode 100755 build-aux/mln_check_test_hierarchy diff --git a/ChangeLog b/ChangeLog index 16747a4..8c596b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,20 @@ -2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add new dev tools. + + * build-aux/check_source_has_test.sh, + * build-aux/check_test_hierarchy.sh: rename to... + + * build-aux/mln_check_source_has_test, + * build-aux/mln_check_test_hierarchy: ... this. + + * build-aux/devtools.sh: Set the path to these tools. + + * build-aux/mln_add_file, + * build-aux/mln_check_all_hh_headers, + * build-aux/mln_check_guards: new tools. + +2009-07-13 Guillaume Lazzara <lazzara(a)lrde.epita.fr> Improve snapshot generation. @@ -12,6 +28,11 @@ 2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: Avoid an ICE with gcc 4.0.1 on MacOs + X (leopard 10.5). + +2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * lrde-upload.sh: Call chmod before copying files. 2009-07-08 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/build-aux/check_source_has_test.sh b/build-aux/check_source_has_test.sh deleted file mode 100755 index 2c269c5..0000000 --- a/build-aux/check_source_has_test.sh +++ /dev/null @@ -1,70 +0,0 @@ -#! /bin/sh - -failed_tests=0 -all_tests=0 - -check_directory () -{ - echo "Current directories: $1 $2" - - for file in `ls $1`; do - - if [ -f ${1}/$file ]; then - ext=${file##*.} - base=${file%.*} - - if [ "$ext" = "hh" -a \ - "${base##*.}" != "spe" ]; then - test_file=${file%.hh}.cc - all_tests=$(($all_tests + 1)) - - if [ -f ${2}/$test_file ]; then - echo "\t\e[0;32mOK\e[m $file <-> $test_file" > /dev/null - else - if [ "$file" != "all.hh" -a \ - "$file" != "essential.hh" ]; then - echo "\tFAIL Test \"$test_file\" does not exist." - failed_tests=$(($failed_tests + 1)) - fi - fi - - fi - - fi - - if [ -d ${1}/$file ]; then - if [ -d ${2}/$file ]; then - echo "" - check_directory ${1}/$file ${2}/$file - else - if [ "$file" != "internal" ]; then - echo "FAIL Test directory \"${2}/$file\" does not exist." - fi - fi - fi - - done -} - -if [ $# -ne 2 ]; then - echo "Usage: ./check_test_hierarchy mln/ tests/" - exit 1 -fi - -echo "Source directory: $1" -echo "Test directory: $2" -echo "---" - -if [ -d ${1} ]; then - if [ -d ${2} ]; then - check_directory ${1} ${2} - else - echo "\e[0;31mFAIL\e[m Test directory $2 does not exist." - fi -else - echo "\e[0;31mFAIL\e[m Source directory $1 does not exist." -fi - -echo "\n=====" -echo "Missing tests: $failed_tests" - diff --git a/build-aux/check_test_hierarchy.sh b/build-aux/check_test_hierarchy.sh deleted file mode 100755 index 891ce31..0000000 --- a/build-aux/check_test_hierarchy.sh +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh - -failed_tests=0 -all_tests=0 - -check_directory () -{ - echo "Current directories: $1 $2" - for file in `ls $1`; do - - source_file=${file%.cc}.hh - if [ -f ${1}/$file ]; then - all_tests=$(($all_tests + 1)) - if [ -f ${2}/$source_file ]; then - echo "\t\e[0;32mOK\e[m $file <-> $source_file" > /dev/null - else -# FIXME: Manage exceptions. - if [ "$file" != "Makefile.am" ]; then - echo "\t\e[0;31mFAIL\e[m $source_file source does not exist." - failed_tests=$(($failed_tests + 1)) - fi - fi - fi - - if [ -d ${1}/$file ]; then - if [ -d ${2}/$file ]; then - echo "" - check_directory ${1}/$file ${2}/$file - else -# FIXME: Manage exceptions. - echo "\e[0;31mFAIL\e[m ${2}/$file source directory does not exist." - fi - fi - - done -} - -if [ $# -ne 2 ]; then - echo "Usage: ./check_test_hierarchy tests/ mln/" - exit 1 -fi - -echo "Test directory: $1" -echo "Source directory: $2" -echo "---" - -if [ -d ${1} ]; then - if [ -d ${2} ]; then - check_directory ${1} ${2} - else - echo "\e[0;31mFAIL\e[m ${1} source directory does not exist." - fi -fi - -echo "\n=====" -echo "Uncorrect tests: $failed_tests" - diff --git a/build-aux/devtools.sh b/build-aux/devtools.sh new file mode 100644 index 0000000..fc5465a --- /dev/null +++ b/build-aux/devtools.sh @@ -0,0 +1,9 @@ +export MILENA_DEVTOOLS_PATH=`dirname $0` + +if [ -d "$PWD/$MILENA_DEVTOOLS_PATH" ]; then + export PATH=$PWD/$MILENA_DEVTOOLS_PATH:$PATH +elif [ -d "$MILENA_DEVTOOLS_PATH" ] && [ -z "`echo $MILENA_DEVTOOLS_PATH | cut -d '/' -f 1`" ]; then + export PATH=$MILENA_DEVTOOLS_PATH:$PATH +else + echo "Cannot guess Milena's devtools path. Please set MILENA_DEVTOOLS_PATH variable manually." +fi diff --git a/build-aux/mln_add_file b/build-aux/mln_add_file new file mode 100755 index 0000000..f92801f --- /dev/null +++ b/build-aux/mln_add_file @@ -0,0 +1,242 @@ +#!/bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena 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. +# +# This library 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, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +# Usage: ./new_header.sh <mln/path/header.hh> +# +# Add a new header in milena and include it in all.hh if exists. +# + + +if [ $# -ne 1 ] && [ $# -ne 2 ]; then + echo "Usage: `basename $0` [--with-test] <mln/path/headername.hh>" + exit 1 +fi + + +with_test=0 +if [ "$1" == "--with-test" ]; then + with_test=1; + shift +fi + +output_dir=`dirname $1` + + +add_license() +{ + cat >> $1 <<EOF +// Copyright (C) `date +'%Y'` 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/>. +// +// As a special exception, you may use this file as part of a free +// software project 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. + +EOF + +} + + +add_doxygen_headers() +{ + cat >> $1 <<EOF + +/// \\file +/// +/// FIXME. + + +EOF +} + +prepare_file() +{ + + guards=`echo "$1" | tr "[a-z]" "[A-Z]" | sed -e 's/[\/\.]/_/g'` + + # Add licence and guards. + add_license $1 + + cat >> $1 <<EOF +#ifndef $guards +# define $guards +EOF + + add_doxygen_headers $1 + +# opening sub namespaces + dir=`echo $output_dir | cut -d '/' -f 1` + indent="" + i=1 + + while ! [ -z "$dir" ]; do + cat >> $1 <<EOF +${indent}namespace $dir +${indent}{ + +EOF + + indent="$indent " + i=$(($i + 1)) + dir=`echo $output_dir | cut -d '/' -f $i` + done + indent=`echo "$indent" | sed -e 's/ $//'` + + + +# Adding few comments and MLN_INCLUDE_ONLY guards. + cat >> $1 <<EOF +${indent}// Add facade declaration here. + + +# ifndef MLN_INCLUDE_ONLY + + + +${indent}// Implement the facade here. + + + +# endif // ! MLN_INCLUDE_ONLY + +EOF + + + +# closing sub namespaces + path=`dirname $1` + while [ "$path" != "." ]; do + namespace=`echo $path | sed -e 's/\//::/g'` + + cat >> $1 <<EOF +${indent}} // end of namespace $namespace + +EOF + + path=`dirname $path` + indent=`echo "$indent" | sed -e 's/ $//'` + done + + +# End of file. +cat >> $1 <<EOF +#endif // ! $guards +EOF + +} + +add_to_all_hh() +{ + if ! [ -f "$output_dir/all.hh" ]; then + echo "Warning: $output_dir/all.hh does not exist, you may want to \ +create it." 1>&2 + return + fi + + if ! [ -z "`grep "# include <$1>" $output_dir/all.hh`" ]; then + echo "File already included in $output_dir/all.hh" 1>&2 + return + fi + + line=`grep -nE '^#endif // ! ' $output_dir/all.hh | tail -n 1 | cut -d ':' -f 1` + line=$(($line - 1)) + sed -i "${line}i\# include <$1> +" $output_dir/all.hh +} + +add_to_test_makefile() +{ + test_dir=`dirname $1` + test_name=`basename $1` + test_bname=`basename $test_name .cc` + + if ! [ -f "$test_dir/Makefile.am" ]; then + echo "Warning: $test_dir/Makefile.am does not exist, you may want to \ +create it." 1>&2 + return + fi + + if ! [ -z "`grep "$test_name" $test_dir/Makefile.am`" ]; then + echo "File already added to $test_dir/Makefile.am" 1>&2 + return + fi + + line=`grep -nE "_SOURCES = " $test_dir/Makefile.am | tail -n 1 | cut -d ':' -f 1` + line=$(($line + 1)) + sed -i "${line}i${test_bname}_SOURCES = $test_name +" $test_dir/Makefile.am + + line=`grep -nE '\\\' $test_dir/Makefile.am | grep -B 1 'CLEANFILES = ' | head -n 1 | cut -d ':' -f 1` + line=$(($line + 1)) + sed -i "${line}i\\\t${test_bname} \\\\" $test_dir/Makefile.am + +} + + +add_test() +{ + test_file=tests/`echo $1 | sed -e 's,mln/,,g' | sed -e 's,\.hh,.cc,g'` + + add_license $test_file + add_doxygen_headers $test_file + + cat >> $test_file <<EOF + +#include <$1> + +int main() +{ + using namespace mln; + + +} +EOF + + add_to_test_makefile $test_file +} + + +touch $1 +prepare_file $1 +add_to_all_hh $1 + + +if [ $with_test -eq 1 ]; then + add_test $1 +fi + diff --git a/build-aux/mln_check_all_hh_headers b/build-aux/mln_check_all_hh_headers new file mode 100755 index 0000000..80d394d --- /dev/null +++ b/build-aux/mln_check_all_hh_headers @@ -0,0 +1,55 @@ +#!/bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena 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. +# +# This library 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, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +if [ $# -ne 2 ]; then + echo "Usage: `basename $0` <path to mln> <output_log_dir>" 1>&2 + exit 1; +fi + + +path_to_mln=`dirname $1` + +echo "" > $2/missing_all_hh.log +echo "" > $2/not_included_in_all_hh.log + +cd $path_to_mln + +# Checking local all.hh +for dir in `find mln -mindepth 1 -type d`; do + + if ! [ -e "$dir/all.hh" ]; then + echo "WARNING: no all.hh header in $dir" >&2 + echo "$dir/all.hh" >> $2/missing_all_hh.log + continue + fi + + for f in `ls $dir/*.hh | grep -vE '*.spe.hh'`; do + if [ "`basename $f`" != "all.hh" ]; then + result=`grep "include <$f>" $dir/all.hh` + if [ -z "$result" ]; then + echo " WARNING $f is not included in $dir/all.hh" >&2 + echo "$f" >> $2/not_included_in_all_hh.log + fi + fi + done + +done + +#cd - diff --git a/build-aux/mln_check_guards b/build-aux/mln_check_guards new file mode 100755 index 0000000..3a2a95b --- /dev/null +++ b/build-aux/mln_check_guards @@ -0,0 +1,134 @@ +#! /usr/bin/env perl +# +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena 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. +# +# This library 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, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. +# +# +# check_guards.pl: this file comes from the Vaucanson project. +# +# Usage: ./mln_check_guards <file1> <file2> .... +# +# Check guards and fix them if needed. + +use warnings; +use strict; + +my $boundupper = "#ifndef %CPPNAME% +# define %CPPNAME%"; +my $boundlower = "#endif // ! %CPPNAME%"; + +sub check_guards ($) +{ + my $fname = $_[0]; + + # The short name, without the path from builddir to srcdir. + $_ = $fname; + s,^.*milena/mln/,,g; + my $shortname = $_; + s,.*/,,g; + my $basename = $_; + + $_ = $shortname; + s,^[./]*,,g; + s,^,MLN_,g; + s,[^a-zA-Z0-9],_,g; + y/[a-z]./[A-Z]_/; + my $cppname = $_; + + $_ = $boundupper; + s,%BASENAME%,$basename,g; + s,%CPPNAME%,$cppname,g; + my $xboundupper = $_; + + $_ = $boundlower; + s,%BASENAME%,$basename,g; + s,%CPPNAME%,$cppname,g; + my $xboundlower = $_; + + + open(FILE, "<", $fname) or die "cannot open $fname: $!\n"; + + my $content; + while (<FILE>) + { + $content .= $_; + } + close FILE; + + # Prepare the new contents. + $_ = $content; + + # Kill trailing spaces. +# s/[ \t]+$//mg; + +# s,([ \t\n])*$,\n,sg; + + # Adjust cpp guards. + if (/\# *ifndef[^\n]*\n[\n\t ]*\# *define[^\n]*\n/s) + { + s,\# *ifndef[^\n]*\n[\n\t ]*\# *define[^\n]*\n,$xboundupper\n,sg; + } + + if (/\# *endif[^\n]*\n[\n\t ]*$/s) + { + s,\# *endif[^\n]*\n[\n\t ]*$,$xboundlower\n,sg; + } + + # Make sure we have a unique ending eol. + s/\n+\z/\n/; + + $content = $_; + + my @mv = ("mv", "-f", "$fname", "$fname.bak"); + system(@mv) == 0 or die "system @mv failed: $?\n"; + + open(FILE, ">", $fname) or die "cannot open $fname for writing: $!\n"; + print FILE $content; +} + +if ($#ARGV == -1) +{ + print "mln_check_guards <file1> <file2> ...\n"; + print "----\n"; + print "Check guards in a list of files and fix them if needed.\n"; + exit 1; +} + +foreach my $file (@ARGV) +{ + check_guards ($file); +} + +exit 0; + +### Setup "GNU" style for perl-mode and cperl-mode. +## Local Variables: +## perl-indent-level: 2 +## perl-continued-statement-offset: 2 +## perl-continued-brace-offset: 0 +## perl-brace-offset: 0 +## perl-brace-imaginary-offset: 0 +## perl-label-offset: -2 +## cperl-indent-level: 2 +## cperl-brace-offset: 0 +## cperl-continued-brace-offset: 0 +## cperl-label-offset: -2 +## cperl-extra-newline-before-brace: t +## cperl-merge-trailing-else: nil +## cperl-continued-statement-offset: 2 +## End: diff --git a/build-aux/mln_check_source_has_test b/build-aux/mln_check_source_has_test new file mode 100755 index 0000000..3b9e564 --- /dev/null +++ b/build-aux/mln_check_source_has_test @@ -0,0 +1,88 @@ +#! /bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena 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. +# +# This library 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, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +failed_tests=0 +all_tests=0 + +check_directory () +{ + echo "Current directories: $1 $2" + + for file in `ls $1`; do + + if [ -f ${1}/$file ]; then + ext=${file##*.} + base=${file%.*} + + if [ "$ext" = "hh" -a \ + "${base##*.}" != "spe" ]; then + test_file=${file%.hh}.cc + all_tests=$(($all_tests + 1)) + + if [ -f ${2}/$test_file ]; then + echo "\t\e[0;32mOK\e[m $file <-> $test_file" > /dev/null + else + if [ "$file" != "all.hh" -a \ + "$file" != "essential.hh" ]; then + echo "\tFAIL Test \"$test_file\" does not exist." + failed_tests=$(($failed_tests + 1)) + fi + fi + + fi + + fi + + if [ -d ${1}/$file ]; then + if [ -d ${2}/$file ]; then + echo "" + check_directory ${1}/$file ${2}/$file + else + if [ "$file" != "internal" ]; then + echo "FAIL Test directory \"${2}/$file\" does not exist." + fi + fi + fi + + done +} + +if [ $# -ne 2 ]; then + echo "Usage: ./check_test_source_has_test mln/ tests/" + exit 1 +fi + +echo "Source directory: $1" +echo "Test directory: $2" +echo "---" + +if [ -d ${1} ]; then + if [ -d ${2} ]; then + check_directory ${1} ${2} + else + echo "\e[0;31mFAIL\e[m Test directory $2 does not exist." + fi +else + echo "\e[0;31mFAIL\e[m Source directory $1 does not exist." +fi + +echo "\n=====" +echo "Missing tests: $failed_tests" + diff --git a/build-aux/mln_check_test_hierarchy b/build-aux/mln_check_test_hierarchy new file mode 100755 index 0000000..91dddcb --- /dev/null +++ b/build-aux/mln_check_test_hierarchy @@ -0,0 +1,75 @@ +#! /bin/sh + +# Copyright (C) 2009 EPITA Research and Development Laboratory +# (LRDE) +# +# This file is part of the Milena 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. +# +# This library 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, 51 Franklin Street, Fifth Floor, +# Boston, MA 02111-1307, USA. + +failed_tests=0 +all_tests=0 + +check_directory () +{ + echo "Current directories: $1 $2" + for file in `ls $1`; do + + source_file=${file%.cc}.hh + if [ -f ${1}/$file ]; then + all_tests=$(($all_tests + 1)) + if [ -f ${2}/$source_file ]; then + echo "\t\e[0;32mOK\e[m $file <-> $source_file" > /dev/null + else +# FIXME: Manage exceptions. + if [ "$file" != "Makefile.am" ]; then + echo "\t\e[0;31mFAIL\e[m $source_file source does not exist." + failed_tests=$(($failed_tests + 1)) + fi + fi + fi + + if [ -d ${1}/$file ]; then + if [ -d ${2}/$file ]; then + echo "" + check_directory ${1}/$file ${2}/$file + else +# FIXME: Manage exceptions. + echo "\e[0;31mFAIL\e[m ${2}/$file source directory does not exist." + fi + fi + + done +} + +if [ $# -ne 2 ]; then + echo "Usage: ./check_test_hierarchy tests/ mln/" + exit 1 +fi + +echo "Test directory: $1" +echo "Source directory: $2" +echo "---" + +if [ -d ${1} ]; then + if [ -d ${2} ]; then + check_directory ${1} ${2} + else + echo "\e[0;31mFAIL\e[m ${1} source directory does not exist." + fi +fi + +echo "\n=====" +echo "Uncorrect tests: $failed_tests" + -- 1.5.6.5

1 0

4276: Improve snapshot generation.
by Guillaume Lazzara 13 Jul '09

13 Jul '09

* Makefile.am: Add new rule 'snapshot'. * lrde-upload.sh: Make the snapshot names more explicit. --- ChangeLog | 8 ++++++++ Makefile.am | 18 ++++++++++++++++++ lrde-upload.sh | 6 +++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9ed3dfc..16747a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Improve snapshot generation. + + * Makefile.am: Add new rule 'snapshot'. + + * lrde-upload.sh: Make the snapshot names more explicit. + 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am: Add a FIXME. diff --git a/Makefile.am b/Makefile.am index 8982f66..f5646f0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,4 +127,22 @@ dist-hook: autoreconf -f -v -i; \ find . -name autom4te.cache | xargs rm -rf \ ) + + +# Set the package version to olena-x.x-snapshot-dd-mm-yy +# +# Do not check NEWS file (this is not a release so there is no +# entries in this file for this package). +# +snapshot: + current_date=`date +'%d-%m-%y'` \ + && sed -e "s/^$AC_INIT(\[Olena\],$ \[$[\.[:alnum:]]*$$-snapshot-.*-[[:alnum:]]*$*\], $.*$/\1 [\2-snapshot-$$current_date], \4/g" \ + -e 's/ check-news / /g' \ + $(srcdir)/configure.ac > $(srcdir)/configure.ac.tmp \ + && cp -f $(srcdir)/configure.ac $(srcdir)/configure.ac.old \ + && cp -f $(srcdir)/configure.ac.tmp $(srcdir)/configure.ac \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && mv -f $(srcdir)/configure.ac.old $(srcdir)/configure.ac + #>> +# && $(srcdir)/build-aux/lrde-upload.sh \ No newline at end of file diff --git a/lrde-upload.sh b/lrde-upload.sh index 039889b..31cd16d 100755 --- a/lrde-upload.sh +++ b/lrde-upload.sh @@ -13,7 +13,7 @@ DEST_DOC=$DEST/doc/milena # Retrieve the package version VERSION=`autoconf --trace='AC_INIT:$2'` CURRENT_DATE=`date +'%d_%m_%y'` -REV=$VERSION-$CURRENT_DATE +REV=$VERSION-snapshot-$CURRENT_DATE # Always do "cp then mv" when uploading the file, so that someone # cannot start a download why the destination file is incomplete. @@ -21,8 +21,8 @@ REV=$VERSION-$CURRENT_DATE # Upload the tarball mkdir -p $DEST -# Delete tarballs older than 2 days.. -find $DEST -maxdepth 1 -type f -mtime +2 -exec rm -f {} \; +# Delete tarballs older than 2 days. +find $DEST -maxdepth 1 -type f -mtime +2 -name 'olena-*-snapshot-*' -exec rm -f {} \; # tar.gz cp -f olena-$VERSION.tar.gz $DEST/olena-$REV.tar.gz.tmp -- 1.5.6.5

1 0

[PATCH 10/10] Do not use Doxygen-style comments within an implementation.
by Roland Levillain 13 Jul '09

13 Jul '09

* mln/geom/rotate.hh (mln::geom::rotate(const Image<I>&, double, const Ext&)): Here. Be more specific. --- milena/ChangeLog | 8 ++++++++ milena/mln/geom/rotate.hh | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 6d7a281..7fe6681 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Do not use Doxygen-style comments within an implementation. + + * mln/geom/rotate.hh + (mln::geom::rotate(const Image<I>&, double, const Ext&)): Here. + Be more specific. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk, tests/unit_test/unit-tests.mk: Regen. 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index f53359b..6cb6773 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -165,8 +165,9 @@ namespace mln mln_concrete(I) rotate(const Image<I>& input, double angle, const Ext& extension) { - /// Old versions of GCC do not parse correctly `mln_box(I)()'. - /// Hence, we need to typedef mln_box(I) first. + // Old versions of GCC (including Apple GCC 4.0.1) do not parse + // correctly `mln_box(I)()'. Hence, we need to typedef + // `mln_box(I)' first. typedef mln_box(I) box_t; return rotate(input, angle, extension, box_t()); } -- 1.6.1.2

1 0

[PATCH 09/10] Update milena/doc/.gitignore.
by Roland Levillain 13 Jul '09

13 Jul '09

--- milena/doc/.gitignore | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 63de7da..277fe84 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -6,8 +6,16 @@ /user /ref_guide/ref_guide.haux /ref_guide/ref_guide.hh +/ref_guide/ref_guide.hh-e /ref_guide/ref_guide.html /ref_guide/ref_guide.htoc +/ref_guide/ref_guide.pdf /tutorial/tutorial.haux /tutorial/tutorial.hh +/tutorial/tutorial.hh-e /tutorial/tutorial.html +/tutorial/tutorial.pdf +/user-refman-html +/user-refman.pdf +/white_paper/white_paper_html/index.html +/white_paper/white_paper.pdf -- 1.6.1.2

1 0

[PATCH 08/10] Makefile.am: Add a FIXME.
by Roland Levillain 13 Jul '09

13 Jul '09

--- ChangeLog | 4 ++++ Makefile.am | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0353a6..9ed3dfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + * Makefile.am: Add a FIXME. + 2009-07-09 Guillaume Lazzara <lazzara(a)lrde.epita.fr> * lrde-upload.sh: Call chmod before copying files. diff --git a/Makefile.am b/Makefile.am index 9cd8b57..8982f66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -96,6 +96,21 @@ LRDE_NODIST_FILES = \ $(distdir)/milena/tests/value/stack.cc \ $(distdir)/scribo +## FIXME: Running `build-aux/build_unit_test.sh' just to update +## `milena/tests/unit_test/unit-tests.mk' is overkill: +## +## 1. It recreates *all* the sources (more than 1200 `.cc' files!). +## => We should just regen `unit-tests.mk', not the `.cc' files. +## +## 2. It visits (almost) all the directories and files under +## milena/mln/ (which admittedly a smaller issue compared to the +## previous one) +## => Prune `unit-tests.mk' instead of regenerating it. The +## simplest solution is probably to equip `unit-tests.mk' in the +## first place with `<<lrde'/`>>' tags, then prune it with +## dist-strip. +## + # Do not distribute parts tagged `lrde' (see build-aux/strip-lrde). dist-hook: for f in $(LRDE_STRIPPED_DIST_FILES); do \ -- 1.6.1.2

1 0

[PATCH 07/10] src/preprocessing/Makefile.am: Remove a trailing blank line.
by Roland Levillain 13 Jul '09

13 Jul '09

--- scribo/ChangeLog | 4 ++++ scribo/src/preprocessing/Makefile.am | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 22f4c02..ba7f8c1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + * src/preprocessing/Makefile.am: Remove a trailing blank line. + 2009-07-08 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Bug fix. diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index e0c0d03..f6d877c 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -23,4 +23,3 @@ bin_PROGRAMS = \ unskew unskew_SOURCES = unskew.cc - -- 1.6.1.2

1 0

[PATCH 06/10] Fix the Swilena distribution.
by Roland Levillain 13 Jul '09

13 Jul '09

* python/Makefile.am (nodist__dynamic_image2d_la_SOURCES): Add dynamic_image2d-wrap.h. (CLEANFILES): Add closing.pgm, closing_area.pgm, dilation.pgm, erosion.pgm, gradient.pgm, gradient_external.pgm, gradient_internal.pgm, opening.pgm, opening_area.pgm and segm.pgm. --- swilena/ChangeLog | 10 ++++++++++ swilena/python/Makefile.am | 19 ++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 945c8b9..3c34236 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Swilena distribution. + + * python/Makefile.am (nodist__dynamic_image2d_la_SOURCES): Add + dynamic_image2d-wrap.h. + (CLEANFILES): Add closing.pgm, closing_area.pgm, dilation.pgm, + erosion.pgm, gradient.pgm, gradient_external.pgm, + gradient_internal.pgm, opening.pgm, opening_area.pgm and segm.pgm. + 2009-06-10 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am (wrappers): Add config.i. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 24eff65..aec8a05 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -176,7 +176,11 @@ nodist_python_PYTHON += image2d_int_u8.py ## dynamic_image2d. pyexec_LTLIBRARIES += _dynamic_image2d.la -nodist__dynamic_image2d_la_SOURCES = dynamic_image2d-wrap.cc +# Swig also generates a header for this module, since it makes use of +# directors. +nodist__dynamic_image2d_la_SOURCES = \ + dynamic_image2d-wrap.h \ + dynamic_image2d-wrap.cc _dynamic_image2d_la_LIBADD = $(AM_LIBADD) CLEANFILES += $(nodist__dynamic_image2d_la_SOURCES) dynamic_image2d.py dynamic_image2d.py[co] ## Include the dependency files. Copied from Automake's generated @@ -232,3 +236,16 @@ TESTS = \ image2d-misc.py morpho-fun.py morpho-segm.py dynamic-image2d-misc.py EXTRA_DIST += $(TESTS) + +# Images generated by tests. +CLEANFILES += \ + closing.pgm \ + closing_area.pgm \ + dilation.pgm \ + erosion.pgm \ + gradient.pgm \ + gradient_external.pgm \ + gradient_internal.pgm \ + opening.pgm \ + opening_area.pgm \ + segm.pgm -- 1.6.1.2

1 0

[PATCH 05/10] headers.mk, tests/unit_test/unit-tests.mk: Regen.
by Roland Levillain 13 Jul '09

13 Jul '09

--- milena/ChangeLog | 4 ++++ milena/headers.mk | 1 + milena/tests/unit_test/unit-tests.mk | 2 ++ 3 files changed, 7 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index dfe9c00..6d7a281 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk, tests/unit_test/unit-tests.mk: Regen. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Distribute missing meshes. * mesh/Makefile.am (more_meshes): New variable. diff --git a/milena/headers.mk b/milena/headers.mk index 23c2368..4af9e99 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -667,6 +667,7 @@ mln/labeling/background.hh \ mln/labeling/blobs.hh \ mln/labeling/colorize.hh \ mln/labeling/compute.hh \ +mln/labeling/compute_image.hh \ mln/labeling/essential.hh \ mln/labeling/fill_holes.hh \ mln/labeling/flat_zones.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index 9751e03..00d39de 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -683,6 +683,7 @@ mln_labeling_background \ mln_labeling_blobs \ mln_labeling_colorize \ mln_labeling_compute \ +mln_labeling_compute_image \ mln_labeling_essential \ mln_labeling_fill_holes \ mln_labeling_flat_zones \ @@ -1943,6 +1944,7 @@ mln_labeling_background_SOURCES = mln_labeling_background.cc mln_labeling_blobs_SOURCES = mln_labeling_blobs.cc mln_labeling_colorize_SOURCES = mln_labeling_colorize.cc mln_labeling_compute_SOURCES = mln_labeling_compute.cc +mln_labeling_compute_image_SOURCES = mln_labeling_compute_image.cc mln_labeling_essential_SOURCES = mln_labeling_essential.cc mln_labeling_fill_holes_SOURCES = mln_labeling_fill_holes.cc mln_labeling_flat_zones_SOURCES = mln_labeling_flat_zones.cc -- 1.6.1.2

1 0

[PATCH 04/10] Distribute missing meshes.
by Roland Levillain 13 Jul '09

13 Jul '09

* mesh/Makefile.am (more_meshes): New variable. (dist_mesh_DATA): Append $(more_meshes). --- milena/ChangeLog | 7 +++++++ milena/mesh/Makefile.am | 7 +++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 527b08f..dfe9c00 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Distribute missing meshes. + + * mesh/Makefile.am (more_meshes): New variable. + (dist_mesh_DATA): Append $(more_meshes). + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Fix the installation of the Doxygen HTML user documentation. * doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am index a8baaa5..e023f4d 100644 --- a/milena/mesh/Makefile.am +++ b/milena/mesh/Makefile.am @@ -41,6 +41,13 @@ meshes = \ $(srcdir)/tetrahedron.off dist_mesh_DATA += $(meshes) +# These meshes does not have curvature-valued versions. +more_meshes = \ + one-triangle.off \ + two-triangles.off \ + three-triangles.off +dist_mesh_DATA += $(more_meshes) + ## ------------------------------------ ## ## Pseudo-inverse curvature of meshes. ## ## ------------------------------------ ## -- 1.6.1.2

1 0

[PATCH 03/10] Fix the installation of the Doxygen HTML user documentation.
by Roland Levillain 13 Jul '09

13 Jul '09

* doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... (EXTRA_DIST): ...here. (install-data-local, uninstall-local): New rules. Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>. --- milena/ChangeLog | 9 +++++++++ milena/doc/Makefile.am | 27 ++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 223d1d8..527b08f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Fix the installation of the Doxygen HTML user documentation. + + * doc/Makefile.am (dist_doc_DATA): Move $(USER_REFMAN_HTML)... + (EXTRA_DIST): ...here. + (install-data-local, uninstall-local): New rules. + Suggested by Alexandre Duret-Luz <adl(a)lrde.epita.fr>. + +2009-07-13 Roland Levillain <roland(a)lrde.epita.fr> + Build the reference documentation in the source dir. * doc/Makefile.am (USER_REFMAN_PDF): Set to user-refman.pdf. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index a7d4647..1580c1f 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -238,9 +238,30 @@ include $(srcdir)/figures/figures.mk include $(srcdir)/outputs/outputs.mk -dist_doc_DATA = \ - $(USER_REFMAN_HTML) \ - $(USER_REFMAN_PDF) +dist_doc_DATA = $(USER_REFMAN_PDF) + +# Installing a directory located in the source dir is not supported by +# Automake by default, so we cannot add `USER_REFMAN_HTML' to +# `dist_doc_DATA'. The following two rules are are workaround from +# the Vaucanson project. +EXTRA_DIST += $(USER_REFMAN_HTML) + +# We install by hand, otherwise Automake produces "install .../srcdoc +# .../srcdoc", which installs our dir into the previous one, instead +# of replacing it. +install-data-local: + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + $(mkdir_p) $(DESTDIR)$(htmldir) + cp -r $(srcdir)/$(USER_REFMAN_HTML) $(DESTDIR)$(htmldir) +## Try GNU chmod's X mode before resorting to something slower but +## more standard. + chmod -R a+rX $(DESTDIR)$(htmldir) || \ + find $(DESTDIR)$(htmldir) $ -type d -a -exec chmod a+rx {} \; $ \ + -o -exec chmod a+r {} \; + +uninstall-local: + chmod -R 700 $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) + rm -rf $(DESTDIR)$(htmldir)/$(USER_REFMAN_HTML) EXTRA_DIST += \ -- 1.6.1.2

1 0