- Olena-patches

last-svn-commit-140-g24633b4 Fix the Milena installation.
by Roland Levillain 22 Apr '10

22 Apr '10

* Makefile.am (nobase_include_HEADERS): Move mln/version.hh... (nobase_nodist_include_HEADERS): ...here. --- milena/ChangeLog | 7 +++++++ milena/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0a013de..c54e37f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-04-22 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the Milena installation. + + * Makefile.am (nobase_include_HEADERS): Move mln/version.hh... + (nobase_nodist_include_HEADERS): ...here. + 2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> Fix the Milena distribution. diff --git a/milena/Makefile.am b/milena/Makefile.am index 9bec15c..6c6a420 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -81,7 +81,7 @@ $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh nodist-he include $(srcdir)/headers.mk # Generated by configure from mln/version.hh.in. -nobase_include_HEADERS += mln/version.hh +nobase_nodist_include_HEADERS = mln/version.hh imgdir = $(pkgdatadir)/images dist_img_DATA = \ -- 1.5.6.5

1 0

branch next updated: last-svn-commit-139-g8c7a180
by git＠lrde.epita.fr 21 Apr '10

21 Apr '10

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 8c7a1809a808addffc3ae397f0d0f1e21d242fbc (commit) via c8a3721c86de58f063888f0aeedd6197530d1ce0 (commit) from 8e148a2f3b871d60de12d627f02fc01ed7ac4331 (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 ----------------------------------------------------------------- 8c7a180 Fix the Scribo distribution. c8a3721 Fix the Milena distribution. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 9 +++++++++ milena/apps/papers/levillain.09.ismm/Makefile.am | 4 ++-- milena/tests/unit_test/Makefile.am | 5 ++++- scribo/ChangeLog | 7 +++++++ scribo/tests/unit_test/Makefile.am | 2 ++ 5 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-139-g8c7a180 Fix the Scribo distribution.
by Roland Levillain 21 Apr '10

21 Apr '10

* tests/unit_test/Makefile.am (EXTRA_DIST): Add build_unit_test.sh and disabled_tests. --- scribo/ChangeLog | 7 +++++++ scribo/tests/unit_test/Makefile.am | 2 ++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 824951c..bc2b9d3 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,12 @@ 2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix the Scribo distribution. + + * tests/unit_test/Makefile.am (EXTRA_DIST): + Add build_unit_test.sh and disabled_tests. + +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Have Scribo's unit tests pass. * tests/unit_test/disabled_tests: diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 16d58b8..0d3a591 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -19,6 +19,8 @@ include $(top_srcdir)/scribo/tests/tests.mk +EXTRA_DIST = build_unit_test.sh disabled_tests + # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: -- 1.5.6.5

1 0

last-svn-commit-138-gc8a3721 Fix the Milena distribution.
by Roland Levillain 21 Apr '10

21 Apr '10

* apps/papers/levillain.09.ismm/Makefile.am (data_DATA): Move seeds.pgm and m283-c.off... (dist_data_DATA): ...here. * tests/unit_test/Makefile.am (EXTRA_DIST): Add disabled_tests. --- milena/ChangeLog | 9 +++++++++ milena/apps/papers/levillain.09.ismm/Makefile.am | 4 ++-- milena/tests/unit_test/Makefile.am | 5 ++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index da8264d..0a013de 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix the Milena distribution. + + * apps/papers/levillain.09.ismm/Makefile.am + (data_DATA): Move seeds.pgm and m283-c.off... + (dist_data_DATA): ...here. + * tests/unit_test/Makefile.am (EXTRA_DIST): Add disabled_tests. + +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Fix Milena's unit tests generator's dependencies. * tests/unit_test/Makefile.am ($(srcdir)/unit-tests.mk): diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index b01c662..91be54c 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -31,10 +31,10 @@ complex_SOURCES = complex.cc # Input images. # FIXME: Move them to milena/img/? -data_DATA = seeds.pgm m283-c.off +dist_data_DATA = seeds.pgm m283-c.off # Output images. -data_DATA += lena-s.ppm graph-s.png m283-s.off +data_DATA = lena-s.ppm graph-s.png m283-s.off lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT) ./image2d$(EXEEXT) $< 1000 $@ diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index f7588b6..860b113 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -19,6 +20,8 @@ include $(top_srcdir)/milena/tests/tests.mk +EXTRA_DIST = disabled_tests + # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: -- 1.5.6.5

1 0

branch next updated: last-svn-commit-137-g8e148a2
by git＠lrde.epita.fr 21 Apr '10

21 Apr '10

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 8e148a2f3b871d60de12d627f02fc01ed7ac4331 (commit) via f1a7757aa73b3bac1c64ecb1e124633a055f4752 (commit) via 153c751d590f7825fb11427de07c890ad3dd95eb (commit) via afefd84215fa6e4c673fd0b1a3a8311ac8ea82ff (commit) from 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (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 ----------------------------------------------------------------- 8e148a2 Fix Milena's unit tests generator's dependencies. f1a7757 Have Scribo's unit tests pass. 153c751 Catch up with the new interface of Scribo's unit tests generator. afefd84 Update Scribo's unit tests generator. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 ++++ bootstrap | 5 +++- milena/ChangeLog | 7 +++++ milena/tests/unit_test/Makefile.am | 2 +- scribo/ChangeLog | 20 +++++++++++++ scribo/tests/unit_test/Makefile.am | 18 ++++++++---- scribo/tests/unit_test/build_unit_test.sh | 42 ++++++++++++++++++++-------- scribo/tests/unit_test/disabled_tests | 5 +++ scribo/tests/unit_test/unit-tests.mk | 8 +----- 9 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 scribo/tests/unit_test/disabled_tests hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch fix-tests deleted: last-svn-commit-133-g6dd7d24
by git＠lrde.epita.fr 21 Apr '10

21 Apr '10

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 fix-tests has been deleted was 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e ----------------------------------------------------------------------- 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&). ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-133-g6dd7d24
by git＠lrde.epita.fr 21 Apr '10

21 Apr '10

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 6dd7d249daae01e8ed82f836aa2f88c4a5833d8e (commit) from 68b860f7623d03ea9815fd652300bee661351bdc (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 ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 7 +++++++ milena/mln/accu/compute.hh | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-137-g8e148a2 Fix Milena's unit tests generator's dependencies.
by Roland Levillain 21 Apr '10

21 Apr '10

* tests/unit_test/Makefile.am ($(srcdir)/unit-tests.mk): Depend on disabled_tests. --- milena/ChangeLog | 7 +++++++ milena/tests/unit_test/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 8485b4f..da8264d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + + Fix Milena's unit tests generator's dependencies. + + * tests/unit_test/Makefile.am ($(srcdir)/unit-tests.mk): + Depend on disabled_tests. + 2010-04-13 Roland Levillain <roland(a)lrde.epita.fr> Fix accu::compute(const Meta_Accumulator<A>, const Image<I>&). diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 5b9ef8f..f7588b6 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -34,7 +34,7 @@ regen-am: # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh +$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests cd $(top_srcdir) \ && ./build-aux/build_unit_test.sh \ milena/mln \ -- 1.5.6.5

1 0

last-svn-commit-134-gafefd84 Update Scribo's unit tests generator.
by Roland Levillain 21 Apr '10

21 Apr '10

* tests/unit_test/build_unit_test.sh: Catch up with Milena's version of this script. * tests/unit_test/Makefile.am (regen-am, $(srcdir)/unit-tests.mk): Adjust. * tests/unit_test/disabled_tests: New. --- scribo/ChangeLog | 10 +++++++ scribo/tests/unit_test/Makefile.am | 18 ++++++++---- scribo/tests/unit_test/build_unit_test.sh | 42 ++++++++++++++++++++-------- scribo/tests/unit_test/disabled_tests | 2 + 4 files changed, 54 insertions(+), 18 deletions(-) create mode 100644 scribo/tests/unit_test/disabled_tests diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2375a50..af5c670 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + + Update Scribo's unit tests generator. + + * tests/unit_test/build_unit_test.sh: Catch up with Milena's + version of this script. + * tests/unit_test/Makefile.am (regen-am, $(srcdir)/unit-tests.mk): + Adjust. + * tests/unit_test/disabled_tests: New. + 2010-04-09 Roland Levillain <roland(a)lrde.epita.fr> Help g++ 4.1 compile Scribo. diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 7202de6..16d58b8 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -22,8 +22,11 @@ include $(top_srcdir)/scribo/tests/tests.mk # Regen files. include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: - cd $(srcdir) \ - && ./build_unit_test.sh $(abs_top_srcdir)/scribo . + cd $(top_srcdir) \ + && scribo/tests/unit_test/build_unit_test.sh \ + scribo \ + scribo/tests/unit_test \ + scribo/tests/unit_test/disabled_tests # FIXME: Change build_unit_test.sh so that the action looks like this: # @@ -31,9 +34,12 @@ regen-am: # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -$(srcdir)/unit-tests.mk: $(srcdir)/build_unit_test.sh - cd $(srcdir) \ - && ./build_unit_test.sh $(abs_top_srcdir)/scribo . +$(srcdir)/unit-tests.mk: build_unit_test.sh disabled_tests + cd $(top_srcdir) \ + && scribo/tests/unit_test/build_unit_test.sh \ + scribo \ + scribo/tests/unit_test \ + scribo/tests/unit_test/disabled_tests include $(srcdir)/unit-tests.mk diff --git a/scribo/tests/unit_test/build_unit_test.sh b/scribo/tests/unit_test/build_unit_test.sh index d4af384..415ff95 100755 --- a/scribo/tests/unit_test/build_unit_test.sh +++ b/scribo/tests/unit_test/build_unit_test.sh @@ -1,5 +1,24 @@ #! /bin/sh +# Copyright (C) 2009, 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/>. + +## FIXME: Unify with build-aux/build_unit_test.sh. + ## FIXME: Don't use `echo -n', as echo's options are not portable. ## ## http://www.gnu.org/software/autoconf/manual/html_node/Limitations-of-Builti… @@ -11,19 +30,18 @@ ECHO_N=printf # Use the C locale to have a deterministic sort. export LC_ALL=C -test $# -eq 2 || { echo "Usage: $0 <scribo path> <output path>" && exit 1; } +test $# -eq 3 || { echo "Usage: $0 <scanned dir> <output_dir> <disabled_tests>" && exit 1; } + +scanned_dir=$1 +output_dir=$2 +disabled_tests=$3 -## FIXME: Ouch! Using `find' properly can probably save us some pipes, -## forks and characters here. -HEADERS=`find $1 -name "*.hh" \ - | grep -vE "*.spe.hh" \ - | grep -v "recognition" \ - | grep -v "demo" \ - | sort \ - | sed -e 's/.*\/scribo\/$.*$/scribo\/\1/g' \ - | sed 's/\.\.\/\.\.\///g'` +HEADERS=$(find $scanned_dir -type f -name "*.hh" \ + | sort \ + | sed -e 's/.*\/scribo\/$.*$/scribo\/\1/g' | sed 's/\.\.\/\.\.\///g' \ + | comm -23 - "$disabled_tests") -output=$2/unit-tests.mk +output="$output_dir/unit-tests.mk" rm -f "$output" rm -f scribo_*.cc @@ -37,7 +55,7 @@ for i in $HEADERS; do FILE_CC=`echo $i | sed 's/[/.]/_/g' | sed 's/_hh/\.cc/g'` # Build .cc. - cat > $FILE_CC << EOF + cat > "$output_dir/$FILE_CC" << EOF // Unit test for $i. // Generated by $0, do not modify. diff --git a/scribo/tests/unit_test/disabled_tests b/scribo/tests/unit_test/disabled_tests new file mode 100644 index 0000000..6e39306 --- /dev/null +++ b/scribo/tests/unit_test/disabled_tests @@ -0,0 +1,2 @@ +scribo/demo/src/mainwindow.hh +scribo/text/recognition.hh -- 1.5.6.5

1 0

last-svn-commit-136-gf1a7757 Have Scribo's unit tests pass.
by Roland Levillain 21 Apr '10

21 Apr '10

* tests/unit_test/disabled_tests: Add scribo/primitive/link/compute_several.hh and scribo/primitive/link/internal/find_several_links.hh, as they do not pass the unit tests. * tests/unit_test/unit-tests.mk: Regen. --- scribo/ChangeLog | 10 ++++++++++ scribo/tests/unit_test/disabled_tests | 3 +++ scribo/tests/unit_test/unit-tests.mk | 8 +------- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index af5c670..824951c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,15 @@ 2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Have Scribo's unit tests pass. + + * tests/unit_test/disabled_tests: + Add scribo/primitive/link/compute_several.hh and + scribo/primitive/link/internal/find_several_links.hh, as they + do not pass the unit tests. + * tests/unit_test/unit-tests.mk: Regen. + +2010-04-21 Roland Levillain <roland(a)lrde.epita.fr> + Update Scribo's unit tests generator. * tests/unit_test/build_unit_test.sh: Catch up with Milena's diff --git a/scribo/tests/unit_test/disabled_tests b/scribo/tests/unit_test/disabled_tests index 6e39306..9804c82 100644 --- a/scribo/tests/unit_test/disabled_tests +++ b/scribo/tests/unit_test/disabled_tests @@ -1,2 +1,5 @@ scribo/demo/src/mainwindow.hh +scribo/primitive/link/compute_several.hh +scribo/primitive/link/internal/find_several_links.hh +scribo/primitive/link/with_several_right_links_overlap.hh scribo/text/recognition.hh diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk index 2467334..055b90e 100644 --- a/scribo/tests/unit_test/unit-tests.mk +++ b/scribo/tests/unit_test/unit-tests.mk @@ -1,4 +1,4 @@ -## Generated by ./build_unit_test.sh, do not modify. +## Generated by scribo/tests/unit_test/build_unit_test.sh, do not modify. check_PROGRAMS = \ scribo_all \ @@ -100,10 +100,8 @@ scribo_primitive_internal_update_graph_link \ scribo_primitive_internal_update_link_array \ scribo_primitive_link_all \ scribo_primitive_link_compute \ -scribo_primitive_link_compute_several \ scribo_primitive_link_internal_anchors_3 \ scribo_primitive_link_internal_find_link \ -scribo_primitive_link_internal_find_several_links \ scribo_primitive_link_internal_link_center_dmax_base \ scribo_primitive_link_internal_link_center_dmax_ratio_base \ scribo_primitive_link_internal_link_functor_base \ @@ -116,7 +114,6 @@ scribo_primitive_link_with_several_graphes \ scribo_primitive_link_with_several_left_links \ scribo_primitive_link_with_several_right_closest_links \ scribo_primitive_link_with_several_right_links \ -scribo_primitive_link_with_several_right_links_overlap \ scribo_primitive_link_with_single_left_link \ scribo_primitive_link_with_single_left_link_dmax_ratio \ scribo_primitive_link_with_single_right_link \ @@ -242,10 +239,8 @@ scribo_primitive_internal_update_graph_link_SOURCES = scribo_primitive_internal_ scribo_primitive_internal_update_link_array_SOURCES = scribo_primitive_internal_update_link_array.cc scribo_primitive_link_all_SOURCES = scribo_primitive_link_all.cc scribo_primitive_link_compute_SOURCES = scribo_primitive_link_compute.cc -scribo_primitive_link_compute_several_SOURCES = scribo_primitive_link_compute_several.cc scribo_primitive_link_internal_anchors_3_SOURCES = scribo_primitive_link_internal_anchors_3.cc scribo_primitive_link_internal_find_link_SOURCES = scribo_primitive_link_internal_find_link.cc -scribo_primitive_link_internal_find_several_links_SOURCES = scribo_primitive_link_internal_find_several_links.cc scribo_primitive_link_internal_link_center_dmax_base_SOURCES = scribo_primitive_link_internal_link_center_dmax_base.cc scribo_primitive_link_internal_link_center_dmax_ratio_base_SOURCES = scribo_primitive_link_internal_link_center_dmax_ratio_base.cc scribo_primitive_link_internal_link_functor_base_SOURCES = scribo_primitive_link_internal_link_functor_base.cc @@ -258,7 +253,6 @@ scribo_primitive_link_with_several_graphes_SOURCES = scribo_primitive_link_with_ scribo_primitive_link_with_several_left_links_SOURCES = scribo_primitive_link_with_several_left_links.cc scribo_primitive_link_with_several_right_closest_links_SOURCES = scribo_primitive_link_with_several_right_closest_links.cc scribo_primitive_link_with_several_right_links_SOURCES = scribo_primitive_link_with_several_right_links.cc -scribo_primitive_link_with_several_right_links_overlap_SOURCES = scribo_primitive_link_with_several_right_links_overlap.cc scribo_primitive_link_with_single_left_link_SOURCES = scribo_primitive_link_with_single_left_link.cc scribo_primitive_link_with_single_left_link_dmax_ratio_SOURCES = scribo_primitive_link_with_single_left_link_dmax_ratio.cc scribo_primitive_link_with_single_right_link_SOURCES = scribo_primitive_link_with_single_right_link.cc -- 1.5.6.5

1 0