Olena-patches January 2011

olena-patches@lrde.epita.fr

5 participants
87 discussions

last-svn-commit-538-g2f44565 Ensure non implemented reconstructions on sets abort at run time.

by Roland Levillain

* mln/morpho/reconstruction/by_dilation/union_find.hh, * mln/morpho/reconstruction/by_erosion/union_find.hh (union_find_dispatch(image::kind::logic, Image, Image, Neighborhood)): Here. * tests/morpho/reconstruction/by_dilation/union_find.cc, * tests/morpho/reconstruction/by_erosion/union_find.cc: Rename as... * tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc, * tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc: ...these. * tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc, * tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc: New tests. * tests/morpho/reconstruction/by_dilation/Makefile.am, * tests/morpho/reconstruction/by_erosion/Makefile.am: Adjust. (check_PROGRAMS): Add union_find_on_sets. (union_find_on_sets_SOURCES): New. (XFAIL_TESTS): New. Add union_find_on_sets. --- milena/ChangeLog | 24 ++++++++++++++++++++ .../reconstruction/by_dilation/union_find.hh | 17 +++++++++++++- .../morpho/reconstruction/by_erosion/union_find.hh | 17 +++++++++++++- .../morpho/reconstruction/by_dilation/Makefile.am | 14 ++++++----- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 12 +++++----- .../morpho/reconstruction/by_erosion/Makefile.am | 14 ++++++----- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 10 ++++---- 9 files changed, 85 insertions(+), 25 deletions(-) copy milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_sets.cc} (87%) copy milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_sets.cc} (87%) diff --git a/milena/ChangeLog b/milena/ChangeLog index b9ba16d..77e5cc3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,27 @@ +2010-12-10 Roland Levillain <roland(a)lrde.epita.fr> + + Ensure non implemented reconstructions on sets abort at run time. + + * mln/morpho/reconstruction/by_dilation/union_find.hh, + * mln/morpho/reconstruction/by_erosion/union_find.hh + (union_find_dispatch(image::kind::logic, Image, Image, Neighborhood)): + Here. + * tests/morpho/reconstruction/by_dilation/union_find.cc, + * tests/morpho/reconstruction/by_erosion/union_find.cc: + Rename as... + * tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc, + * tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc: + ...these. + * tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc, + * tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc: + New tests. + * tests/morpho/reconstruction/by_dilation/Makefile.am, + * tests/morpho/reconstruction/by_erosion/Makefile.am: + Adjust. + (check_PROGRAMS): Add union_find_on_sets. + (union_find_on_sets_SOURCES): New. + (XFAIL_TESTS): New. Add union_find_on_sets. + 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> Work around g++ 4.5 deficiencies to compile Milena. diff --git a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh index 4e1d675..59f15e4 100644 --- a/milena/mln/morpho/reconstruction/by_dilation/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_dilation/union_find.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,7 +27,11 @@ #ifndef MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH # define MLN_MORPHO_RECONSTRUCTION_BY_DILATION_UNION_FIND_HH +# include <cstdlib> + +# include <iostream> # include <vector> + # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/data/fill.hh> @@ -221,6 +226,16 @@ namespace mln const Neighborhood<N>& nbh) { // FIXME: Not yet implemented. + std::cerr + << __FILE__ << ":" << __LINE__ << ": error:\n" + "mln::morpho::reconstruction::by_dilation::internal::\n" + " union_find_dispatch(mln::trait::image::kind::logic,\n" + " const mln::Image<I>&,\n" + " const mln::Image<J>&,\n" + " const mln::Neighborhood<N>&)\n" + "not implemented." + << std::endl; + std::abort(); } template <typename I, typename J, typename N> diff --git a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh index 27869a2..ebce224 100644 --- a/milena/mln/morpho/reconstruction/by_erosion/union_find.hh +++ b/milena/mln/morpho/reconstruction/by_erosion/union_find.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -26,7 +27,11 @@ #ifndef MLN_MORPHO_RECONSTRUCTION_BY_EROSION_UNION_FIND_HH # define MLN_MORPHO_RECONSTRUCTION_BY_EROSION_UNION_FIND_HH +# include <cstdlib> + +# include <iostream> # include <vector> + # include <mln/core/concept/image.hh> # include <mln/core/concept/neighborhood.hh> # include <mln/data/fill.hh> @@ -219,6 +224,16 @@ namespace mln const Neighborhood<N>& nbh) { // FIXME: Not yet implemented. + std::cerr + << __FILE__ << ":" << __LINE__ << ": error:\n" + "mln::morpho::reconstruction::by_erosion::internal::\n" + " union_find_dispatch(mln::trait::image::kind::logic,\n" + " const mln::Image<I>&,\n" + " const mln::Image<J>&,\n" + " const mln::Neighborhood<N>&)\n" + "not implemented." + << std::endl; + std::abort(); } template <typename I, typename J, typename N> diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am index 48f1460..b1a78b9 100644 --- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_dilation/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. # @@ -16,12 +16,14 @@ include $(top_srcdir)/milena/tests/tests.mk - check_PROGRAMS = \ - union_find - - -union_find_SOURCES = union_find.cc + union_find_on_functions \ + union_find_on_sets +union_find_on_functions_SOURCES = union_find_on_functions.cc +union_find_on_sets_SOURCES = union_find_on_sets.cc TESTS = $(check_PROGRAMS) + +# Reconstruction by dilation on sets in not implemented yet. +XFAIL_TESTS = union_find_on_sets diff --git a/milena/tests/morpho/reconstruction/by_dilation/union_find.cc b/milena/tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc similarity index 97% copy from milena/tests/morpho/reconstruction/by_dilation/union_find.cc copy to milena/tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc index b5125d4..094b9d4 100644 --- a/milena/tests/morpho/reconstruction/by_dilation/union_find.cc +++ b/milena/tests/morpho/reconstruction/by_dilation/union_find_on_functions.cc @@ -50,6 +50,7 @@ int main() mln_assertion(out == lena); } + // FIXME: Is this part really meaningful as-is? { initialize(lena_2, lena); data::fill(lena_2, lena); diff --git a/milena/tests/morpho/reconstruction/by_dilation/union_find.cc b/milena/tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc similarity index 87% rename from milena/tests/morpho/reconstruction/by_dilation/union_find.cc rename to milena/tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc index b5125d4..90946bf 100644 --- a/milena/tests/morpho/reconstruction/by_dilation/union_find.cc +++ b/milena/tests/morpho/reconstruction/by_dilation/union_find_on_sets.cc @@ -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. // @@ -27,8 +27,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/pw/all.hh> -#include <mln/io/pgm/load.hh> -#include <mln/value/int_u8.hh> +#include <mln/io/pbm/load.hh> #include <mln/data/compare.hh> #include <mln/morpho/reconstruction/by_dilation/union_find.hh> @@ -42,15 +41,16 @@ int main() using namespace mln; using namespace morpho::reconstruction::by_dilation; - image2d<value::int_u8> lena, lena_2, out; - io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); + image2d<bool> lena, lena_2, out; + io::pbm::load(lena, MLN_IMG_DIR "/tiny.pbm"); { out = union_find(lena, lena, c4()); mln_assertion(out == lena); } - { + // FIXME: Is this part really meaningful as-is? + { initialize(lena_2, lena); data::fill(lena_2, lena); out = union_find(lena_2, lena, c4()); diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am index 48f1460..74449d1 100644 --- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am +++ b/milena/tests/morpho/reconstruction/by_erosion/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. # @@ -16,12 +16,14 @@ include $(top_srcdir)/milena/tests/tests.mk - check_PROGRAMS = \ - union_find - - -union_find_SOURCES = union_find.cc + union_find_on_functions \ + union_find_on_sets +union_find_on_functions_SOURCES = union_find_on_functions.cc +union_find_on_sets_SOURCES = union_find_on_sets.cc TESTS = $(check_PROGRAMS) + +# Reconstruction by erosion on sets in not implemented yet. +XFAIL_TESTS = union_find_on_sets diff --git a/milena/tests/morpho/reconstruction/by_erosion/union_find.cc b/milena/tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc similarity index 97% copy from milena/tests/morpho/reconstruction/by_erosion/union_find.cc copy to milena/tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc index ff7156b..a7bb01a 100644 --- a/milena/tests/morpho/reconstruction/by_erosion/union_find.cc +++ b/milena/tests/morpho/reconstruction/by_erosion/union_find_on_functions.cc @@ -50,6 +50,7 @@ int main() mln_assertion(out == lena); } + // FIXME: Is this part really meaningful as-is? { initialize(lena_2, lena); data::fill(lena_2, lena); diff --git a/milena/tests/morpho/reconstruction/by_erosion/union_find.cc b/milena/tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc similarity index 87% rename from milena/tests/morpho/reconstruction/by_erosion/union_find.cc rename to milena/tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc index ff7156b..9c521ac 100644 --- a/milena/tests/morpho/reconstruction/by_erosion/union_find.cc +++ b/milena/tests/morpho/reconstruction/by_erosion/union_find_on_sets.cc @@ -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. // @@ -27,8 +27,7 @@ #include <mln/core/alias/neighb2d.hh> #include <mln/pw/all.hh> -#include <mln/io/pgm/load.hh> -#include <mln/value/int_u8.hh> +#include <mln/io/pbm/load.hh> #include <mln/data/compare.hh> #include <mln/morpho/reconstruction/by_erosion/union_find.hh> @@ -42,14 +41,15 @@ int main() using namespace mln; using namespace morpho::reconstruction::by_erosion; - image2d<value::int_u8> lena, lena_2, out; - io::pgm::load(lena, MLN_IMG_DIR "/tiny.pgm"); + image2d<bool> lena, lena_2, out; + io::pbm::load(lena, MLN_IMG_DIR "/tiny.pbm"); { out = union_find(lena, lena, c4()); mln_assertion(out == lena); } + // FIXME: Is this part really meaningful as-is? { initialize(lena_2, lena); data::fill(lena_2, lena); -- 1.5.6.5

13 years, 11 months

last-svn-commit-537-gba06191 Clean up ChangeLogs.

by Roland Levillain

--- milena/ChangeLog | 2 +- scribo/ChangeLog | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9f07662..b9ba16d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -24,7 +24,7 @@ * mln/core/site_set/p_complex_piter.hh, * mln/core/site_set/p_n_faces_piter.hh: - Here. + Here. 2010-11-29 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 104f9c6..8500a92 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1636,9 +1636,9 @@ arguments. * src/binarization/fg_sauvola_ms.cc, - * src/binarization/sauvola.cc, - * src/binarization/sauvola_ms.cc, - * src/binarization/sauvola_ms_split.cc, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_split.cc, * src/binarization/sauvola_debug.cc: New. 2010-03-29 Guillaume Lazzara <z(a)lrde.epita.fr> -- 1.5.6.5

13 years, 11 months

branch next updated: last-svn-commit-538-g2f44565

by git＠lrde.epita.fr

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 2f44565f67f0ef414e59ad84967397cce6167bfd (commit) via ba06191be781af162bcb24ca39daa16c7ed1a904 (commit) from db3466e6f12fca8d9c92ae661ae0b5d053b8e4ba (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 ----------------------------------------------------------------- 2f44565 Ensure non implemented reconstructions on sets abort at run time. ba06191 Clean up ChangeLogs. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 26 +++++++++++++++++++- .../reconstruction/by_dilation/union_find.hh | 17 ++++++++++++- .../morpho/reconstruction/by_erosion/union_find.hh | 17 ++++++++++++- .../morpho/reconstruction/by_dilation/Makefile.am | 14 ++++++---- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 12 ++++---- .../morpho/reconstruction/by_erosion/Makefile.am | 14 ++++++---- .../{union_find.cc => union_find_on_functions.cc} | 1 + .../{union_find.cc => union_find_on_sets.cc} | 10 ++++---- scribo/ChangeLog | 6 ++-- 10 files changed, 89 insertions(+), 29 deletions(-) copy milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_dilation/{union_find.cc => union_find_on_sets.cc} (87%) copy milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_functions.cc} (97%) rename milena/tests/morpho/reconstruction/by_erosion/{union_find.cc => union_find_on_sets.cc} (87%) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 11 months

branch next-build-test updated: last-svn-commit-725-g5eee987

by lazzara＠lrde.epita.fr

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-build-test has been updated via 5eee987669ff37153cb1de4faf3e56e39a93b102 (commit) from 378d637a99683c6cb54fdbf369ebf1e65e434dce (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 ----------------------------------------------------------------- 5eee987 Add new files in EXTRA_DIST. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 9 ++++++ scribo/demo/review/Makefile.am | 19 ++++++++++--- scribo/demo/viewer/Makefile.am | 31 ++++++++++++++++++--- scribo/demo/viewer/{viewer.hxx => demodir.hh.in} | 15 ++++------ 4 files changed, 56 insertions(+), 18 deletions(-) copy scribo/demo/viewer/{viewer.hxx => demodir.hh.in} (85%) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 11 months

last-svn-commit-725-g5eee987 Add new files in EXTRA_DIST.

by Guillaume Lazzara

* demo/review/Makefile.am, * demo/viewer/Makefile.am (EXTRA_DIST): Add new files. * demo/viewer/demodir.hh.in: New. --- scribo/ChangeLog | 9 ++++++ scribo/demo/review/Makefile.am | 19 ++++++++++--- scribo/demo/viewer/Makefile.am | 31 ++++++++++++++++++--- scribo/demo/viewer/{viewer.hxx => demodir.hh.in} | 15 ++++------ 4 files changed, 56 insertions(+), 18 deletions(-) copy scribo/demo/viewer/{viewer.hxx => demodir.hh.in} (85%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index bc51033..9185148 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2011-01-03 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new files in EXTRA_DIST. + + * demo/review/Makefile.am, + * demo/viewer/Makefile.am (EXTRA_DIST): Add new files. + + * demo/viewer/demodir.hh.in: New. + +2011-01-03 Guillaume Lazzara <z(a)lrde.epita.fr> + * demo/review/Makefile.am: Do not distribute generated files. 2010-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index bea214a..0aafc90 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -43,5 +43,16 @@ noinst_HEADERS = src/mainwindow.hh CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = \ - review.qrc +EXTRA_DIST = \ + icons/document-open.png \ + icons/edit-find.png \ + icons/format-indent-more.png \ + icons/go-next.png \ + icons/image-x-generic.png \ + icons/list-add.png \ + icons/ocr.png \ + icons/text-x-generic.png \ + icons/view-refresh.png \ + icons/x-office-spreadsheet.png\ + review.qrc \ + ui/mainwindow.ui diff --git a/scribo/demo/viewer/Makefile.am b/scribo/demo/viewer/Makefile.am index 2e0afec..d5fffbf 100644 --- a/scribo/demo/viewer/Makefile.am +++ b/scribo/demo/viewer/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory -# (LRDE). +# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -70,7 +70,8 @@ BUILT_SOURCES = viewer.moc.cc \ preferences_dialog.moc.cc \ preferences_dialog.ui.h \ general_options.moc.cc \ - general_options.ui.h + general_options.ui.h \ + demodir.hh noinst_HEADERS = viewer.hh \ @@ -95,6 +96,26 @@ noinst_HEADERS = viewer.hh \ option_widget.hh \ config.hh -EXTRA_DIST = README -CLEANFILES = $(BUILT_SOURCES) \ No newline at end of file +# Generated files +do_subst = sed \ + -e 's|@bindir[@]|$(bindir)|g' \ + -e 's|@abs_srcdir[@]|$(abs_srcdir)|g' + +demodir.hh: $(srcdir)/demodir.hh.in Makefile + rm -f $@ $@.tmp + srcdir=''; \ + test -f ./$@.in || srcdir=$(srcdir)/; \ + $(do_subst) $${srcdir}$@.in >$@.tmp + chmod a-w $@.tmp + mv $@.tmp $@ + +CLEANFILES = $(BUILT_SOURCES) + +EXTRA_DIST = \ + general_options.ui \ + preferences_dialog.ui \ + README \ + toolchain_options.ui \ + demodir.hh.in + diff --git a/scribo/demo/viewer/viewer.hxx b/scribo/demo/viewer/demodir.hh.in similarity index 85% copy from scribo/demo/viewer/viewer.hxx copy to scribo/demo/viewer/demodir.hh.in index cba59f3..59149b9 100644 --- a/scribo/demo/viewer/viewer.hxx +++ b/scribo/demo/viewer/demodir.hh.in @@ -23,16 +23,13 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifndef VIEWER_HXX_ -# define VIEWER_HXX_ +#ifndef SCRIBO_DEMO_DEMODIR_HH +# define SCRIBO_DEMO_DEMODIR_HH -# include "viewer.hh" -inline Viewer* Viewer::Instance(int &argc, char** argv) -{ - static Viewer viewer(argc, argv); +# define SCRIBO_PREFIX_BINDIR "@bindir@" - return &viewer; -} +# define SCRIBO_LOCAL_DEMODIR "@abs_srcdir@" -#endif /* !VIEWER_HXX_ */ + +#endif // !SCRIBO_DEMO_DEMODIR_HH -- 1.5.6.5

13 years, 11 months

branch next-build-test updated: last-svn-commit-724-g378d637

by lazzara＠lrde.epita.fr

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-build-test has been updated via 378d637a99683c6cb54fdbf369ebf1e65e434dce (commit) from 77bcfbc0e9efef58c478643f49743fd7d0aa04bb (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 ----------------------------------------------------------------- 378d637 demo/review/Makefile.am: Do not distribute generated files. ----------------------------------------------------------------------- Summary of changes: scribo/ChangeLog | 4 ++++ scribo/demo/review/Makefile.am | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

13 years, 11 months

last-svn-commit-724-g378d637 demo/review/Makefile.am: Do not distribute generated files.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ scribo/demo/review/Makefile.am | 14 ++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 8097faf..bc51033 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2011-01-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + * demo/review/Makefile.am: Do not distribute generated files. + 2010-12-14 Guillaume Lazzara <z(a)lrde.epita.fr> * NEWS: First draft of Scribo NEWS file. diff --git a/scribo/demo/review/Makefile.am b/scribo/demo/review/Makefile.am index 323647f..bea214a 100644 --- a/scribo/demo/review/Makefile.am +++ b/scribo/demo/review/Makefile.am @@ -18,10 +18,17 @@ include $(top_srcdir)/build-aux/autotroll.mk bin_PROGRAMS = scribo-review -scribo_review_SOURCES = $(BUILT_SOURCES) \ - src/main.cc \ + +scribo_review_SOURCES = src/main.cc \ src/mainwindow.cc +BUILT_SOURCES = src/mainwindow.moc.cc \ + ui/mainwindow.ui.h + +# Make sure generated files are not distributed. +nodist_scribo_review_SOURCES = $(BUILT_SOURCES) + + scribo_review_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ -DNDEBUG \ -I$(srcdir) \ @@ -30,12 +37,11 @@ scribo_review_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) -O3 scribo_review_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) scribo_review_LDADD = $(QT_LIBS) $(LDADD) -BUILT_SOURCES = src/mainwindow.moc.cc \ - ui/mainwindow.ui.h noinst_HEADERS = src/mainwindow.hh +CLEANFILES = $(BUILT_SOURCES) EXTRA_DIST = \ review.qrc -- 1.5.6.5

13 years, 11 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches January 2011